Quite a big of cleaning pus fixed a bug in partiionned analysis preve…

…nting proper edge length opt.
stephaneguindon · Nov 18, 2021 · eec2afb · eec2afb
1 parent 75dda1d
commit eec2afb
Show file tree

Hide file tree

Showing 11 changed files with 389 additions and 394 deletions.
diff --git a/src/free.c b/src/free.c
diff --git a/src/free.h b/src/free.h
@@ -99,5 +99,8 @@ void Free_Clade(t_clad *this);
 void Free_Label(t_label *lab);
 void Free_Contrasts(t_ctrst *ctrst);
 void TIMES_Free_Times(t_time *times);
+void Free_Best_Spr(t_tree *tree);
+void Free_All_Edges_Light(t_tree *tree);
+void Free_All_Edges_Lens(t_tree *tree);
 
 #endif
diff --git a/src/io.c b/src/io.c
@@ -4510,7 +4510,9 @@ option *PhyML_XML(char *xml_filename)
       MIXT_Init_T_End(mixt_tree);
       Print_Data_Structure(YES,mixt_tree->io->fp_out_stats,mixt_tree);
 
+      Free_Best_Spr(mixt_tree);
       Free_Spr_List_One_Edge(mixt_tree);
+      Free_Spr_List_All_Edge(mixt_tree);
       Free_Tree_Pars(mixt_tree);
       Free_Tree_Lk(mixt_tree);
     }

diff --git a/src/main.c b/src/main.c
@@ -324,7 +324,7 @@ int main(int argc, char **argv)
 #ifdef BEAGLE
                   finalize_beagle_instance(tree);
 #endif
-                  Free_One_Spr(tree->best_spr);
+                  Free_Best_Spr(tree);
                   Free_Spr_List_One_Edge(tree);
                   Free_Spr_List_All_Edge(tree);
                   Free_Tree_Pars(tree);

diff --git a/src/make.c b/src/make.c
@@ -763,7 +763,6 @@ t_tree *Make_Tree(int n_otu)
 //////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////
 
-
 void Make_Tree_Path(t_tree *tree)
 {
   tree->curr_path = (t_node **)mCalloc(tree->n_otu,sizeof(t_node *));
@@ -1293,7 +1292,7 @@ void Make_Spr(t_tree *tree)
   Make_Spr_List_One_Edge(tree);
   Make_Spr_List_All_Edge(tree);
   Make_Best_Spr(tree);
-  if(tree->is_mixt_tree == YES) MIXT_Make_Spr(tree);
+  if(tree->is_mixt_tree == YES) MIXT_Repeat_Task(Make_Spr,tree);
 }
 
 //////////////////////////////////////////////////////////////