Merge remote-tracking branch 'origin/develop' into develop

modules/mol/alg/tests/CMakeLists.txt

@@ -4,5 +4,5 @@ set(OST_MOL_ALG_UNIT_TESTS
   test_convenient_superpose.py
 )
 
-ost_unittest(mol_alg "${OST_MOL_ALG_UNIT_TESTS}")
+ost_unittest(MODULE mol_alg SOURCES "${OST_MOL_ALG_UNIT_TESTS}")
 

modules/mol/base/tests/CMakeLists.txt

@@ -15,7 +15,7 @@ set(OST_MOL_BASE_UNIT_TESTS
   tests.cc
 )
 
-ost_unittest(mol "${OST_MOL_BASE_UNIT_TESTS}")
+ost_unittest(MODULE mol SOURCES "${OST_MOL_BASE_UNIT_TESTS}")
 
 # for valgrind debugging
 # executable(NAME test_query_standalone SOURCES test_query_standalone.cc DEPENDS_ON mol)

modules/seq/alg/src/merge_pairwise_alignments.cc

@@ -141,9 +141,13 @@ AlignmentHandle MergePairwiseAlignments(const AlignmentList& pairwise_alns,
 
   AlignmentHandle merged=CreateAlignment();
   merged.AddSequence(shift_reference(ref_seq, shifts));
+  size_t ref_len=merged.GetSequence(0).GetLength();
   for (AlignmentList::const_iterator i=pairwise_alns.begin(),
        e=pairwise_alns.end(); i!=e; ++i) {
     SequenceHandle new_seq=realign_sequence(*i, shifts);
+    for (size_t j=new_seq.GetLength(); j<ref_len; ++j) {
+      new_seq.Append('-');
+    }
     merged.AddSequence(new_seq);
   }  
   return merged;

modules/seq/alg/tests/CMakeLists.txt

@@ -7,5 +7,5 @@ set(OST_SEQ_ALG_UNIT_TESTS
   test_global_align.py
 )
 
-ost_unittest(seq_alg "${OST_SEQ_ALG_UNIT_TESTS}")
+ost_unittest(MODULE seq_alg SOURCES "${OST_SEQ_ALG_UNIT_TESTS}")
 

modules/seq/alg/tests/test_merge_pairwise_alignments.cc

@@ -107,4 +107,30 @@ BOOST_AUTO_TEST_CASE(merge_pairwise_alignments_three)
   BOOST_CHECK_EQUAL(seqs[1].GetString(), "xyabcdefghijk");
   BOOST_CHECK_EQUAL(seqs[2].GetString(), "-zabcdefghijk");
 }
+
+BOOST_AUTO_TEST_CASE(merge_pairwise_alignments_four)
+{
+  SequenceHandle ref=CreateSequence("REF", "abcdefghijk");
+  SequenceHandle s1=CreateSequence("S1",   "abcdefghijk--");
+  SequenceHandle s2=CreateSequence("S2",   "abcdefghijkxy");
+  AlignmentHandle aln1=CreateAlignment();
+  aln1.AddSequence(s1);
+  aln1.AddSequence(s2);
+
+  SequenceHandle s3=CreateSequence("S1", "-abcdefghijk");
+  SequenceHandle s4=CreateSequence("S2", "zabcdefghijk");
+
+  AlignmentHandle aln2=CreateAlignment();
+  aln2.AddSequence(s3);
+  aln2.AddSequence(s4);
+  AlignmentList l;
+  l.push_back(aln1);
+  l.push_back(aln2);
+  AlignmentHandle m=alg::MergePairwiseAlignments(l, ref);
+  ConstSequenceList seqs=m.GetSequences();
+  BOOST_CHECK_EQUAL(seqs[0].GetString(), "-abcdefghijk--");
+  BOOST_CHECK_EQUAL(seqs[1].GetString(), "-abcdefghijkxy");
+  BOOST_CHECK_EQUAL(seqs[2].GetString(), "zabcdefghijk--");
+}
+
 BOOST_AUTO_TEST_SUITE_END()

modules/seq/base/tests/CMakeLists.txt

@@ -7,5 +7,5 @@ set(OST_SEQ_UNIT_TESTS
   tests.cc
 )
 
-ost_unittest(seq "${OST_SEQ_UNIT_TESTS}")
+ost_unittest(MODULE seq SOURCES "${OST_SEQ_UNIT_TESTS}")