fix

Lukas Molzberger · Lukas Molzberger · commit 6ca4cbc0de95 · 2018-03-12T09:54:31.000+01:00
diff --git a/src/main/java/org/aika/neuron/activation/Conflicts.java b/src/main/java/org/aika/neuron/activation/Conflicts.java
@@ -63,7 +63,9 @@ private static void addConflict(Activation oAct, Activation iAct, long v) {
             }
         } else {
             for (Activation.SynapseActivation sa : iAct.neuronInputs) {
-                addConflict(oAct, sa.input, v);
+                if(!sa.synapse.key.isRecurrent) {
+                    addConflict(oAct, sa.input, v);
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ private static void addConflict(Activation oAct, Activation iAct, long v) {`
`63`	`63`	`}`
`64`	`64`	`} else {`
`65`	`65`	`for (Activation.SynapseActivation sa : iAct.neuronInputs) {`
`66`		`- addConflict(oAct, sa.input, v);`
	`66`	`+ if(!sa.synapse.key.isRecurrent) {`
	`67`	`+ addConflict(oAct, sa.input, v);`
	`68`	`+ }`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`}`