final state should never be null

Author: Lukas Molzberger

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

@@ -389,11 +389,10 @@ public String neuronActivationsToString(boolean withWeights, boolean withTextSni
                 }
 
                 if (act.isFinalActivation()) {
-                    if(act.finalState != null) {
-                        sb.append(" - FV:" + Utils.round(act.finalState.value));
-                        sb.append(" FW:" + Utils.round(act.finalState.weight.w));
-                        sb.append(" FN:" + Utils.round(act.finalState.weight.n));
-                    }
+                    sb.append(" - FV:" + Utils.round(act.finalState.value));
+                    sb.append(" FW:" + Utils.round(act.finalState.weight.w));
+                    sb.append(" FN:" + Utils.round(act.finalState.weight.n));
+
                     if(act.targetValue != null) {
                         sb.append(" - TV:" + Utils.round(act.targetValue));
                     }
@@ -652,12 +651,7 @@ public int compare(Activation act1, Activation act2) {
                 Activation.State fs1 = act1.finalState;
                 Activation.State fs2 = act2.finalState;
 
-                int r = 0;
-                if(fs2 == null && fs1 != null) return -1;
-                if(fs2 != null && fs1 == null) return 1;
-                if(fs2 != null && fs1 != null) {
-                    r = Integer.compare(fs2.fired, fs1.fired);
-                }
+                int r = Integer.compare(fs2.fired, fs1.fired);
                 if(r != 0) return r;
                 return act1.key.compareTo(act2.key);
             }

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

@@ -518,7 +518,8 @@ void storeFinalWeight(long v) {
         visitedStoreFinalWeight = v;
 
         for(Activation act: getNeuronActivations()) {
-            act.finalState = act.rounds.getLast();
+            Activation.State fs = act.rounds.getLast();
+            act.finalState = fs != null ? fs : Activation.State.ZERO;
         }
 
         for(InterprNode cn: children) {

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

@@ -35,7 +35,7 @@ public final class Activation extends NodeActivation<OrNode> {
     public double lowerBound;
 
     public Rounds rounds = new Rounds();
-    public State finalState;
+    public State finalState = State.ZERO;
     public double maxActValue = 0.0;
 
     public boolean ubQueued = false;
@@ -97,7 +97,7 @@ public List<SynapseActivation> getFinalOutputActivations() {
 
 
     public boolean isFinalActivation() {
-        return (finalState != null && finalState.value > 0.0) || (targetValue != null && targetValue > 0.0);
+        return finalState.value > 0.0 || (targetValue != null && targetValue > 0.0);
     }