fixes

Author: Lukas Molzberger

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

@@ -406,13 +406,13 @@ public Activation getActivation(Document doc, Range r, boolean onlyFinal) {
 
         if (r.begin != null) {
             for (Activation act : th.getActivationsByRangeBegin(r.begin, true, r.begin, false)) {
-                if (!onlyFinal || act.isFinalActivation()) {
+                if ((!onlyFinal || act.isFinalActivation()) && r.equalsIgnoreNull(act.range)) {
                     return act;
                 }
             }
         } else if(r.end != null) {
             for (Activation act : th.getActivationsByRangeEnd(r.end, true, r.end, false)) {
-                if (!onlyFinal || act.isFinalActivation()) {
+                if (!onlyFinal || act.isFinalActivation() && r.equalsIgnoreNull(act.range)) {
                     return act;
                 }
             }

src/main/java/network/aika/neuron/range/Range.java

@@ -100,6 +100,18 @@ public boolean equals(Range r) {
     }
 
 
+    public boolean equalsIgnoreNull(Range r) {
+        if(begin != null && r.begin != null && !begin.compare(Operator.EQUALS, r.begin)) {
+            return false;
+        }
+        if(end != null && r.end != null && !end.compare(Operator.EQUALS, r.end)) {
+            return false;
+        }
+
+        return true;
+    }
+
+
     public String toString() {
         StringBuilder sb = new StringBuilder();
 
@@ -142,7 +154,8 @@ public static class Relation implements Writable, Comparable<Relation> {
         public static Relation OVERLAPS = create(Operator.NONE, Operator.LESS_THAN, Operator.NONE, Operator.GREATER_THAN);
         public static Relation NONE = create(Operator.NONE, Operator.NONE);
         public static Relation BETWEEN = create(Operator.GREATER_THAN, Operator.LESS_THAN);
-
+        public static Relation BEFORE = create(Operator.NONE, Operator.NONE, Operator.NONE , Operator.LESS_THAN_EQUAL);
+        public static Relation AFTER = create(Operator.NONE, Operator.NONE, Operator.NONE , Operator.GREATER_THAN_EQUAL);
 
         public Operator beginToBegin = Operator.NONE;
         public Operator beginToEnd = Operator.NONE;

src/main/java/network/aika/neuron/relation/Relation.java

@@ -61,6 +61,20 @@ public static void addRelation(Map<Integer, Set<Relation>> relMap, Integer synId
     }
 
 
+    public static Map<Integer, Set<Relation>> getRelationsMap(int synapseId, Neuron n) {
+        if(synapseId == Synapse.OUTPUT) {
+            INeuron in = n.get();
+            if (in.outputRelations == null) {
+                in.outputRelations = new TreeMap<>();
+            }
+            return in.outputRelations;
+        } else {
+            Synapse s = n.getSynapseById(synapseId);
+            return s.relations;
+        }
+    }
+
+
     public static class Builder implements Neuron.Builder {
         private int from;
         private int to;
@@ -108,19 +122,6 @@ public void connect(Neuron n) {
             addRelation(toRel, from, r.invert());
         }
 
-        private static Map<Integer, Set<Relation>> getRelationsMap(int synapseId, Neuron n) {
-            if(synapseId == Synapse.OUTPUT) {
-                INeuron in = n.get();
-                if (in.outputRelations == null) {
-                    in.outputRelations = new TreeMap<>();
-                }
-                return in.outputRelations;
-            } else {
-                Synapse s = n.getSynapseById(synapseId);
-               return s.relations;
-            }
-        }
-
         @Override
         public void registerSynapseIds(Neuron n) {
             n.registerSynapseId(from);