Merge pull request popsim-consortium#241 from grahamgower/convert

Fix migration.end_time in convert.from_msprime.
grahamgower · Mar 18, 2021 · e56413b · e56413b
2 parents 7e5654a + 941d444
commit e56413b
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/demes/convert/msprime_.py b/demes/convert/msprime_.py
@@ -320,16 +320,17 @@ def from_msprime(
             for k in range(num_pops):
                 if j == k:
                     continue
-                if prev_mm[j, k] != msp_mm[j, k] and msp_mm[j, k] != 0:
-                    # new Migration
-                    m = demes.AsymmetricMigration(
-                        source=name[j],
-                        dest=name[k],
-                        start_time=ddb_epoch.end_time,
-                        end_time=ddb_epoch.start_time,
-                        rate=msp_mm[j, k],
-                    )
-                    migrations[(j, k)].append(m)
+                if prev_mm[j, k] != msp_mm[j, k]:
+                    if msp_mm[j, k] != 0:
+                        # new Migration
+                        m = demes.AsymmetricMigration(
+                            source=name[j],
+                            dest=name[k],
+                            start_time=ddb_epoch.end_time,
+                            end_time=ddb_epoch.start_time,
+                            rate=msp_mm[j, k],
+                        )
+                        migrations[(j, k)].append(m)
                 else:
                     # extend time span of existing Migration
                     if (j, k) in migrations: