- Moved storedAt to the SynapseTypeDefinition

lukas.molzberger · lukas.molzberger · commit ec91791af479 · 2024-03-22T11:55:02.000+01:00
diff --git a/core/src/main/java/network/aika/elements/synapses/ConjunctiveSynapse.java b/core/src/main/java/network/aika/elements/synapses/ConjunctiveSynapse.java
@@ -180,12 +180,6 @@ public void setModified() {
             no.setModified();
     }
 
-    @Override
-    public Direction getStoredAt() {
-        return OUTPUT;
-    }
-
-
     @Override
     public boolean isWeak() {
         return getOutput().getBias().getUpdatedValue() > -synapseBias.getUpdatedValue();
diff --git a/core/src/main/java/network/aika/elements/synapses/DisjunctiveSynapse.java b/core/src/main/java/network/aika/elements/synapses/DisjunctiveSynapse.java
@@ -60,9 +60,4 @@ public void setModified() {
         if(in != null)
             in.setModified();
     }
-
-    @Override
-    public Direction getStoredAt() {
-        return INPUT;
-    }
 }
diff --git a/core/src/main/java/network/aika/elements/synapses/Synapse.java b/core/src/main/java/network/aika/elements/synapses/Synapse.java
@@ -361,7 +361,9 @@ public void setTrainingAllowed(boolean trainingAllowed) {
         this.trainingAllowed = trainingAllowed;
     }
 
-    public abstract Direction getStoredAt();
+    public final Direction getStoredAt() {
+        return synapseType.getStoredAt();
+    }
 
     public NeuronProvider getPInput() {
         return input;
diff --git a/core/src/main/java/network/aika/elements/synapses/SynapseType.java b/core/src/main/java/network/aika/elements/synapses/SynapseType.java
@@ -20,6 +20,8 @@
 import network.aika.elements.activations.StateType;
 import network.aika.enums.Trigger;
 import network.aika.enums.Transition;
+import network.aika.enums.direction.Direction;
+import network.aika.enums.direction.DirectionEnum;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -47,4 +49,6 @@
     StateType outputState() default StateType.PRE_FEEDBACK;
 
     boolean propagateRange() default true;
+
+    DirectionEnum storedAt();
 }
diff --git a/core/src/main/java/network/aika/elements/synapses/types/BindingCategoryInputSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/BindingCategoryInputSynapse.java
@@ -25,6 +25,7 @@
 import network.aika.elements.synapses.CategoryInputSynapse;
 import network.aika.elements.synapses.ConjunctiveCategoryInputSynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -47,7 +48,8 @@
         transition = {INPUT_INPUT, SAME_SAME},
         required = INPUT_INPUT,
         outputState = PRE_FEEDBACK,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class BindingCategoryInputSynapse extends ConjunctiveCategoryInputSynapse<
         BindingCategoryInputSynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/BindingCategorySynapse.java b/core/src/main/java/network/aika/elements/synapses/types/BindingCategorySynapse.java
@@ -22,6 +22,7 @@
 import network.aika.elements.neurons.Neuron;
 import network.aika.elements.synapses.CategorySynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.BINDING;
 import static network.aika.enums.Transition.INPUT_INPUT;
@@ -37,7 +38,8 @@
         outputType = BINDING,
         transition = {INPUT_INPUT, SAME_SAME},
         required = INPUT_INPUT,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.INPUT
 )
 public class BindingCategorySynapse extends CategorySynapse<BindingCategorySynapse, Neuron, BindingActivation> {
 
diff --git a/core/src/main/java/network/aika/elements/synapses/types/InhibitoryCategoryInputSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/InhibitoryCategoryInputSynapse.java
@@ -26,6 +26,7 @@
 import network.aika.elements.synapses.DisjunctiveSynapse;
 import network.aika.elements.synapses.SynapseType;
 import network.aika.enums.direction.Direction;
+import network.aika.enums.direction.DirectionEnum;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,7 +49,8 @@
         transition = INPUT_INPUT,
         required = INPUT_INPUT,
         outputState = PRE_FEEDBACK,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class InhibitoryCategoryInputSynapse extends DisjunctiveSynapse<
         InhibitoryCategoryInputSynapse,
@@ -61,11 +63,6 @@ public class InhibitoryCategoryInputSynapse extends DisjunctiveSynapse<
 {
     private double initialCategorySynapseWeight;
 
-    @Override
-    public Direction getStoredAt() {
-        return OUTPUT;
-    }
-
     @Override
     public void link() {
         input.addOutputSynapse(this);
diff --git a/core/src/main/java/network/aika/elements/synapses/types/InhibitoryCategorySynapse.java b/core/src/main/java/network/aika/elements/synapses/types/InhibitoryCategorySynapse.java
@@ -22,6 +22,7 @@
 import network.aika.elements.neurons.Neuron;
 import network.aika.elements.synapses.CategorySynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.INHIBITORY;
 import static network.aika.enums.Transition.INPUT_INPUT;
@@ -36,7 +37,8 @@
         outputType = INHIBITORY,
         transition = INPUT_INPUT,
         required = INPUT_INPUT,
-        trigger = NOT_FIRED
+        trigger = NOT_FIRED,
+        storedAt = DirectionEnum.INPUT
 )
 public class InhibitoryCategorySynapse extends CategorySynapse<InhibitoryCategorySynapse, Neuron, InhibitoryActivation> {
 
diff --git a/core/src/main/java/network/aika/elements/synapses/types/InhibitorySynapse.java b/core/src/main/java/network/aika/elements/synapses/types/InhibitorySynapse.java
@@ -23,6 +23,7 @@
 import network.aika.elements.neurons.types.InhibitoryNeuron;
 import network.aika.elements.synapses.DisjunctiveSynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.*;
 import static network.aika.enums.Transition.INPUT_INPUT;
@@ -37,7 +38,8 @@
         outputType = INHIBITORY,
         transition = INPUT_INPUT,
         required = INPUT_INPUT,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.INPUT
 )
 public class InhibitorySynapse extends DisjunctiveSynapse<
         InhibitorySynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/InnerPositiveFeedbackSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/InnerPositiveFeedbackSynapse.java
@@ -23,6 +23,7 @@
 import network.aika.elements.links.types.InnerPositiveFeedbackLink;
 import network.aika.elements.neurons.types.PatternNeuron;
 import network.aika.elements.synapses.PositiveFeedbackSynapse;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.*;
 import static network.aika.elements.activations.StateType.INNER_FEEDBACK;
@@ -40,7 +41,8 @@
         required = SAME_SAME,
         trigger = NOT_FIRED,
         outputState = INNER_FEEDBACK,
-        propagateRange = false
+        propagateRange = false,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class InnerPositiveFeedbackSynapse extends PositiveFeedbackSynapse<
         InnerPositiveFeedbackSynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/InputObjectSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/InputObjectSynapse.java
@@ -23,6 +23,7 @@
 import network.aika.elements.neurons.types.PatternNeuron;
 import network.aika.elements.synapses.ConjunctiveSynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.BINDING;
 import static network.aika.elements.Type.PATTERN;
@@ -38,7 +39,8 @@
         outputType = BINDING,
         transition = SAME_INPUT,
         required = SAME_INPUT,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class InputObjectSynapse extends ConjunctiveSynapse<
         InputObjectSynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/NegativeFeedbackSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/NegativeFeedbackSynapse.java
@@ -28,6 +28,7 @@
 import network.aika.elements.synapses.slots.AnnealingType;
 import network.aika.elements.synapses.slots.SynapseSlot;
 import network.aika.enums.direction.Direction;
+import network.aika.enums.direction.DirectionEnum;
 import network.aika.fields.Field;
 
 import java.io.DataInput;
@@ -53,7 +54,8 @@
         required = INPUT_INPUT,
         trigger = FIRED_PRE_FEEDBACK,
         outputState = OUTER_FEEDBACK,
-        propagateRange = false
+        propagateRange = false,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class NegativeFeedbackSynapse extends ConjunctiveSynapse<
         NegativeFeedbackSynapse,
@@ -99,11 +101,6 @@ public NegativeFeedbackLink createLink(InhibitoryActivation input, BindingActiva
         return new NegativeFeedbackLink(this, input, output);
     }
 
-    @Override
-    public Direction getStoredAt() {
-        return OUTPUT;
-    }
-
     @Override
     public void setModified() {
         BindingNeuron no = getOutput();
diff --git a/core/src/main/java/network/aika/elements/synapses/types/OuterPositiveFeedbackSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/OuterPositiveFeedbackSynapse.java
@@ -26,6 +26,7 @@
 import network.aika.elements.synapses.slots.AnnealingSynapseOutputSlot;
 import network.aika.elements.synapses.slots.AnnealingType;
 import network.aika.elements.synapses.slots.SynapseSlot;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.BINDING;
 import static network.aika.elements.Type.PATTERN;
@@ -43,7 +44,8 @@
         transition = SAME_INPUT,
         required = INPUT_SAME,
         trigger = FIRED_PRE_FEEDBACK,
-        outputState = OUTER_FEEDBACK
+        outputState = OUTER_FEEDBACK,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class OuterPositiveFeedbackSynapse extends PositiveFeedbackSynapse<
         OuterPositiveFeedbackSynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/PatternCategoryInputSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/PatternCategoryInputSynapse.java
@@ -25,6 +25,7 @@
 import network.aika.elements.synapses.CategoryInputSynapse;
 import network.aika.elements.synapses.ConjunctiveCategoryInputSynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -46,7 +47,8 @@
         transition = SAME_SAME,
         required = SAME_SAME,
         outputState = PRE_FEEDBACK,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class PatternCategoryInputSynapse
         extends ConjunctiveCategoryInputSynapse<
diff --git a/core/src/main/java/network/aika/elements/synapses/types/PatternCategorySynapse.java b/core/src/main/java/network/aika/elements/synapses/types/PatternCategorySynapse.java
@@ -22,6 +22,7 @@
 import network.aika.elements.neurons.types.PatternNeuron;
 import network.aika.elements.synapses.CategorySynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.PATTERN;
 import static network.aika.enums.Transition.SAME_SAME;
@@ -36,7 +37,8 @@
         outputType = PATTERN,
         transition = SAME_SAME,
         required = SAME_SAME,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.INPUT
 )
 public class PatternCategorySynapse extends CategorySynapse<PatternCategorySynapse, PatternNeuron, PatternActivation> {
 
diff --git a/core/src/main/java/network/aika/elements/synapses/types/PatternSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/PatternSynapse.java
@@ -25,6 +25,7 @@
 import network.aika.elements.neurons.types.PatternNeuron;
 import network.aika.elements.synapses.ConjunctiveSynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 import network.aika.fields.FieldOutput;
 import network.aika.text.Range;
 import network.aika.statistic.SampleSpace;
@@ -57,7 +58,8 @@
         outputType = PATTERN,
         transition = {SAME_SAME, INPUT_INPUT},
         required = SAME_SAME,
-        trigger = PRIMARY_CHECKED_FIRED_OUTER_FEEDBACK
+        trigger = PRIMARY_CHECKED_FIRED_OUTER_FEEDBACK,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class PatternSynapse extends ConjunctiveSynapse<
         PatternSynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/PrimaryInhibitorySynapse.java b/core/src/main/java/network/aika/elements/synapses/types/PrimaryInhibitorySynapse.java
@@ -23,6 +23,7 @@
 import network.aika.elements.neurons.types.PatternNeuron;
 import network.aika.elements.synapses.DisjunctiveSynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 
 import static network.aika.elements.Type.BINDING;
 import static network.aika.elements.Type.INHIBITORY;
@@ -38,7 +39,8 @@
         outputType = INHIBITORY,
         transition = SAME_INPUT,
         required = SAME_INPUT,
-        trigger = FIRED_PRE_FEEDBACK
+        trigger = FIRED_PRE_FEEDBACK,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class PrimaryInhibitorySynapse extends DisjunctiveSynapse<
         PrimaryInhibitorySynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/RelationInputSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/RelationInputSynapse.java
@@ -26,6 +26,7 @@
 import network.aika.elements.synapses.ConjunctiveSynapse;
 import network.aika.elements.synapses.SynapseType;
 import network.aika.enums.direction.Direction;
+import network.aika.enums.direction.DirectionEnum;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -44,7 +45,8 @@
         outputType = BINDING,
         transition = INPUT_INPUT,
         required = INPUT_INPUT,
-        propagateRange = false
+        propagateRange = false,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class RelationInputSynapse extends ConjunctiveSynapse<
         RelationInputSynapse,
diff --git a/core/src/main/java/network/aika/elements/synapses/types/SameObjectSynapse.java b/core/src/main/java/network/aika/elements/synapses/types/SameObjectSynapse.java
@@ -21,6 +21,7 @@
 import network.aika.elements.neurons.types.BindingNeuron;
 import network.aika.elements.synapses.ConjunctiveSynapse;
 import network.aika.elements.synapses.SynapseType;
+import network.aika.enums.direction.DirectionEnum;
 import network.aika.fields.FieldOutput;
 
 import static network.aika.elements.Type.BINDING;
@@ -40,7 +41,8 @@
         transition = SAME_SAME,
         required = INPUT_INPUT,
         trigger = PRIMARY_CHECKED_FIRED_OUTER_FEEDBACK,
-        propagateRange = false
+        propagateRange = false,
+        storedAt = DirectionEnum.OUTPUT
 )
 public class SameObjectSynapse extends ConjunctiveSynapse<
         SameObjectSynapse,
diff --git a/core/src/main/java/network/aika/elements/typedef/SynapseTypeDefinition.java b/core/src/main/java/network/aika/elements/typedef/SynapseTypeDefinition.java
@@ -22,6 +22,7 @@
 import network.aika.elements.synapses.SynapseType;
 import network.aika.enums.Trigger;
 import network.aika.enums.Transition;
+import network.aika.enums.direction.Direction;
 
 import java.util.HashMap;
 
@@ -44,6 +45,8 @@ public class SynapseTypeDefinition {
 
     private boolean propagateRange;
 
+    private Direction storedAt;
+
     public static SynapseTypeDefinition getDefinition(Class clazz) {
         return cache.computeIfAbsent(clazz, c ->
                 new SynapseTypeDefinition(
@@ -62,6 +65,7 @@ private SynapseTypeDefinition(SynapseType synTypeAnno) {
         trigger = synTypeAnno.trigger();
         outputState = synTypeAnno.outputState();
         propagateRange = synTypeAnno.propagateRange();
+        storedAt = synTypeAnno.storedAt().getDir();
     }
 
     public Type getInputType() {
@@ -91,4 +95,8 @@ public StateType outputState() {
     public boolean isPropagateRange() {
         return propagateRange;
     }
+
+    public Direction getStoredAt() {
+        return storedAt;
+    }
 }
diff --git a/core/src/main/java/network/aika/enums/direction/DirectionEnum.java b/core/src/main/java/network/aika/enums/direction/DirectionEnum.java
@@ -0,0 +1,16 @@
+package network.aika.enums.direction;
+
+public enum DirectionEnum {
+    INPUT(Direction.INPUT),
+    OUTPUT(Direction.OUTPUT);
+
+    private Direction dir;
+
+    DirectionEnum(Direction dir) {
+        this.dir = dir;
+    }
+
+    public Direction getDir() {
+        return dir;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,4 @@ public void setModified() {`
`60`	`60`	`if(in != null)`
`61`	`61`	`in.setModified();`
`62`	`62`	`}`
`63`		`-`
`64`		`- @Override`
`65`		`- public Direction getStoredAt() {`
`66`		`- return INPUT;`
`67`		`- }`
`68`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,9 @@ public void setTrainingAllowed(boolean trainingAllowed) {`
`361`	`361`	`this.trainingAllowed = trainingAllowed;`
`362`	`362`	`}`
`363`	`363`
`364`		`- public abstract Direction getStoredAt();`
	`364`	`+ public final Direction getStoredAt() {`
	`365`	`+ return synapseType.getStoredAt();`
	`366`	`+ }`
`365`	`367`
`366`	`368`	`public NeuronProvider getPInput() {`
`367`	`369`	`return input;`