修改加载算法删除排序，提高加载速度

toolgood · Apr 6, 2020 · 3d1b222 · 3d1b222
1 parent 8abb1f3
commit 3d1b222
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 9 deletions.
diff --git a/java/toolgood.words/src/main/java/toolgood/words/StringSearch.java b/java/toolgood.words/src/main/java/toolgood/words/StringSearch.java
@@ -1,8 +1,9 @@
 package toolgood.words;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 
 import toolgood.words.internals.TrieNode;
 import toolgood.words.internals.TrieNode2;
@@ -29,6 +30,7 @@ private void SetKeywords()
 
  List<TrieNode> allNode = new ArrayList<TrieNode>();
  allNode.add(root);
+ Map<Integer,List<TrieNode>> allNodeLayers=new Hashtable<Integer,List<TrieNode>>();
 
  for (int i = 0; i < _keywords.length; i++) {
  String p = _keywords[i];
@@ -37,11 +39,25 @@ private void SetKeywords()
  nd = nd.Add(p.charAt(j) );
  if (nd.Layer == 0) {
  nd.Layer = j + 1;
- allNode.add(nd);
+ if(allNodeLayers.containsKey(nd.Layer)==false){
+ List<TrieNode> nodes=new ArrayList<TrieNode>();
+ nodes.add(nd);
+ allNodeLayers.put(nd.Layer, nodes);
+ }else {
+ allNodeLayers.get(nd.Layer).add(nd);
+ }
  }
  }
  nd.SetResults(i);
  }
+ for (int layer : allNodeLayers.keySet()) {
+ List<TrieNode> nodes=allNodeLayers.get(layer);
+ for (int i = 0; i < nodes.size(); i++) {
+ allNode.add(nodes.get(i));
+ }
+ }
+ allNodeLayers.clear();
+ allNodeLayers=null;
 
  List<TrieNode> nodes = new ArrayList<TrieNode>();
  for (Character key : root.m_values.keySet()) {
@@ -76,7 +92,7 @@ private void SetKeywords()
  }
  root.Failure = root;
 
- Collections.sort(allNode);
+ //Collections.sort(allNode);
  for (int i = 0; i < allNode.size(); i++) { allNode.get(i).Index = i; }
 
 

diff --git a/java/toolgood.words/src/main/java/toolgood/words/WordsSearch.java b/java/toolgood.words/src/main/java/toolgood/words/WordsSearch.java
@@ -1,7 +1,7 @@
 package toolgood.words;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
@@ -54,6 +54,7 @@ private void SetKeywords()
 
  List<TrieNode> allNode = new ArrayList<TrieNode>();
  allNode.add(root);
+ Map<Integer,List<TrieNode>> allNodeLayers=new Hashtable<Integer,List<TrieNode>>();
 
  for (int i = 0; i < _keywords.length; i++) {
  String p = _keywords[i];
@@ -62,11 +63,25 @@ private void SetKeywords()
  nd = nd.Add(p.charAt(j) );
  if (nd.Layer == 0) {
  nd.Layer = j + 1;
- allNode.add(nd);
+ if(allNodeLayers.containsKey(nd.Layer)==false){
+ List<TrieNode> nodes=new ArrayList<TrieNode>();
+ nodes.add(nd);
+ allNodeLayers.put(nd.Layer, nodes);
+ }else {
+ allNodeLayers.get(nd.Layer).add(nd);
+ }
  }
  }
  nd.SetResults(i);
  }
+ for (int layer : allNodeLayers.keySet()) {
+ List<TrieNode> nodes=allNodeLayers.get(layer);
+ for (int i = 0; i < nodes.size(); i++) {
+ allNode.add(nodes.get(i));
+ }
+ }
+ allNodeLayers.clear();
+ allNodeLayers=null;
 
  List<TrieNode> nodes = new ArrayList<TrieNode>();
  for (Character key : root.m_values.keySet()) {
@@ -101,7 +116,7 @@ private void SetKeywords()
  }
  root.Failure = root;
 
- Collections.sort(allNode);
+ //Collections.sort(allNode);
  for (int i = 0; i < allNode.size(); i++) { allNode.get(i).Index = i; }
 
 

diff --git a/java/toolgood.words/src/main/java/toolgood/words/internals/BaseSearchEx.java b/java/toolgood.words/src/main/java/toolgood/words/internals/BaseSearchEx.java
@@ -144,6 +144,7 @@ private void SetKeywords() {
 
  List<TrieNode> allNode = new ArrayList<TrieNode>();
  allNode.add(root);
+ Map<Integer,List<TrieNode>> allNodeLayers=new Hashtable<Integer,List<TrieNode>>();
 
  for (int i = 0; i < _keywords.length; i++) {
  String p = _keywords[i];
@@ -152,11 +153,24 @@ private void SetKeywords() {
  nd = nd.Add(p.charAt(j));
  if (nd.Layer == 0) {
  nd.Layer = j + 1;
- allNode.add(nd);
- }
+ if(allNodeLayers.containsKey(nd.Layer)==false){
+ List<TrieNode> nodes=new ArrayList<TrieNode>();
+ nodes.add(nd);
+ allNodeLayers.put(nd.Layer, nodes);
+ }else {
+ allNodeLayers.get(nd.Layer).add(nd);
+ } }
  }
  nd.SetResults(i);
  }
+ for (int layer : allNodeLayers.keySet()) {
+ List<TrieNode> nodes=allNodeLayers.get(layer);
+ for (int i = 0; i < nodes.size(); i++) {
+ allNode.add(nodes.get(i));
+ }
+ }
+ allNodeLayers.clear();
+ allNodeLayers=null;
 
  List<TrieNode> nodes = new ArrayList<TrieNode>();
  for (Character key : root.m_values.keySet()) {
@@ -191,7 +205,7 @@ private void SetKeywords() {
  }
  root.Failure = root;
 
- Collections.sort(allNode);
+ //Collections.sort(allNode);
  for (int i = 0; i < allNode.size(); i++) {
  allNode.get(i).Index = i;
  }