Skip to content

Commit

Permalink
Update genome-graph.
Browse files Browse the repository at this point in the history
  • Loading branch information
sebschmi committed Sep 19, 2024
1 parent 127ea7c commit f91ae1d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 58 deletions.
70 changes: 21 additions & 49 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ lto = true
debug = true

[dependencies]
genome-graph = {version = "9.0.0", features = ["traitgraph-algo"]}
traitgraph-algo = {version = "8.1.0", features = ["hashbrown_dijkstra_node_weight_array"]}
genome-graph = { version = "10.0.0", features = ["traitgraph-algo"] }
traitgraph-algo = { version = "8.1.0", features = [
"hashbrown_dijkstra_node_weight_array",
] }
log = "0.4.20"
simplelog = "0.12.0"
clap = {version = "4.5.17", features = ["derive", "cargo"]}
clap = { version = "4.5.17", features = ["derive", "cargo"] }
itertools = "0.13.0"
atomic-counter = "1.0.1"
disjoint-sets = "0.4.2"
Expand Down
13 changes: 7 additions & 6 deletions src/bin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ use genome_graph::bigraph::traitgraph::interface::StaticGraph;
use genome_graph::bigraph::traitgraph::interface::{DynamicGraph, ImmutableGraphContainer};
use genome_graph::bigraph::traitgraph::traitsequence::interface::Sequence;
use genome_graph::bigraph::traitgraph::walks::EdgeWalk;
use genome_graph::compact_genome::implementation::{DefaultGenome, DefaultSequenceStore};
use genome_graph::compact_genome::interface::alphabet::dna_alphabet::DnaAlphabet;
use genome_graph::compact_genome::implementation::{
alphabets::dna_alphabet::DnaAlphabet, DefaultGenome, DefaultSequenceStore,
};
use genome_graph::compact_genome::interface::alphabet::Alphabet;
use genome_graph::compact_genome::interface::sequence::{GenomeSequence, OwnedGenomeSequence};
use genome_graph::compact_genome::interface::sequence_store::{HandleWithLength, SequenceStore};
Expand Down Expand Up @@ -252,10 +253,10 @@ impl<AlphabetType: Alphabet, GenomeSequenceStore: SequenceStore<AlphabetType>>
&self.sequence_handle
}

fn sequence_ref<'a>(
&self,
source_sequence_store: &'a GenomeSequenceStore,
) -> Option<&'a <GenomeSequenceStore as SequenceStore<AlphabetType>>::SequenceRef> {
fn sequence_ref<'this: 'result, 'store: 'result, 'result>(
&'this self,
source_sequence_store: &'store GenomeSequenceStore,
) -> Option<&'result <GenomeSequenceStore as SequenceStore<AlphabetType>>::SequenceRef> {
if self.forward {
let handle =
<Self as SequenceData<AlphabetType, GenomeSequenceStore>>::sequence_handle(self);
Expand Down

0 comments on commit f91ae1d

Please sign in to comment.