InterprNode -> InterpretationNode

Author: Lukas Molzberger

src/main/java/org/aika/Neuron.java

@@ -18,7 +18,7 @@
 
 
 import org.aika.corpus.Document;
-import org.aika.corpus.InterprNode;
+import org.aika.corpus.InterpretationNode;
 import org.aika.lattice.InputNode;
 import org.aika.neuron.Activation;
 import org.aika.neuron.INeuron;
@@ -96,7 +96,7 @@ public Activation addInput(Document doc, int begin, int end, double value, Doubl
      * @param end   The range end
      * @param o     The interpretation node
      */
-    public Activation addInput(Document doc, int begin, int end, InterprNode o) {
+    public Activation addInput(Document doc, int begin, int end, InterpretationNode o) {
         return addInput(doc, begin, end, null, o);
     }
 
@@ -123,7 +123,7 @@ public Activation addInput(Document doc, int begin, int end, Integer rid) {
      * @param rid   The relational id (e.g. the word position)
      * @param o     The interpretation node
      */
-    public Activation addInput(Document doc, int begin, int end, Integer rid, InterprNode o) {
+    public Activation addInput(Document doc, int begin, int end, Integer rid, InterpretationNode o) {
         return addInput(doc, begin, end, rid, o, 1.0);
     }
 
@@ -138,7 +138,7 @@ public Activation addInput(Document doc, int begin, int end, Integer rid, Interp
      * @param o     The interpretation node
      * @param value The activation value of this input activation
      */
-    public Activation addInput(Document doc, int begin, int end, Integer rid, InterprNode o, double value) {
+    public Activation addInput(Document doc, int begin, int end, Integer rid, InterpretationNode o, double value) {
         return addInput(doc, begin, end, rid, o, value, null, 0);
     }
 
@@ -153,7 +153,7 @@ public Activation addInput(Document doc, int begin, int end, Integer rid, Interp
      * @param value The activation value of this input activation
      * @param targetValue The target activation value for supervised learning
      */
-    public Activation addInput(Document doc, int begin, int end, Integer rid, InterprNode o, double value, Double targetValue, int fired) {
+    public Activation addInput(Document doc, int begin, int end, Integer rid, InterpretationNode o, double value, Double targetValue, int fired) {
         return get(doc).addInput(doc, begin, end, rid, o, value, targetValue, fired);
     }
 

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

@@ -11,7 +11,7 @@ public class Candidate  implements Comparable<Candidate> {
     public Boolean cachedSNDecision;
     public SearchNode cachedSearchNode;
 
-    public InterprNode refinement;
+    public InterpretationNode refinement;
 
     int[] debugCounts = new int[3];
     int[] debugDecisionCounts = new int[3];
@@ -23,7 +23,7 @@ public class Candidate  implements Comparable<Candidate> {
     int maxEnd;
     Integer minRid;
 
-    public Candidate(InterprNode ref, int id) {
+    public Candidate(InterpretationNode ref, int id) {
         this.refinement = ref;
         this.id = id;
         ref.candidate = this;

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

@@ -35,18 +35,18 @@ public class Conflicts {
     public Map<Key, Conflict> secondary = new TreeMap<>();
 
 
-    public static void collectConflicting(Collection<InterprNode> results, InterprNode n, long v) {
+    public static void collectConflicting(Collection<InterpretationNode> results, InterpretationNode n, long v) {
         assert n.primId >= 0;
         n.conflicts.primary.values().forEach(c -> c.secondary.collectPrimitiveNodes(results, v));
         n.conflicts.secondary.values().forEach(c -> results.add(c.primary));
     }
 
 
-    public static void add(NodeActivation act, InterprNode primary, InterprNode secondary) {
+    public static void add(NodeActivation act, InterpretationNode primary, InterpretationNode secondary) {
         Key ck = new Key(secondary, act);
         Conflict c = primary.conflicts.primary.get(ck);
         if(c == null) {
-            c = new Conflict(act, primary, secondary, InterprNode.add(primary.doc, false, primary, secondary));
+            c = new Conflict(act, primary, secondary, InterpretationNode.add(primary.doc, false, primary, secondary));
 
             c.conflict.isConflict++;
 
@@ -63,12 +63,12 @@ public boolean hasConflicts() {
 
     public static class Conflict {
         public NodeActivation act;
-        public InterprNode primary;
-        public InterprNode secondary;
-        public InterprNode conflict;
+        public InterpretationNode primary;
+        public InterpretationNode secondary;
+        public InterpretationNode conflict;
 
 
-        public Conflict(NodeActivation act, InterprNode primary, InterprNode secondary, InterprNode conflict) {
+        public Conflict(NodeActivation act, InterpretationNode primary, InterpretationNode secondary, InterpretationNode conflict) {
             this.act = act;
             this.primary = primary;
             this.secondary = secondary;
@@ -78,10 +78,10 @@ public Conflict(NodeActivation act, InterprNode primary, InterprNode secondary,
 
 
     public static class Key implements Comparable<Key> {
-        public InterprNode o;
+        public InterpretationNode o;
         public NodeActivation act;
 
-        public Key(InterprNode o, NodeActivation act) {
+        public Key(InterpretationNode o, NodeActivation act) {
             this.o = o;
             this.act = act;
         }

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

@@ -33,8 +33,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.aika.corpus.InterprNode.State.SELECTED;
-import static org.aika.corpus.InterprNode.State.UNKNOWN;
+import static org.aika.corpus.InterpretationNode.State.SELECTED;
+import static org.aika.corpus.InterpretationNode.State.UNKNOWN;
 
 /**
  * The {@code Document} class represents a single document which may be either used for processing a text or as
@@ -62,7 +62,7 @@ public class Document implements Comparable<Document> {
     public int searchNodeIdCounter = 0;
     public int searchStepCounter = 0;
 
-    public InterprNode bottom = new InterprNode(this, -1, 0, 0);
+    public InterpretationNode bottom = new InterpretationNode(this, -1, 0, 0);
 
     public Model model;
     public int threadId;
@@ -88,9 +88,9 @@ public class Document implements Comparable<Document> {
 
     public SearchNode rootSearchNode = new SearchNode(this, null, null, null, -1, Collections.emptySet(), false);
     public SearchNode selectedSearchNode = null;
-    public List<InterprNode> rootRefs;
+    public List<InterpretationNode> rootRefs;
     public ArrayList<Candidate> candidates;
-    public List<InterprNode> bestInterpretation = null;
+    public List<InterpretationNode> bestInterpretation = null;
 
 
     public static Comparator<NodeActivation> ACTIVATIONS_OUTPUT_COMPARATOR = (act1, act2) -> {
@@ -170,7 +170,7 @@ public void propagate() {
     private void expandRootRefinement() {
         rootRefs = new ArrayList<>();
         rootRefs.add(bottom);
-        for (InterprNode pn : bottom.children) {
+        for (InterpretationNode pn : bottom.children) {
             if (pn.state == SELECTED || (pn.isPrimitive() && pn.conflicts.primary.isEmpty() && pn.conflicts.secondary.isEmpty())) {
                 rootRefs.add(pn);
             }
@@ -181,14 +181,14 @@ private void expandRootRefinement() {
     public void generateCandidates() {
         TreeSet<Candidate> tmp = new TreeSet<>();
         int i = 0;
-        for (InterprNode cn : bottom.children) {
+        for (InterpretationNode cn : bottom.children) {
             if (cn.state == UNKNOWN) {
                 tmp.add(new Candidate(cn, i++));
             }
         }
 
         long v = visitedCounter++;
-        for (InterprNode n : rootRefs) {
+        for (InterpretationNode n : rootRefs) {
             markCandidateSelected(n, v);
         }
 
@@ -209,7 +209,7 @@ public void generateCandidates() {
     }
 
 
-    private static void markCandidateSelected(InterprNode n, long v) {
+    private static void markCandidateSelected(InterpretationNode n, long v) {
         if (n.neuronActivations != null) {
             for (Activation act : n.neuronActivations) {
                 act.visited = v;
@@ -240,7 +240,7 @@ public void process() {
         SearchNode child = new SearchNode(this, rootSearchNode, null, c, 0, rootRefs, false);
         SearchNode.search(this, child);
 
-        ArrayList<InterprNode> results = new ArrayList<>();
+        ArrayList<InterpretationNode> results = new ArrayList<>();
         results.add(bottom);
         if (selectedSearchNode != null) {
             selectedSearchNode.reconstructSelectedResult(this);
@@ -365,7 +365,7 @@ public String neuronActivationsToString(SearchNode sn, boolean withWeights, bool
         Set<Activation> acts = new TreeSet<>(ACTIVATIONS_OUTPUT_COMPARATOR);
 
         for (INeuron n : activatedNeurons) {
-            Stream<Activation> s = Activation.select(this, n, null, null, null, null, InterprNode.Relation.CONTAINED_IN);
+            Stream<Activation> s = Activation.select(this, n, null, null, null, null, InterpretationNode.Relation.CONTAINED_IN);
             acts.addAll(s.collect(Collectors.toList()));
         }
 
@@ -500,10 +500,10 @@ public void propagateWeight(int round, Activation act)  {
         }
 
 
-        public NormWeight adjustWeight(SearchNode cand, Collection<InterprNode> changed, long visitedModified) {
+        public NormWeight adjustWeight(SearchNode cand, Collection<InterpretationNode> changed, long visitedModified) {
             long v = visitedCounter++;
 
-            for(InterprNode n: changed) {
+            for(InterpretationNode n: changed) {
                 addAllActs(n.getNeuronActivations());
             }
 
@@ -524,7 +524,7 @@ private void addAllActs(Collection<Activation> acts) {
 
 
         public void add(int round, Activation act) {
-            if(act.rounds.isQueued(round) || act.key.interpretation.state == InterprNode.State.UNKNOWN) return;
+            if(act.rounds.isQueued(round) || act.key.interpretation.state == InterpretationNode.State.UNKNOWN) return;
 
             TreeSet<Activation> q;
             if(round < queue.size()) {