- Introduced Neuron/Synapse Type Definitions

lukas.molzberger · lukas.molzberger · commit 48ad00667cae · 2024-03-22T11:25:44.000+01:00
diff --git a/core/src/main/java/network/aika/elements/neurons/ConjunctiveNeuron.java b/core/src/main/java/network/aika/elements/neurons/ConjunctiveNeuron.java
@@ -36,7 +36,7 @@
  */
 public abstract class ConjunctiveNeuron<N extends ConjunctiveNeuron, A extends ConjunctiveActivation> extends Neuron<N, A> {
 
-    private static final Logger log = LoggerFactory.getLogger(ConjunctiveNeuron.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConjunctiveNeuron.class);
 
     public ConjunctiveNeuron(NeuronProvider np) {
         super(np);
@@ -91,8 +91,4 @@ public void addInactiveLinks(Activation act) {
                         s.createAndInitLink(null, act)
                 );
     }
-
-    public ActivationFunction getActivationFunction() {
-        return ActivationFunction.RECTIFIED_HYPERBOLIC_TANGENT;
-    }
 }
diff --git a/core/src/main/java/network/aika/elements/neurons/DisjunctiveNeuron.java b/core/src/main/java/network/aika/elements/neurons/DisjunctiveNeuron.java
@@ -38,8 +38,4 @@ public DisjunctiveNeuron(Model m, RefType rt) {
     @Override
     public void addInactiveLinks(Activation act) {
     }
-
-    public ActivationFunction getActivationFunction() {
-        return ActivationFunction.LIMITED_RECTIFIED_LINEAR_UNIT;
-    }
 }
diff --git a/core/src/main/java/network/aika/elements/neurons/Neuron.java b/core/src/main/java/network/aika/elements/neurons/Neuron.java
@@ -25,6 +25,7 @@
 import network.aika.elements.activations.bsslots.BSSlotDefinition;
 import network.aika.elements.synapses.CategoryInputSynapse;
 import network.aika.elements.synapses.CategorySynapse;
+import network.aika.elements.typedef.NeuronTypeDefinition;
 import network.aika.enums.Scope;
 import network.aika.enums.Trigger;
 import network.aika.exceptions.MissingInputCategoryNeuron;
@@ -47,7 +48,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import static network.aika.elements.neurons.NeuronTypeHolder.getHolder;
+import static network.aika.elements.typedef.NeuronTypeDefinition.getDefinition;
 import static network.aika.elements.neurons.RefType.*;
 import static network.aika.queue.Phase.TRAINING;
 import static network.aika.utils.Utils.TOLERANCE;
@@ -64,7 +65,7 @@ public abstract class Neuron<N extends Neuron, A extends Activation> implements
 
     protected static final String CATEGORY_LABEL = " Category";
 
-    private final NeuronTypeHolder neuronType = getHolder(getClass());
+    private final NeuronTypeDefinition neuronType = getDefinition(getClass());
 
     private int synapseIdCounter = 0;
 
@@ -308,7 +309,9 @@ public boolean isTrainingAllowed() {
 
     public abstract void addInactiveLinks(Activation act);
 
-    public abstract ActivationFunction getActivationFunction();
+    public final ActivationFunction getActivationFunction() {
+        return neuronType.getActivationFunction();
+    }
 
     public void count(A act) {
     }
diff --git a/core/src/main/java/network/aika/elements/neurons/NeuronType.java b/core/src/main/java/network/aika/elements/neurons/NeuronType.java
@@ -16,6 +16,7 @@
  */
 package network.aika.elements.neurons;
 
+import network.aika.ActivationFunction;
 import network.aika.elements.Type;
 import network.aika.elements.activations.bsslots.BSSlotDefinition;
 
@@ -32,7 +33,9 @@
 @Target(ElementType.TYPE)
 public @interface NeuronType {
 
-    public Type type();
+    Type type();
 
-    public BSSlotDefinition[] bindingSignalSlots();
+    ActivationFunction activationFunction();
+
+    BSSlotDefinition[] bindingSignalSlots();
 }
diff --git a/core/src/main/java/network/aika/elements/neurons/types/BindingCategoryNeuron.java b/core/src/main/java/network/aika/elements/neurons/types/BindingCategoryNeuron.java
@@ -25,6 +25,7 @@
 import network.aika.elements.neurons.NeuronType;
 import network.aika.elements.neurons.RefType;
 
+import static network.aika.ActivationFunction.LIMITED_RECTIFIED_LINEAR_UNIT;
 import static network.aika.elements.Type.BINDING;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.SINGLE_INPUT;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.SINGLE_SAME;
@@ -34,6 +35,7 @@
  */
 @NeuronType(
         type = BINDING,
+        activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
         bindingSignalSlots = {SINGLE_INPUT, SINGLE_SAME}
 )
 public class BindingCategoryNeuron extends CategoryNeuron {
diff --git a/core/src/main/java/network/aika/elements/neurons/types/BindingNeuron.java b/core/src/main/java/network/aika/elements/neurons/types/BindingNeuron.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.util.Comparator;
 
+import static network.aika.ActivationFunction.RECTIFIED_HYPERBOLIC_TANGENT;
 import static network.aika.elements.Type.BINDING;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.*;
 import static network.aika.elements.neurons.RefType.CATEGORY;
@@ -42,6 +43,7 @@
  */
 @NeuronType(
         type = BINDING,
+        activationFunction = RECTIFIED_HYPERBOLIC_TANGENT,
         bindingSignalSlots = {SINGLE_INPUT, SINGLE_SAME_FEEDBACK}
 )
 public class BindingNeuron extends ConjunctiveNeuron<BindingNeuron, BindingActivation> {
diff --git a/core/src/main/java/network/aika/elements/neurons/types/InhibitoryCategoryNeuron.java b/core/src/main/java/network/aika/elements/neurons/types/InhibitoryCategoryNeuron.java
@@ -25,6 +25,7 @@
 import network.aika.elements.neurons.NeuronType;
 import network.aika.elements.neurons.RefType;
 
+import static network.aika.ActivationFunction.LIMITED_RECTIFIED_LINEAR_UNIT;
 import static network.aika.elements.Type.INHIBITORY;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.SINGLE_INPUT;
 
@@ -33,6 +34,7 @@
  */
 @NeuronType(
         type = INHIBITORY,
+        activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
         bindingSignalSlots = SINGLE_INPUT
 )
 public class InhibitoryCategoryNeuron extends CategoryNeuron {
diff --git a/core/src/main/java/network/aika/elements/neurons/types/InhibitoryNeuron.java b/core/src/main/java/network/aika/elements/neurons/types/InhibitoryNeuron.java
@@ -28,6 +28,7 @@
 import network.aika.elements.synapses.types.InhibitoryCategoryInputSynapse;
 import network.aika.elements.synapses.types.InhibitoryCategorySynapse;
 
+import static network.aika.ActivationFunction.LIMITED_RECTIFIED_LINEAR_UNIT;
 import static network.aika.elements.Type.INHIBITORY;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.SINGLE_INPUT;
 import static network.aika.elements.neurons.RefType.CATEGORY;
@@ -39,6 +40,7 @@
  */
 @NeuronType(
         type = INHIBITORY,
+        activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
         bindingSignalSlots = SINGLE_INPUT
 )
 public class InhibitoryNeuron extends DisjunctiveNeuron<InhibitoryNeuron, InhibitoryActivation> {
@@ -77,11 +79,6 @@ public InhibitoryActivation createActivation(Document doc) {
         return new InhibitoryActivation(doc.createActivationId(), doc, this);
     }
 
-    public ActivationFunction getActivationFunction() {
-        return ActivationFunction.LIMITED_RECTIFIED_LINEAR_UNIT;
-    }
-
-
     @Override
     public CategorySynapse createCategorySynapse() {
         return new InhibitoryCategorySynapse();
diff --git a/core/src/main/java/network/aika/elements/neurons/types/LatentRelationNeuron.java b/core/src/main/java/network/aika/elements/neurons/types/LatentRelationNeuron.java
@@ -30,6 +30,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
+import static network.aika.ActivationFunction.RECTIFIED_HYPERBOLIC_TANGENT;
 import static network.aika.elements.Type.BINDING;
 import static network.aika.queue.Phase.TRAINING;
 import static network.aika.utils.Utils.TOLERANCE;
@@ -40,6 +41,7 @@
  */
 @NeuronType(
         type = BINDING,
+        activationFunction = RECTIFIED_HYPERBOLIC_TANGENT,
         bindingSignalSlots = {}
 )
 public class LatentRelationNeuron extends BindingNeuron {
diff --git a/core/src/main/java/network/aika/elements/neurons/types/PatternCategoryNeuron.java b/core/src/main/java/network/aika/elements/neurons/types/PatternCategoryNeuron.java
@@ -25,6 +25,7 @@
 import network.aika.elements.neurons.NeuronType;
 import network.aika.elements.neurons.RefType;
 
+import static network.aika.ActivationFunction.LIMITED_RECTIFIED_LINEAR_UNIT;
 import static network.aika.elements.Type.PATTERN;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.SINGLE_SAME;
 
@@ -33,6 +34,7 @@
  */
 @NeuronType(
         type = PATTERN,
+        activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
         bindingSignalSlots = SINGLE_SAME
 )
 public class PatternCategoryNeuron extends CategoryNeuron {
diff --git a/core/src/main/java/network/aika/elements/neurons/types/PatternNeuron.java b/core/src/main/java/network/aika/elements/neurons/types/PatternNeuron.java
@@ -37,6 +37,7 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
+import static network.aika.ActivationFunction.RECTIFIED_HYPERBOLIC_TANGENT;
 import static network.aika.elements.Type.PATTERN;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.MULTI_INPUT;
 import static network.aika.elements.activations.bsslots.BSSlotDefinition.SINGLE_SAME;
@@ -50,6 +51,7 @@
  */
 @NeuronType(
         type = PATTERN,
+        activationFunction = RECTIFIED_HYPERBOLIC_TANGENT,
         bindingSignalSlots = {SINGLE_SAME, MULTI_INPUT}
 )
 public class PatternNeuron extends ConjunctiveNeuron<PatternNeuron, PatternActivation> {
diff --git a/core/src/main/java/network/aika/elements/synapses/Synapse.java b/core/src/main/java/network/aika/elements/synapses/Synapse.java
@@ -26,6 +26,7 @@
 import network.aika.Document;
 import network.aika.elements.Element;
 import network.aika.elements.links.Link;
+import network.aika.elements.typedef.SynapseTypeDefinition;
 import network.aika.queue.Timestamp;
 import network.aika.elements.synapses.slots.SynapseSlot;
 import network.aika.enums.Scope;
@@ -56,7 +57,7 @@
 import static network.aika.queue.Timestamp.MIN;
 import static network.aika.elements.neurons.RefType.SYNAPSE_IN;
 import static network.aika.elements.neurons.RefType.SYNAPSE_OUT;
-import static network.aika.elements.synapses.SynapseTypeHolder.getHolder;
+import static network.aika.elements.typedef.SynapseTypeDefinition.getDefinition;
 import static network.aika.queue.Phase.TRAINING;
 import static network.aika.utils.Utils.TOLERANCE;
 
@@ -68,7 +69,7 @@ public abstract class Synapse<S extends Synapse, I extends Neuron, O extends Neu
 
     protected static final Logger log = LoggerFactory.getLogger(Synapse.class);
 
-    protected final SynapseTypeHolder synapseType = getHolder(getClass());
+    protected final SynapseTypeDefinition synapseType = getDefinition(getClass());
 
     protected int synapseId;
     protected NeuronProvider input;
@@ -429,7 +430,7 @@ public boolean isNegative() {
         return weight.getUpdatedValue() < 0.0;
     }
 
-    public SynapseTypeHolder getSynapseType() {
+    public SynapseTypeDefinition getSynapseType() {
         return synapseType;
     }
 
diff --git a/core/src/main/java/network/aika/elements/synapses/SynapseType.java b/core/src/main/java/network/aika/elements/synapses/SynapseType.java
@@ -34,17 +34,17 @@
 @Target(ElementType.TYPE)
 public @interface SynapseType {
 
-    public Type inputType();
+    Type inputType();
 
-    public Type outputType();
+    Type outputType();
 
-    public Transition[] transition();
+    Transition[] transition();
 
-    public Transition required();
+    Transition required();
 
-    public Trigger trigger() default Trigger.FIRED_INNER_FEEDBACK;
+    Trigger trigger() default Trigger.FIRED_INNER_FEEDBACK;
 
-    public StateType outputState() default StateType.PRE_FEEDBACK;
+    StateType outputState() default StateType.PRE_FEEDBACK;
 
-    public boolean propagateRange() default true;
+    boolean propagateRange() default true;
 }
diff --git a/core/src/main/java/network/aika/elements/typedef/NeuronTypeDefinition.java b/core/src/main/java/network/aika/elements/typedef/NeuronTypeDefinition.java
@@ -14,42 +14,52 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.aika.elements.neurons;
+package network.aika.elements.typedef;
 
+import network.aika.ActivationFunction;
 import network.aika.elements.Type;
 import network.aika.elements.activations.bsslots.BSSlotDefinition;
+import network.aika.elements.neurons.Neuron;
+import network.aika.elements.neurons.NeuronType;
 
 import java.util.HashMap;
 
 /**
  *
  * @author Lukas Molzberger
  */
-public class NeuronTypeHolder {
+public class NeuronTypeDefinition {
 
     private Type type;
 
+    private ActivationFunction activationFunction;
+
     private BSSlotDefinition[] bindingSignalSlots;
 
-    public static NeuronTypeHolder getHolder(Class clazz) {
+    public static NeuronTypeDefinition getDefinition(Class clazz) {
         return cache.computeIfAbsent(clazz, c ->
-                new NeuronTypeHolder(
+                new NeuronTypeDefinition(
                         c.getAnnotation(NeuronType.class)
                 )
         );
     }
 
-    private static HashMap<Class<Neuron>, NeuronTypeHolder> cache = new HashMap();
+    private static HashMap<Class<Neuron>, NeuronTypeDefinition> cache = new HashMap();
 
-    private NeuronTypeHolder(NeuronType typeAnnotation) {
+    private NeuronTypeDefinition(NeuronType typeAnnotation) {
         this.type = typeAnnotation.type();
+        this.activationFunction = typeAnnotation.activationFunction();
         this.bindingSignalSlots = typeAnnotation.bindingSignalSlots();
     }
 
     public Type getType() {
         return type;
     }
 
+    public ActivationFunction getActivationFunction() {
+        return activationFunction;
+    }
+
     public BSSlotDefinition[] getBindingSignalSlots() {
         return bindingSignalSlots;
     }
diff --git a/core/src/main/java/network/aika/elements/typedef/SynapseTypeDefinition.java b/core/src/main/java/network/aika/elements/typedef/SynapseTypeDefinition.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package network.aika.elements.synapses;
+package network.aika.elements.typedef;
 
 import network.aika.elements.Type;
 import network.aika.elements.activations.StateType;
+import network.aika.elements.synapses.Synapse;
+import network.aika.elements.synapses.SynapseType;
 import network.aika.enums.Trigger;
 import network.aika.enums.Transition;
 
@@ -27,7 +29,7 @@
  *
  * @author Lukas Molzberger
  */
-public class SynapseTypeHolder {
+public class SynapseTypeDefinition {
     private Type inputType;
 
     private Type outputType;
@@ -42,17 +44,17 @@ public class SynapseTypeHolder {
 
     private boolean propagateRange;
 
-    public static SynapseTypeHolder getHolder(Class clazz) {
+    public static SynapseTypeDefinition getDefinition(Class clazz) {
         return cache.computeIfAbsent(clazz, c ->
-                new SynapseTypeHolder(
+                new SynapseTypeDefinition(
                         c.getAnnotation(SynapseType.class)
                 )
         );
     }
 
-    private static HashMap<Class<Synapse>, SynapseTypeHolder> cache = new HashMap();
+    private static HashMap<Class<Synapse>, SynapseTypeDefinition> cache = new HashMap();
 
-    private SynapseTypeHolder(SynapseType synTypeAnno) {
+    private SynapseTypeDefinition(SynapseType synTypeAnno) {
         inputType = synTypeAnno.inputType();
         outputType = synTypeAnno.outputType();
         transition = synTypeAnno.transition();
diff --git a/debugger/src/main/java/network/aika/debugger/neurons/properties/synapses/SynapsePropertyPanel.java b/debugger/src/main/java/network/aika/debugger/neurons/properties/synapses/SynapsePropertyPanel.java
@@ -20,7 +20,7 @@
 import network.aika.elements.links.Link;
 import network.aika.elements.synapses.ConjunctiveSynapse;
 import network.aika.elements.synapses.Synapse;
-import network.aika.elements.synapses.SynapseTypeHolder;
+import network.aika.elements.typedef.SynapseTypeDefinition;
 import network.aika.utils.StringUtils;
 
 import java.util.Arrays;
@@ -61,7 +61,7 @@ protected void initSynapseProperties(E s) {
         addConstant("Initial Instance Weight: ", "" + StringUtils.doubleToString(s.getInitialInstanceWeight()));
     }
 
-    protected void initSynapseTypeProperties(SynapseTypeHolder st) {
+    protected void initSynapseTypeProperties(SynapseTypeDefinition st) {
         addConstant("InputType: ", "" + st.getInputType());
         addConstant("OutputType: ", "" + st.getOutputType());
         addConstant("Transitions: ", "" +
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,7 @@
 
 
     <properties>
-        <revision>2.0.9-rc29</revision>
+        <revision>2.0.9-rc30</revision>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,4 @@ public DisjunctiveNeuron(Model m, RefType rt) {`
`38`	`38`	`@Override`
`39`	`39`	`public void addInactiveLinks(Activation act) {`
`40`	`40`	`}`
`41`		`-`
`42`		`- public ActivationFunction getActivationFunction() {`
`43`		`- return ActivationFunction.LIMITED_RECTIFIED_LINEAR_UNIT;`
`44`		`- }`
`45`	`41`	`}`