removed activations set from the interpretation node

Author: Lukas Molzberger

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

@@ -190,7 +190,9 @@ public void generateCandidates() {
         }
 
         long v = visitedCounter++;
-        markCandidateSelected(bottom, v);
+        for(Activation act: inputNeuronActivations) {
+            act.visited = v;
+        }
 
         i = 0;
         candidates = new ArrayList<>();
@@ -202,7 +204,7 @@ public void generateCandidates() {
                     c.id = i++;
                     candidates.add(c);
 
-                    markCandidateSelected(c.refinement, v);
+                    c.refinement.activation.visited = v;
                     break;
                 }
             }
@@ -216,15 +218,6 @@ public void generateCandidates() {
     }
 
 
-    private static void markCandidateSelected(InterpretationNode n, long v) {
-        if (n.activations != null) {
-            for (Activation act : n.activations) {
-                act.visited = v;
-            }
-        }
-    }
-
-
     /**
      * The method <code>process</code> needs to be called after all the input activations have been added to the
      * network. It performs the search for the best interpretation.
@@ -488,13 +481,11 @@ public void propagateActivationValue(int round, Activation act)  {
         }
 
 
-        private void addAll(Collection<Activation> acts) {
-            for(Activation act: acts) {
-                add(0, act);
-                for(Activation.SynapseActivation sa: act.neuronOutputs) {
-                    if(sa.synapse.key.isRecurrent) {
-                        add(0, sa.output);
-                    }
+        private void add(Activation act) {
+            add(0, act);
+            for (Activation.SynapseActivation sa : act.neuronOutputs) {
+                if (sa.synapse.key.isRecurrent) {
+                    add(0, sa.output);
                 }
             }
         }
@@ -521,7 +512,7 @@ public Weight process(SearchNode sn) {
             long v = visitedCounter++;
 
             if(sn.getParent() != null && sn.getParent().candidate != null) {
-                addAll(sn.getParent().candidate.refinement.getActivations());
+                add(sn.getParent().candidate.refinement.activation);
             }
 
             Weight delta = Weight.ZERO;

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

@@ -98,7 +98,6 @@ public class InterpretationNode implements Comparable<InterpretationNode> {
     public Conflicts conflicts = new Conflicts();
 
     public NavigableMap<Key, NodeActivation> nodeActivations;
-    public NavigableSet<Activation> activations;
 
 
     public enum State {
@@ -310,11 +309,6 @@ public Collection<NodeActivation> getNodeActivations() {
     }
 
 
-    public Collection<Activation> getActivations() {
-        return activations != null ? activations : Collections.emptySet();
-    }
-
-
     public static InterpretationNode add(Document doc, boolean nonConflicting, InterpretationNode... input) {
         ArrayList<InterpretationNode> in = new ArrayList<>();
         for (InterpretationNode n : input) {

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

@@ -486,24 +486,22 @@ private boolean checkPrecondition() {
 
 
     private void invalidateCachedDecisions(long v) {
-        for (Activation act : candidate.refinement.activations) {
-            for (SynapseActivation sa : act.neuronOutputs) {
-                if (!sa.synapse.isNegative()) {
-                    Candidate posCand = sa.output.key.interpretation.candidate;
-                    if (posCand != null) {
-                        if (posCand.cachedDecision == Boolean.FALSE && candidate.id > posCand.id) {
-                            posCand.cachedDecision = null;
-                        }
+        for (SynapseActivation sa : candidate.refinement.activation.neuronOutputs) {
+            if (!sa.synapse.isNegative()) {
+                Candidate posCand = sa.output.key.interpretation.candidate;
+                if (posCand != null) {
+                    if (posCand.cachedDecision == Boolean.FALSE && candidate.id > posCand.id) {
+                        posCand.cachedDecision = null;
                     }
+                }
 
-                    ArrayList<InterpretationNode> conflicting = new ArrayList<>();
-                    Conflicts.collectConflicting(conflicting, sa.output.key.interpretation, v);
-                    for (InterpretationNode c : conflicting) {
-                        Candidate negCand = c.candidate;
-                        if (negCand != null) {
-                            if (negCand.cachedDecision == Boolean.TRUE && candidate.id > negCand.id) {
-                                negCand.cachedDecision = null;
-                            }
+                ArrayList<InterpretationNode> conflicting = new ArrayList<>();
+                Conflicts.collectConflicting(conflicting, sa.output.key.interpretation, v);
+                for (InterpretationNode c : conflicting) {
+                    Candidate negCand = c.candidate;
+                    if (negCand != null) {
+                        if (negCand.cachedDecision == Boolean.TRUE && candidate.id > negCand.id) {
+                            negCand.cachedDecision = null;
                         }
                     }
                 }

src/main/java/org/aika/neuron/INeuron.java

@@ -625,11 +625,6 @@ public void register(Activation act) {
         TreeMap<NodeActivation.Key, Activation> actRid = th.activationsRid;
         if (actRid != null) actRid.put(ak, act);
 
-        if(ak.interpretation.activations == null) {
-            ak.interpretation.activations = new TreeSet<>();
-        }
-        ak.interpretation.activations.add(act);
-
         if (ak.rid != null) {
             doc.activationsByRid.put(ak, act);
         }