Migration graph determined more carefully

Author: melkebir

src/simulation/celltree.cpp

@@ -735,9 +735,18 @@ MigrationGraph CellTree::getObservedMigrationGraph() const
         mutations.insert(cell.getPassengerMutations().begin(),
                          cell.getPassengerMutations().end());
 
+        IntSet mappedMutations;
+        for (int j : mutations)
+        {
+          if (_cellTreeMutationToObservableMutation.count(i))
+          {
+            mappedMutations.insert(_cellTreeMutationToObservableMutation.find(j)->second);
+          }
+        }
+        
         IntSet X;
-        std::set_intersection(mutations.begin(),
-                              mutations.end(),
+        std::set_intersection(mappedMutations.begin(),
+                              mappedMutations.end(),
                               _sampledMutationsByAnatomicalSite[t].begin(),
                               _sampledMutationsByAnatomicalSite[t].end(),
                               std::inserter(X, X.begin()));
@@ -755,7 +764,7 @@ MigrationGraph CellTree::getObservedMigrationGraph() const
             std::cout << " " << i;
           }
           std::cout << "; mutations in migrating cell: ";
-          for (int i : mutations)
+          for (int i : mappedMutations)
           {
             std::cout << " " << i;
           }