The weight is the minimal overlap

molpopgen · Nov 11, 2023 · a4b68fc · a4b68fc
1 parent 06c3f47
commit a4b68fc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cpp/functions/add_mutation.cc b/cpp/functions/add_mutation.cc
@@ -81,8 +81,8 @@ namespace
                            fwdpp::ts::table_index_t p,
                            std::vector<fwdpp::ts::table_index_t> d, double a, double b,
                            double c)
-            : left{l}, right{r}, node{n}, parent{p},
-              descendants{std::move(d)}, node_time{a}, parent_time{b}, tree_span{c}
+            : left{l}, right{r}, node{n}, parent{p}, descendants{std::move(d)},
+              node_time{a}, parent_time{b}, tree_span{c}
         {
         }
     };
@@ -190,7 +190,6 @@ namespace
                                                         pop.tables->nodes, n,
                                                         tree.parents[n]))
                                                     {
-                                                        throw std::runtime_error("the last arg here should be the minimal overlap");
                                                         candidates.emplace_back(
                                                             std::max(tree.left, left),
                                                             std::min(tree.right, right),
@@ -200,7 +199,9 @@ namespace
                                                             pop.tables
                                                                 ->nodes[tree.parents[n]]
                                                                 .time,
-                                                            tree.right - tree.left);
+                                                            std::min(tree.right, right)
+                                                                - std::max(left,
+                                                                           tree.left));
                                                     }
                                             }
                                     }