Merge branch 'main' of https://github.com/sriram98v/generalized_suffi…

…x_tree
sriram98v · Oct 12, 2023 · 5edc914 · 5edc914
2 parents 693b115 + 03a7c3e
commit 5edc914
Show file tree

Hide file tree

Showing 2 changed files with 246 additions and 153 deletions.
diff --git a/src/suffix_node.rs b/src/suffix_node.rs
@@ -1,4 +1,4 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::fmt::{Display, Debug};
 use std::hash::Hash;
 use std::option::Option;
@@ -7,9 +7,6 @@ use serde::{Serialize, Deserialize};
 pub trait SuffixNode<T> {
     fn set_parent(&mut self, parent: usize);
     fn get_parent(&self)->Option<&usize>;
-    fn set_suffix_link(&mut self, link_node:usize);
-    fn get_suffix_link(&self)->Option<&usize>;
-    fn add_seq(&mut self, seq_id:&usize, start:&usize);
     fn get_child(&self, child:&T)->Option<&usize>;
     fn get_child_mut(&mut self, child:&T)->Option<&mut usize>;
     fn set_child(&mut self, edge:T, child:usize);
@@ -22,8 +19,6 @@ pub trait SuffixNode<T> {
     fn set_start(&mut self, new_start:usize);
     fn has_children(&self)->bool;
     fn get_children(&self)->&HashMap<T, usize>;
-    fn get_data(&self)->&HashMap<usize, HashSet<usize>>;
-    fn add_data(&mut self, new_data: HashMap<usize, HashSet<usize>>);
 }
 
 
@@ -33,9 +28,7 @@ where
     T: Display + Debug + Eq + PartialEq + Hash + Clone,
 {
     children: HashMap<T, usize>,
-    suffix_link: Option<usize>,
     string_id: Option<usize>,
-    data: HashMap<usize, HashSet<usize>>,
     parent: Option<usize>,
     edge_length: usize,
     start: usize,
@@ -46,17 +39,13 @@ where
     T: Display + Debug + Eq + PartialEq + Hash + Clone,
 {
     pub fn new(children: HashMap<T, usize>,
-                suffix_link: Option<usize>,
                 string_id: Option<usize>,
-                data: HashMap<usize, HashSet<usize>>,
                 parent: Option<usize>,
                 edge_length: usize,
-                start: usize)->Node<T>{
-                    Node {
+                start: usize)->Self{
+                    Self {
                         children: children,
-                        suffix_link: suffix_link,
                         string_id: string_id,
-                        data: data,
                         parent: parent,
                         edge_length: edge_length,
                         start: start,
@@ -77,25 +66,6 @@ where
         self.parent.as_ref()
     }
 
-    fn set_suffix_link(&mut self, link_node:usize){
-        self.suffix_link = Some(link_node);
-    }
-
-    fn get_suffix_link(&self)->Option<&usize>{
-        self.suffix_link.as_ref()
-    }
-
-    fn add_seq(&mut self, seq_id:&usize, start:&usize){
-        match self.data.get_mut(seq_id){
-            None => {self.data.insert(seq_id.clone(), HashSet::from([start.clone()]));},
-            Some(i) => {
-                match i.contains(start){
-                    false => {i.insert(start.clone());},
-                    true => {},
-                };
-            }
-        };
-    }
 
     fn get_child(&self, child:&T)->Option<&usize>{
         self.children.get(child)
@@ -146,20 +116,4 @@ where
         &self.children
     }
 
-    fn get_data(&self)->&HashMap<usize, HashSet<usize>>{
-        &self.data
-    }
-
-    fn add_data(&mut self, new_data: HashMap<usize, HashSet<usize>>){
-        for (key, v) in new_data.iter(){
-            match self.data.get_mut(key){
-                None => {self.data.insert(key.clone(), v.clone());},
-                Some(values) => {
-                    for value in v.iter(){
-                        values.insert(value.clone());
-                    }
-                },
-            };
-        }
-    }
 }