fixed addConflict

Author: Lukas Molzberger

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

@@ -354,13 +354,20 @@ public void adjustSelectedNeuronInputs(Decision d) {
 
 
     public static boolean checkSelfReferencing(Activation nx, Activation ny, boolean onlySelected, int depth) {
-        if (nx == ny) return true;
+        if (nx == ny) {
+            return true;
+        }
 
-        if (depth > MAX_SELF_REFERENCING_DEPTH) return false;
+        if (depth > MAX_SELF_REFERENCING_DEPTH) {
+            return false;
+        }
 
-        Set<SynapseActivation> inputs = onlySelected ? ny.selectedNeuronInputs : ny.neuronInputs;
-        for (SynapseActivation sa: inputs) {
-            if (checkSelfReferencing(nx, sa.input, onlySelected, depth + 1)) return true;
+        for (SynapseActivation sa: onlySelected ? ny.selectedNeuronInputs : ny.neuronInputs) {
+            if(!sa.synapse.key.isRecurrent) {
+                if (checkSelfReferencing(nx, sa.input, onlySelected, depth + 1)) {
+                    return true;
+                }
+            }
         }
 
         return false;

src/main/java/org/aika/neuron/activation/Conflicts.java

@@ -17,6 +17,7 @@
 package org.aika.neuron.activation;
 
 
+import org.aika.neuron.INeuron;
 import org.aika.neuron.activation.Linker.Direction;
 
 import java.util.*;
@@ -48,19 +49,19 @@ public static void linkConflicts(Activation act, long v, Direction dir) {
                 Activation oAct = (dir == INPUT ? act : sa.output);
                 Activation iAct = (dir == INPUT ? sa.input : act);
 
-                markConflicts(iAct, oAct, v);
-
                 addConflict(oAct, iAct, v);
             }
         }
     }
 
 
     private static void addConflict(Activation oAct, Activation iAct, long v) {
-        if (iAct.markedConflict == v) {
-            if (iAct != oAct) {
-                add(oAct, iAct);
-            }
+        if(oAct == iAct) {
+            return;
+        }
+
+        if (iAct.getINeuron().type != INeuron.Type.INHIBITORY) {
+            add(oAct, iAct);
         } else {
             for (Activation.SynapseActivation sa : iAct.neuronInputs) {
                 if(!sa.synapse.key.isRecurrent) {
@@ -71,16 +72,6 @@ private static void addConflict(Activation oAct, Activation iAct, long v) {
     }
 
 
-    private static void markConflicts(Activation iAct, Activation oAct, long v) {
-        oAct.markedConflict = v;
-        for (Activation.SynapseActivation sa : iAct.neuronOutputs) {
-            if (sa.synapse.key.isRecurrent && sa.synapse.isNegative()) {
-                sa.output.markedConflict = v;
-            }
-        }
-    }
-
-
     public static Collection<Activation> getConflicting(Activation n) {
         ArrayList<Activation> conflicts = new ArrayList<>();
         Conflicts.collectConflicting(conflicts, n);