fixed overlapping acts

Author: Lukas Molzberger

src/main/java/org/aika/lattice/OrNode.java

@@ -142,6 +142,8 @@ public void addActivation(Document doc, Integer ridOffset, NodeActivation inputA
             r = new Range(begin, end);
         }
 
+        if(r.begin == Integer.MIN_VALUE || r.end == Integer.MAX_VALUE) return;
+
         Key nak = new Key(
                 this,
                 r,

src/test/java/org/aika/network/OverlappingOrTest.java

@@ -39,7 +39,6 @@
 public class OverlappingOrTest {
 
 
-    @Ignore
     @Test
     public void testOverlappingOr() {
         Model m = new Model();
@@ -60,30 +59,30 @@ public void testOverlappingOr() {
         // relative or absolute.
         Neuron pattern = m.initNeuron(
                 m.createNeuron("BCD"),
-                0.4,
+                2.0,
                 new Input()
                         .setNeuron(inputNeurons.get('b'))
-                        .setWeight(1.0f)
+                        .setWeight(4.0f)
                         .setRecurrent(false)
                         .setRelativeRid(0)
-                        .setBiasDelta(0.5)
+                        .setBiasDelta(1.0)
                         .setStartRangeMatch(Operator.EQUALS)
-                        .setEndRangeMatch(Operator.LESS_THAN_EQUAL)
+                        .setEndRangeMatch(Operator.GREATER_THAN_EQUAL)
                         .setStartRangeOutput(true),
                 new Input()
                         .setNeuron(inputNeurons.get('c'))
                         .setWeight(1.0f)
                         .setRecurrent(false)
                         .setRelativeRid(1)
-                        .setBiasDelta(0.5)
+                        .setBiasDelta(0.0)
                         .setRangeMatch(RangeRelation.CONTAINS),
                 new Input()
                         .setNeuron(inputNeurons.get('d'))
-                        .setWeight(1.0f)
+                        .setWeight(4.0f)
                         .setRecurrent(false)
                         .setRelativeRid(2)
-                        .setBiasDelta(0.5)
-                        .setStartRangeMatch(Operator.GREATER_THAN_EQUAL)
+                        .setBiasDelta(1.0)
+                        .setStartRangeMatch(Operator.LESS_THAN_EQUAL)
                         .setEndRangeMatch(Operator.EQUALS)
                         .setEndRangeOutput(true)
         );
@@ -93,20 +92,11 @@ public void testOverlappingOr() {
         System.out.println(doc.neuronActivationsToString(true, false, true));
 
         int wordPos = 0;
-        for(int i = 0; i < doc.length(); i++) {
-            char c = doc.getContent().charAt(i);
-            if(c == ' ') {
-                inputNeurons.get(c).addInput(doc, i, i + 1, wordPos++);
-            }
-            System.out.println(doc.neuronActivationsToString(true, false, true));
-        }
-
         for(int i = 0; i < doc.length(); i++) {
             char c = doc.getContent().charAt(i);
             if(c != ' ') {
-                inputNeurons.get(c).addInput(doc, i, i + 1);
+                inputNeurons.get(c).addInput(doc, i, i + 1, wordPos++);
             }
-
             System.out.println(doc.neuronActivationsToString(true, false, true));
         }