Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
cf6c07d3
Commit
cf6c07d3
authored
14 years ago
by
Marco Biasini
Browse files
Options
Downloads
Patches
Plain Diff
changed second arg of MergePairwiseAlignments to ConstSequenceHandle
parent
ec661c22
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/seq/alg/src/merge_pairwise_alignments.cc
+6
-6
6 additions, 6 deletions
modules/seq/alg/src/merge_pairwise_alignments.cc
modules/seq/alg/src/merge_pairwise_alignments.hh
+1
-1
1 addition, 1 deletion
modules/seq/alg/src/merge_pairwise_alignments.hh
with
7 additions
and
7 deletions
modules/seq/alg/src/merge_pairwise_alignments.cc
+
6
−
6
View file @
cf6c07d3
...
...
@@ -34,7 +34,7 @@ typedef std::map<int, int> ShiftMap;
namespace
{
void
update_shifts
(
const
AlignmentHandle
&
aln
,
const
SequenceHandle
&
ref_seq
,
const
Const
SequenceHandle
&
ref_seq
,
ShiftMap
&
shifts
)
{
ConstSequenceHandle
s1
=
aln
.
GetSequence
(
0
);
...
...
@@ -68,8 +68,8 @@ void update_shifts(const AlignmentHandle& aln,
}
}
SequenceHandle
shift_reference
(
const
SequenceHandle
&
ref_seq
,
const
ShiftMap
&
shifts
)
SequenceHandle
shift_reference
(
const
Const
SequenceHandle
&
ref_seq
,
const
ShiftMap
&
shifts
)
{
std
::
ostringstream
new_sequence
;
String
ref_str
=
ref_seq
.
GetString
();
...
...
@@ -86,7 +86,7 @@ SequenceHandle shift_reference(const SequenceHandle& ref_seq,
}
new_sequence
<<
ref_str
.
substr
(
last
);
SequenceHandle
s
=
CreateSequence
(
ref_seq
.
GetName
(),
new_sequence
.
str
());
new_sequence
.
str
());
if
(
ref_seq
.
HasAttachedView
())
s
.
AttachView
(
ref_seq
.
GetAttachedView
());
s
.
SetOffset
(
s
.
GetOffset
());
...
...
@@ -94,7 +94,7 @@ SequenceHandle shift_reference(const SequenceHandle& ref_seq,
}
SequenceHandle
realign_sequence
(
const
AlignmentHandle
&
aln
,
const
ShiftMap
&
shifts
)
const
ShiftMap
&
shifts
)
{
std
::
ostringstream
new_sequence
;
ConstSequenceHandle
s1
=
aln
.
GetSequence
(
0
);
...
...
@@ -130,7 +130,7 @@ SequenceHandle realign_sequence(const AlignmentHandle& aln,
}
AlignmentHandle
MergePairwiseAlignments
(
const
AlignmentList
&
pairwise_alns
,
const
SequenceHandle
&
ref_seq
)
const
Const
SequenceHandle
&
ref_seq
)
{
ShiftMap
shifts
;
...
...
This diff is collapsed.
Click to expand it.
modules/seq/alg/src/merge_pairwise_alignments.hh
+
1
−
1
View file @
cf6c07d3
...
...
@@ -43,7 +43,7 @@ namespace ost { namespace seq { namespace alg {
/// contain any gaps.
AlignmentHandle
DLLEXPORT_OST_SEQ_ALG
MergePairwiseAlignments
(
const
AlignmentList
&
pairwise_alns
,
const
SequenceHandle
&
ref_seq
);
const
Const
SequenceHandle
&
ref_seq
);
}}}
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment