Merge remote-tracking branch 'origin/master'

Author: Lukas Molzberger

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

@@ -427,7 +427,7 @@ public Activation addInput(Document doc, Activation.Builder input) {
         Activation act = getActivation(doc, input);
 
         if (act == null) {
-            act = new Activation(doc, this, input.getSlots(doc));
+            act = createActivation(doc, input.getSlots(doc));
         }
 
         act.setInputState(input);
@@ -448,6 +448,11 @@ public Activation addInput(Document doc, Activation.Builder input) {
     }
 
 
+    protected Activation createActivation(Document doc, Map<Integer, Position> slots) {
+        return new Activation(doc, this, slots);
+    }
+
+
     private Activation getActivation(Document doc, Activation.Builder input) {
         Integer firstSlot = input.positions.firstKey();
         Position firstPos = doc.lookupFinalPosition(input.positions.get(firstSlot));

src/main/java/network/aika/neuron/activation/Activation.java

@@ -46,7 +46,7 @@
  *
  * @author Lukas Molzberger
  */
-public final class Activation implements Comparable<Activation> {
+public class Activation implements Comparable<Activation> {
 
     public static int BEGIN = 0;
     public static int END = 1;
@@ -1162,7 +1162,7 @@ public Activation getActivation() {
     }
 
 
-    public class Option {
+    public class Option implements Comparable<Option> {
         public int snId;
         public State state;
         public Decision decision;
@@ -1232,6 +1232,13 @@ public Activation getAct() {
         public String toString() {
             return " snId:" + snId + " d:"  + decision + " cacheFactor:" + cacheFactor + " w:" + Utils.round(weight) + " p:" + p + " " + state;
         }
+
+        @Override
+        public int compareTo(Option o) {
+            int r = Integer.compare(getAct().getId(), o.getAct().getId());
+            if(r != 0) return r;
+            return Integer.compare(snId, o.snId);
+        }
     }