feat(sam): update general-sam to 0.3.0

ModelTC · Oct 18, 2023 · 17d186e · 17d186e
1 parent fe9dbc5
commit 17d186e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ name = "general_sam"
 crate-type = ["cdylib"]
 
 [dependencies]
-general-sam = "0.2.0"
+general-sam = "0.3.0"
 pyo3 = { version = "0.20.0", features = [
   "extension-module",
   "abi3-py38",

diff --git a/general_sam/vocab_prefix.py b/general_sam/vocab_prefix.py
@@ -86,7 +86,8 @@ def _gen_cnt_info_in_sam(self):
             state_id = state.get_node_id()
             self.cnt_info_in_sam[state_id] = replace(cnt_info, str_cnt=1)
 
-        for sam_state in reversed(self.sam_rev.get_topo_order()):
+        depth_sorted_order = self.sam_rev.get_topo_and_suf_len_sorted_states()
+        for sam_state in reversed(depth_sorted_order):
             assert not sam_state.is_nil()
             if sam_state.is_root():
                 continue

diff --git a/src/sam.rs b/src/sam.rs
@@ -258,9 +258,9 @@ impl GeneralSAM {
         GeneralSAMState(self.0.clone(), node_id)
     }
 
-    pub fn get_topo_order(&self) -> Vec<GeneralSAMState> {
+    pub fn get_topo_and_suf_len_sorted_states(&self) -> Vec<GeneralSAMState> {
         for_both!(self.0.as_ref(), x => {
-            x.get_topo_sorted_node_ids()
+            x.get_topo_and_suf_len_sorted_node_ids()
                 .iter()
                 .map(|node_id| self.get_state(*node_id))
                 .collect()