From c6e957315736f31b7490be5c5af8d7e4aa5417f4 Mon Sep 17 00:00:00 2001
From: Gertjan Bisschop <gertjanbisschop@gmail.com>
Date: Tue, 5 Dec 2023 09:57:30 +0000
Subject: [PATCH] fix sorting bug pedigrees

---
 lib/msprime.c          |  3 ++-
 tests/test_pedigree.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/lib/msprime.c b/lib/msprime.c
index 6ee451695..b3c8cbc3e 100644
--- a/lib/msprime.c
+++ b/lib/msprime.c
@@ -5348,7 +5348,8 @@ msp_finalise_tables(msp_t *self)
     }
     ret = tsk_table_collection_build_index(self->tables, 0);
     if (ret == TSK_ERR_EDGES_NOT_SORTED_PARENT_TIME
-        || ret == TSK_ERR_EDGES_NONCONTIGUOUS_PARENTS) {
+        || ret == TSK_ERR_EDGES_NONCONTIGUOUS_PARENTS
+        || ret == TSK_ERR_EDGES_NOT_SORTED_CHILD) {
         /* There are rare cases when we are simulating from awkward initial
          * states where the tables we produce in the simulation are not
          * correctly sorted. The simplest course of action here to just let it
diff --git a/tests/test_pedigree.py b/tests/test_pedigree.py
index 08a042a6c..6db662cbd 100644
--- a/tests/test_pedigree.py
+++ b/tests/test_pedigree.py
@@ -1297,6 +1297,38 @@ def test_deep_pedigree_2(self):
             ):
                 self.verify_pedigree_unary(ts, initial_state)
 
+    def test_deep_pedigree_sorting_requirements(self):
+        """
+        Produces TSK_ERR_EDGES_NOT_SORTED_CHILD error if
+        this error is not addressed in msp_finalise_tables
+        """
+        N = 10
+        end_time = 1000
+        sequence_length = 100
+        recombination_rate = 0.0001
+        additional_nodes = (
+            msprime.NodeType.RECOMBINANT
+            | msprime.NodeType.PASS_THROUGH
+            | msprime.NodeType.COMMON_ANCESTOR
+        )
+        random_seed = 17351
+        pedigree = msprime.pedigrees.sim_pedigree(
+            population_size=N,
+            end_time=end_time,
+            direction="forward",
+            random_seed=random_seed,
+        )
+        pedigree.sequence_length = sequence_length
+        ts_ped = msprime.sim_ancestry(
+            initial_state=pedigree,
+            recombination_rate=recombination_rate,
+            model="fixed_pedigree",
+            additional_nodes=additional_nodes,
+            coalescing_segments_only=False,
+            random_seed=random_seed,
+        )
+        self.verify_pedigree_unary(ts_ped, pedigree)
+
 
 class TestPedigreeBuilder:
     def test_is_sample_default(self):