Skip to content

Commit abc0ba0

Browse files
merged; removed all tabs
2 parents f74583a + 235ee39 commit abc0ba0

22 files changed

+3363
-2206
lines changed

inc/container/container.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace libMA
1717
{
18-
class Pledge;
18+
class Pledge;
1919

2020
/**
2121
* @defgroup container
@@ -108,22 +108,22 @@ namespace libMA
108108
public Container,
109109
public std::vector<std::shared_ptr<Container>>
110110
{
111-
public:
111+
public:
112112
std::shared_ptr<Container> contentType;
113113

114-
ContainerVector(std::initializer_list<std::shared_ptr<Container>> init)
115-
:
116-
vector(init)
117-
{
114+
ContainerVector(std::initializer_list<std::shared_ptr<Container>> init)
115+
:
116+
vector(init)
117+
{
118118
contentType = front()->getType();
119119
}//initializer list constructor
120120

121-
template< class InputIt >
122-
ContainerVector(InputIt xBegin, InputIt xEnd
123-
)
124-
:
125-
vector(xBegin, xEnd)
126-
{}//iterator constructor
121+
template< class InputIt >
122+
ContainerVector(InputIt xBegin, InputIt xEnd
123+
)
124+
:
125+
vector(xBegin, xEnd)
126+
{}//iterator constructor
127127

128128
ContainerVector()
129129
:

inc/container/pack.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,20 +1164,20 @@ namespace libMA
11641164
if ( !bPositionIsOnReversStrand( iMiddle ) )
11651165
{ /* On forward strand.
11661166
*/
1167-
if ((int64_t)iSequenceBegin > riBegin)
1168-
riBegin = iSequenceBegin;
1169-
if ((int64_t)iSequenceEnd < riEnd)
1170-
riEnd = iSequenceEnd;
1167+
if ((int64_t)iSequenceBegin > riBegin)
1168+
riBegin = iSequenceBegin;
1169+
if ((int64_t)iSequenceEnd < riEnd)
1170+
riEnd = iSequenceEnd;
11711171

11721172
assert( riBegin <= riEnd ); // consistency check
11731173
} // if
11741174
else
11751175
{ /* On reverse strand.
11761176
*/
1177-
if ((int64_t)uiPositionToReverseStrand(iSequenceEnd) + 1 > riBegin)
1178-
riBegin = uiPositionToReverseStrand(iSequenceEnd) + 1;
1179-
if ((int64_t)uiPositionToReverseStrand(iSequenceBegin) + 1 < riEnd)
1180-
riEnd = uiPositionToReverseStrand(iSequenceBegin) + 1;
1177+
if ((int64_t)uiPositionToReverseStrand(iSequenceEnd) + 1 > riBegin)
1178+
riBegin = uiPositionToReverseStrand(iSequenceEnd) + 1;
1179+
if ((int64_t)uiPositionToReverseStrand(iSequenceBegin) + 1 < riEnd)
1180+
riEnd = uiPositionToReverseStrand(iSequenceBegin) + 1;
11811181

11821182
assert( riBegin <= riEnd ); // consistency check
11831183
} // else

inc/container/seed.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,13 @@ namespace libMA
219219
Container(),
220220
xStats(),
221221
bConsistent(false)
222-
{}//default constructor
222+
{}//default constructor
223223

224-
template< class InputIt >
225-
Seeds(InputIt xBegin, InputIt xEnd)
226-
:
227-
vector(xBegin, xEnd)
228-
{}//iterator constructor
224+
template< class InputIt >
225+
Seeds(InputIt xBegin, InputIt xEnd)
226+
:
227+
vector(xBegin, xEnd)
228+
{}//iterator constructor
229229

230230
//overload
231231
bool canCast(std::shared_ptr<Container> c) const

inc/container/segment.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,17 @@ namespace libMA
103103
*/
104104
class SegmentVector : public std::vector<std::shared_ptr<Segment>>, public Container{
105105

106-
public:
106+
public:
107107

108-
template< class InputIt >
109-
SegmentVector(InputIt xBegin, InputIt xEnd
110-
)
111-
:
112-
vector(xBegin, xEnd)
113-
{}//iterator constructor
108+
template< class InputIt >
109+
SegmentVector(InputIt xBegin, InputIt xEnd
110+
)
111+
:
112+
vector(xBegin, xEnd)
113+
{}//iterator constructor
114114

115-
SegmentVector()
116-
{}//default constructor
115+
SegmentVector()
116+
{}//default constructor
117117

118118
//overload
119119
bool canCast(std::shared_ptr<Container> c) const

0 commit comments

Comments
 (0)