-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
acdb937
commit ec81475
Showing
16 changed files
with
341 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
|
|
||
| use derive_more::{ | ||
| Deref, | ||
| DerefMut, | ||
| IntoIterator, | ||
| }; | ||
| use derive_new::new; | ||
| use itertools::Itertools; | ||
| use std::collections::VecDeque; | ||
|
|
||
| use crate::graph::{ | ||
| labelling::LabellingCtx, | ||
| partitions::container::PartitionContainer, | ||
| traversal::{ | ||
| direction::{ | ||
| TopDown, | ||
| TraversalDirection, | ||
| }, | ||
| pass::TraversalPass, queue::Queue, | ||
| }, | ||
| utils::cover::ChildCover, | ||
| vocabulary::{ | ||
| entry::{ | ||
| HasVertexEntries, | ||
| VertexCtx, | ||
| }, | ||
| NGramId, | ||
| ProcessStatus, | ||
| }, | ||
| }; | ||
| use seqraph::{ | ||
| graph::{ | ||
| getters::vertex::VertexSet, | ||
| vertex::{ | ||
| child::Child, | ||
| data::{ | ||
| VertexData, | ||
| VertexDataBuilder, | ||
| }, | ||
| has_vertex_index::{ | ||
| HasVertexIndex, | ||
| ToChild, | ||
| }, | ||
| has_vertex_key::HasVertexKey, | ||
| key::VertexKey, | ||
| pattern::id::PatternId, | ||
| wide::Wide, | ||
| VertexIndex, | ||
| }, | ||
| Hypergraph, | ||
| }, | ||
| HashMap, | ||
| HashSet, | ||
| }; | ||
|
|
||
| use crate::graph::{traversal::{queue::{LayeredQueue, LinearQueue}, visited::VisitTracking}, vocabulary::Vocabulary}; | ||
|
|
||
|
|
||
| #[derive(Debug, Deref, DerefMut)] | ||
| pub struct AccumulateCtx<'b> | ||
| { | ||
| #[deref] | ||
| #[deref_mut] | ||
| pub ctx: &'b mut LabellingCtx, | ||
| pub result: Hypergraph, | ||
| visited: <Self as VisitTracking>::Collection, | ||
| } | ||
|
|
||
| impl<'b> From<&'b mut LabellingCtx> for AccumulateCtx<'b> { | ||
| fn from(ctx: &'b mut LabellingCtx) -> Self | ||
| { | ||
| Self { | ||
| ctx, | ||
| result: Default::default(), | ||
| visited: Default::default(), | ||
| } | ||
| } | ||
| } | ||
| impl VisitTracking for AccumulateCtx<'_> | ||
| { | ||
| type Collection = HashSet<<Self as TraversalPass>::Node>; | ||
| fn visited_mut(&mut self) -> &mut <Self as VisitTracking>::Collection { | ||
| &mut self.visited | ||
| } | ||
| } | ||
| impl TraversalPass for AccumulateCtx<'_> | ||
| { | ||
| type Node = NGramId; | ||
| type NextNode = NGramId; | ||
| type Queue = LinearQueue<Self>; | ||
| fn start_queue(&mut self) -> Self::Queue { | ||
| let queue = Self::Queue::from_iter( | ||
| TopDown::starting_nodes(&self.vocab) | ||
| ); | ||
| for vk in queue.iter() | ||
| { | ||
| let data = self.vocab.containment.expect_vertex(vk.vertex_key()); | ||
| let mut builder = VertexDataBuilder::default(); | ||
| builder.width(data.width()); | ||
| builder.key(**vk); | ||
| self.result.insert_vertex_builder(builder); | ||
| } | ||
| queue | ||
| } | ||
| fn node_condition(&mut self, node: Self::Node) -> bool { | ||
| (!self.visited_mut().contains(&node) | ||
| && self.labels.contains(&node)) | ||
| || self.vocab.leaves.contains(&node) | ||
| .then(|| self.visited_mut().insert(node)) | ||
| .is_some() | ||
| } | ||
| fn on_node( | ||
| &mut self, | ||
| node: &NGramId, | ||
| ) -> Option<Vec<NGramId>> | ||
| { | ||
| //let container = PartitionContainer::from_ngram(self, *node); | ||
| //let entry = self.vocab.get_vertex(node).unwrap(); | ||
|
|
||
| //let pids: Vec<_> = std::iter::repeat_n((), container.len()) | ||
| // .map(|_| PatternId::default()) | ||
| // .collect(); | ||
|
|
||
| //let parent_data = self.result.expect_vertex_mut(node.vertex_key()); | ||
|
|
||
| //// child patterns with indices in containment | ||
| //parent_data.children = pids.into_iter().zip(container).collect(); | ||
|
|
||
| //// child locations parent in self.graph, children indices in self.vocab.containment | ||
| //let child_locations = parent_data | ||
| // .all_localized_children_iter() | ||
| // .into_iter() | ||
| // .map(|(l, c)| (l, *c)) | ||
| // .collect_vec(); | ||
|
|
||
| // create child nodes in self.graph | ||
| // set child parents and translate child indices to self.graph | ||
| //for (loc, vi) in child_locations.iter().copied() | ||
| //{ | ||
| // let key = self.vocab.containment.expect_key_for_index(vi); | ||
| // let out_index = if let Ok(v) = self.result.get_vertex_mut(key) | ||
| // { | ||
| // v.add_parent(loc); | ||
| // v.vertex_index() | ||
| // } | ||
| // else | ||
| // { | ||
| // let mut builder = VertexDataBuilder::default(); | ||
| // builder.width(vi.width()); | ||
| // builder.key(key); | ||
| // let mut data = self.result.finish_vertex_builder(builder); | ||
| // data.add_parent(loc); | ||
|
|
||
| // // translate containment index to output index | ||
| // let out = if vi.width() > 1 { | ||
| // self.result.insert_vertex_data(data) | ||
| // } else { | ||
| // self.result.insert_token_data(*self.vocab.containment.expect_token_by_key(&key), data) | ||
| // }.vertex_index(); | ||
|
|
||
| // if !self.ctx.labels.contains(&key) { | ||
| // self.ctx.labels.insert(key); | ||
| // // TODO: Rerun frequency pass for subgraph of key | ||
| // } | ||
| // out | ||
| // }; | ||
| // self.result.expect_child_mut_at(loc).index = out_index; | ||
| //} | ||
| //let next = child_locations | ||
| // .clone() | ||
| // .into_iter() | ||
| // .flat_map(|(_, p)| p) | ||
| // .filter(|c| c.width() > 1) | ||
| // .map(|c| | ||
| // NGramId::new( | ||
| // self.vocab.get_vertex(&c).unwrap().data.vertex_key(), | ||
| // c.width(), | ||
| // ) | ||
| // ) | ||
| // .collect(); | ||
| let next = vec![]; | ||
| Some(next) | ||
| } | ||
| fn begin_run(&mut self) { | ||
| println!("Accumulate Pass"); | ||
| } | ||
|
|
||
| fn finish_run(&mut self) { | ||
| self.vocab.roots.iter().for_each(|key| { | ||
| let _ = self.result.vertex_key_string(key); | ||
| }); | ||
| self.status = ProcessStatus::Partitions; | ||
| println!("{:#?}", &self.result); | ||
| } | ||
| } |
Oops, something went wrong.