fix smck migration

tskit-dev · Aug 5, 2024 · 4951c58 · 4951c58
1 parent 0b60d27
commit 4951c58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/lib/msprime.c b/lib/msprime.c
@@ -2716,12 +2716,9 @@ msp_move_individual(msp_t *self, avl_node_t *node, avl_tree_t *source,
         }
         ind->label = dest_label;
     }
+    ind->hull = new_hull;
     if (new_hull != NULL) {
         new_hull->lineage = ind;
-        ret = msp_insert_hull(self, new_hull);
-        if (ret != 0) {
-            goto out;
-        }
     }
     lineage_reset_segments(ind);
     ret = msp_insert_individual(self, ind);

diff --git a/lib/tests/test_ancestry.c b/lib/tests/test_ancestry.c
@@ -4045,7 +4045,6 @@ test_init_smc_k(void)
     tsk_table_collection_free(&tables);
 }
 
-#if 0
 static void
 test_smc_k_multipop(void)
 {
@@ -4082,7 +4081,6 @@ test_smc_k_multipop(void)
     gsl_rng_free(rng);
     tsk_table_collection_free(&tables);
 }
-#endif
 
 static void
 test_mixed_model_smc_k(void)
@@ -4363,7 +4361,7 @@ main(int argc, char **argv)
         { "test_setup_smc_k_plus", test_setup_smc_k_plus },
         /* { "test_reset_smc_k", test_reset_smc_k }, */
         { "test_init_smc_k", test_init_smc_k },
-        /* { "test_smc_k_multipop", test_smc_k_multipop }, */
+        { "test_smc_k_multipop", test_smc_k_multipop },
         { "test_mixed_model_smc_k", test_mixed_model_smc_k },
         { "test_mixed_model_smc_k_large", test_mixed_model_smc_k_large },
         { "test_fenwick_rebuild_smc_k", test_fenwick_rebuild_smc_k },