Skip to content

Commit

Permalink
Merge pull request #2383 from jeizenga/mod-with-paths
Browse files Browse the repository at this point in the history
Sync paths correctly in VG::expand_context
  • Loading branch information
jeizenga authored Aug 10, 2019
2 parents 4302dff + b77a012 commit 41901bc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/path.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ bool Paths::has_mapping(const string& name, int32_t rank) {
}

void Paths::append_mapping(const string& name, const mapping_t& m, bool warn_on_duplicates) {

// get or create the path with this name
list<mapping_t>& pt = get_create_path(name);
// now if we haven't already supplied a mapping
Expand Down
6 changes: 5 additions & 1 deletion src/vg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,11 @@ void VG::expand_context_by_steps(VG& g, size_t steps, bool add_paths) {
}
}
});
g.sync_paths();
g.paths.sort_by_mapping_rank();
g.paths.rebuild_mapping_aux();

// store paths in graph
g.paths.to_graph(g.graph);
}
}

Expand Down

2 comments on commit 41901bc

@adamnovak
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vg CI tests complete for merge to master. View the full report here.

18 tests passed, 0 tests failed and 0 tests skipped in 12030 seconds

Tests produced 376 warnings. 376 were for lower-than-expected alignment scores

@adamnovak
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vg CI tests complete for branch v1.18.0. View the full report here.

18 tests passed, 1 tests failed and 0 tests skipped in 11673 seconds

Failed tests:

  • test_sim_chr21_snp1kg_trained (67 seconds)

Tests produced 798 warnings. 794 were for lower-than-expected alignment scores

Please sign in to comment.