minor refactoring

Author: Lukas Molzberger

src/main/java/org/aika/corpus/Document.java

@@ -88,7 +88,7 @@ public class Document implements Comparable<Document> {
     public ArrayList<Activation> addedActivations = new ArrayList<>();
 
 
-    public SearchNode rootSearchNode = new SearchNode(this, null, null, null, -1, Collections.emptySet());
+    public SearchNode rootSearchNode = new SearchNode(this, null, null, null, -1);
     public SearchNode selectedSearchNode = null;
     public ArrayList<Candidate> candidates;
     public List<InterpretationNode> bestInterpretation = null;
@@ -242,7 +242,7 @@ public void process() {
 
         Candidate c = !candidates.isEmpty() ? candidates.get(0) : null;
 
-        SearchNode child = new SearchNode(this, rootSearchNode, null, c, 0, Collections.singleton(bottom));
+        SearchNode child = new SearchNode(this, rootSearchNode, null, c, 0);
         SearchNode.searchIterative(this, child);
 //        child.searchRecursive(this);
 
@@ -517,11 +517,11 @@ public void add(int round, Activation act) {
         }
 
 
-        public Weight process(SearchNode sn, Collection<InterpretationNode> changed) {
+        public Weight process(SearchNode sn) {
             long v = visitedCounter++;
 
-            for(InterpretationNode n: changed) {
-                addAll(n.getActivations());
+            if(sn.getParent() != null && sn.getParent().candidate != null) {
+                addAll(sn.getParent().candidate.refinement.getActivations());
             }
 
             Weight delta = Weight.ZERO;

src/main/java/org/aika/corpus/SearchNode.java

@@ -100,7 +100,7 @@ enum Step {
     }
 
 
-    public SearchNode(Document doc, SearchNode selParent, SearchNode exclParent, Candidate c, int level, Collection<InterpretationNode> changed) {
+    public SearchNode(Document doc, SearchNode selParent, SearchNode exclParent, Candidate c, int level) {
         id = doc.searchNodeIdCounter++;
         this.level = level;
         visited = doc.visitedCounter++;
@@ -134,7 +134,7 @@ public SearchNode(Document doc, SearchNode selParent, SearchNode exclParent, Can
         }
 
         if(modified) {
-            weightDelta = doc.vQueue.process(this, changed);
+            weightDelta = doc.vQueue.process(this);
             markDirty();
 
             if(candidate != null) {
@@ -151,7 +151,7 @@ public SearchNode(Document doc, SearchNode selParent, SearchNode exclParent, Can
                     act.saveNewState();
                 }
             } else {
-                weightDelta = doc.vQueue.process(this, changed);
+                weightDelta = doc.vQueue.process(this);
                 if (Math.abs(weightDelta.w - csn.weightDelta.w) > 0.00001 || !compareNewState(csn)) {
                     log.error("Cached search node activation do not match the newly computed results.");
                     log.info("Computed results:");
@@ -427,7 +427,7 @@ private boolean prepareSelectStep(Document doc) {
         }
 
         Candidate c = doc.candidates.size() > level + 1 ? doc.candidates.get(level + 1) : null;
-        selectedChild = new SearchNode(doc, this, excludedParent, c, level + 1, Collections.singleton(candidate.refinement));
+        selectedChild = new SearchNode(doc, this, excludedParent, c, level + 1);
 
         candidate.debugDecisionCounts[0]++;
 
@@ -441,7 +441,7 @@ private boolean prepareExcludeStep(Document doc) {
         candidate.refinement.setState(EXCLUDED, visited);
 
         Candidate c = doc.candidates.size() > level + 1 ? doc.candidates.get(level + 1) : null;
-        excludedChild = new SearchNode(doc, selectedParent, this, c, level + 1, Collections.singleton(candidate.refinement));
+        excludedChild = new SearchNode(doc, selectedParent, this, c, level + 1);
 
         candidate.debugDecisionCounts[1]++;