makeDistTree does not stop on criterion increase of dissimilarity typ…

…es > 1
ncbi · Oct 4, 2020 · c5326cd · c5326cd
1 parent db1782e
commit c5326cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/phylogeny/distTree_test.sh b/phylogeny/distTree_test.sh
@@ -210,7 +210,7 @@ else
 
   echo ""
   echo "Virus9 ..."
-  $THIS/makeDistTree  -qc  -data data/Virus9  -optimize  -variance linExp  -variance_dissim  -output_dissim_coeff Virus9.coeff  -output_data Virus9-out  -output_tree Virus9.tree  1> $TMP.1 2> /dev/null
+  $THIS/makeDistTree  -qc  -data data/Virus9  -optimize  -subgraph_iter_max 100  -variance linExp  -variance_dissim  -output_dissim_coeff Virus9.coeff  -output_data Virus9-out  -output_tree Virus9.tree  1> $TMP.1 2> /dev/null
   diff Virus9.coeff data/Virus9.coeff
   rm Virus9.coeff
   A=`grep -w '^Error between dissimilarities' -A 1 $TMP.1 | tail -1`

diff --git a/phylogeny/makeDistTree.cpp b/phylogeny/makeDistTree.cpp
@@ -623,7 +623,9 @@ struct ThisApplication : Application
             #endif
               if (! absCriterion_old)
               	break;
-              if (absCriterion_old <= tree->absCriterion)
+              if (   absCriterion_old <= tree->absCriterion 
+                  && tree->dissimTypesNum () == 1
+                 )
               	break;
               tree->setDissimMult (true);
               if (! tree->multFixed)

diff --git a/version.inc b/version.inc
@@ -1,6 +1,7 @@
-#define VERSION "1.2.2"
+#define VERSION "1.2.3"
 
 
+// 1.2.3  10/03/2020  makeDistTree does not stop on criterion increase of dissimilarity types > 1
 // 1.2.2  08/28/2020  distTree_new.cpp accepts a tree file as input
 // 1.2.1  08/20/2020  request2dissim.sh: 4 parameters
 // 1.1.12 07/28/2020  Newick import removes transient nodes; printDistTree: 'itree' --> 'dm'