- Moved trainingAllowed to Neuron/SynapseTypeDefinition

lukas.molzberger · lukas.molzberger · commit e41ec4988203 · 2024-03-22T12:10:09.000+01:00
diff --git a/core/src/main/java/network/aika/elements/neurons/CategoryNeuron.java b/core/src/main/java/network/aika/elements/neurons/CategoryNeuron.java
@@ -44,11 +44,6 @@ public CategoryInputSynapse getOutgoingCategoryInputSynapse() {
         return getOutputSynapseByType(CategoryInputSynapse.class);
     }
 
-    @Override
-    public boolean isTrainingAllowed() {
-        return false;
-    }
-
     @Override
     public CategorySynapse createCategorySynapse() {
         throw new UnsupportedOperationException();
diff --git a/core/src/main/java/network/aika/elements/neurons/Neuron.java b/core/src/main/java/network/aika/elements/neurons/Neuron.java
@@ -301,8 +301,8 @@ public boolean isAbstract() {
 
     public abstract CategorySynapse getCategoryOutputSynapse();
 
-    public boolean isTrainingAllowed() {
-        return true;
+    public final boolean isTrainingAllowed() {
+        return neuronType.isTrainingAllowed();
     }
 
     public abstract A createActivation(Document doc);
diff --git a/core/src/main/java/network/aika/elements/neurons/NeuronType.java b/core/src/main/java/network/aika/elements/neurons/NeuronType.java
@@ -38,4 +38,6 @@
     ActivationFunction activationFunction();
 
     BSSlotDefinition[] bindingSignalSlots();
+
+    boolean trainingAllowed() default true;
 }
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
@@ -36,7 +36,8 @@
 @NeuronType(
         type = BINDING,
         activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
-        bindingSignalSlots = {SINGLE_INPUT, SINGLE_SAME}
+        bindingSignalSlots = {SINGLE_INPUT, SINGLE_SAME},
+        trainingAllowed = false
 )
 public class BindingCategoryNeuron extends CategoryNeuron {
 
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
@@ -35,7 +35,8 @@
 @NeuronType(
         type = INHIBITORY,
         activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
-        bindingSignalSlots = SINGLE_INPUT
+        bindingSignalSlots = SINGLE_INPUT,
+        trainingAllowed = false
 )
 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
@@ -41,7 +41,8 @@
 @NeuronType(
         type = INHIBITORY,
         activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
-        bindingSignalSlots = SINGLE_INPUT
+        bindingSignalSlots = SINGLE_INPUT,
+        trainingAllowed = false
 )
 public class InhibitoryNeuron extends DisjunctiveNeuron<InhibitoryNeuron, InhibitoryActivation> {
 
@@ -93,9 +94,4 @@ public InhibitoryCategoryInputSynapse getCategoryInputSynapse() {
     public InhibitoryCategorySynapse getCategoryOutputSynapse() {
         return getOutputSynapseByType(InhibitoryCategorySynapse.class);
     }
-
-    @Override
-    public boolean isTrainingAllowed() {
-        return false;
-    }
 }
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
@@ -35,7 +35,8 @@
 @NeuronType(
         type = PATTERN,
         activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,
-        bindingSignalSlots = SINGLE_SAME
+        bindingSignalSlots = SINGLE_SAME,
+        trainingAllowed = false
 )
 public class PatternCategoryNeuron extends CategoryNeuron {
 
diff --git a/core/src/main/java/network/aika/elements/synapses/Synapse.java b/core/src/main/java/network/aika/elements/synapses/Synapse.java
@@ -353,8 +353,8 @@ public Field getWeightForAnnealing() {
         return weight;
     }
 
-    public boolean isTrainingAllowed() {
-        return trainingAllowed && getOutput().isTrainingAllowed();
+    public final boolean isTrainingAllowed() {
+        return trainingAllowed && synapseType.isTrainingAllowed() && getOutput().isTrainingAllowed();
     }
 
     public void setTrainingAllowed(boolean trainingAllowed) {
diff --git a/core/src/main/java/network/aika/elements/synapses/SynapseType.java b/core/src/main/java/network/aika/elements/synapses/SynapseType.java
@@ -51,4 +51,6 @@
     boolean propagateRange() default true;
 
     DirectionEnum storedAt();
+
+    boolean trainingAllowed() default true;
 }
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
@@ -49,7 +49,8 @@
         required = INPUT_INPUT,
         outputState = PRE_FEEDBACK,
         trigger = FIRED_PRE_FEEDBACK,
-        storedAt = DirectionEnum.OUTPUT
+        storedAt = DirectionEnum.OUTPUT,
+        trainingAllowed = false
 )
 public class BindingCategoryInputSynapse extends ConjunctiveCategoryInputSynapse<
         BindingCategoryInputSynapse,
@@ -67,11 +68,6 @@ public BindingCategoryInputLink createLink(CategoryActivation input, BindingActi
         return new BindingCategoryInputLink(this, input, output);
     }
 
-    @Override
-    public boolean isTrainingAllowed() {
-        return false;
-    }
-
     @Override
     public void setInitialCategorySynapseWeight(double initialCategorySynapseWeight) {
         this.initialCategorySynapseWeight = initialCategorySynapseWeight;
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
@@ -50,7 +50,8 @@
         required = INPUT_INPUT,
         outputState = PRE_FEEDBACK,
         trigger = FIRED_PRE_FEEDBACK,
-        storedAt = DirectionEnum.OUTPUT
+        storedAt = DirectionEnum.OUTPUT,
+        trainingAllowed = false
 )
 public class InhibitoryCategoryInputSynapse extends DisjunctiveSynapse<
         InhibitoryCategoryInputSynapse,
@@ -74,11 +75,6 @@ public InhibitoryCategoryInputLink createLink(CategoryActivation input, Inhibito
         return new InhibitoryCategoryInputLink(this, input, output);
     }
 
-    @Override
-    public boolean isTrainingAllowed() {
-        return false;
-    }
-
     @Override
     public void setInitialCategorySynapseWeight(double initialCategorySynapseWeight) {
         this.initialCategorySynapseWeight = initialCategorySynapseWeight;
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
@@ -48,7 +48,8 @@
         required = SAME_SAME,
         outputState = PRE_FEEDBACK,
         trigger = FIRED_PRE_FEEDBACK,
-        storedAt = DirectionEnum.OUTPUT
+        storedAt = DirectionEnum.OUTPUT,
+        trainingAllowed = false
 )
 public class PatternCategoryInputSynapse
         extends ConjunctiveCategoryInputSynapse<
@@ -68,11 +69,6 @@ public PatternCategoryInputLink createLink(CategoryActivation input, PatternActi
         return new PatternCategoryInputLink(this, input, output);
     }
 
-    @Override
-    public boolean isTrainingAllowed() {
-        return false;
-    }
-
     @Override
     public void setInitialCategorySynapseWeight(double initialCategorySynapseWeight) {
         this.initialCategorySynapseWeight = initialCategorySynapseWeight;
diff --git a/core/src/main/java/network/aika/elements/typedef/NeuronTypeDefinition.java b/core/src/main/java/network/aika/elements/typedef/NeuronTypeDefinition.java
@@ -36,6 +36,8 @@ public class NeuronTypeDefinition {
 
     private BSSlotDefinition[] bindingSignalSlots;
 
+    private boolean trainingAllowed;
+
     public static NeuronTypeDefinition getDefinition(Class clazz) {
         return cache.computeIfAbsent(clazz, c ->
                 new NeuronTypeDefinition(
@@ -50,6 +52,7 @@ private NeuronTypeDefinition(NeuronType typeAnnotation) {
         this.type = typeAnnotation.type();
         this.activationFunction = typeAnnotation.activationFunction();
         this.bindingSignalSlots = typeAnnotation.bindingSignalSlots();
+        this.trainingAllowed = typeAnnotation.trainingAllowed();
     }
 
     public Type getType() {
@@ -63,4 +66,8 @@ public ActivationFunction getActivationFunction() {
     public BSSlotDefinition[] getBindingSignalSlots() {
         return bindingSignalSlots;
     }
+
+    public boolean isTrainingAllowed() {
+        return trainingAllowed;
+    }
 }
diff --git a/core/src/main/java/network/aika/elements/typedef/SynapseTypeDefinition.java b/core/src/main/java/network/aika/elements/typedef/SynapseTypeDefinition.java
@@ -47,6 +47,8 @@ public class SynapseTypeDefinition {
 
     private Direction storedAt;
 
+    private boolean trainingAllowed;
+
     public static SynapseTypeDefinition getDefinition(Class clazz) {
         return cache.computeIfAbsent(clazz, c ->
                 new SynapseTypeDefinition(
@@ -99,4 +101,8 @@ public boolean isPropagateRange() {
     public Direction getStoredAt() {
         return storedAt;
     }
+
+    public boolean isTrainingAllowed() {
+        return trainingAllowed;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -301,8 +301,8 @@ public boolean isAbstract() {`
`301`	`301`
`302`	`302`	`public abstract CategorySynapse getCategoryOutputSynapse();`
`303`	`303`
`304`		`- public boolean isTrainingAllowed() {`
`305`		`- return true;`
	`304`	`+ public final boolean isTrainingAllowed() {`
	`305`	`+ return neuronType.isTrainingAllowed();`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`public abstract A createActivation(Document doc);`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,6 @@`
`38`	`38`	`ActivationFunction activationFunction();`
`39`	`39`
`40`	`40`	`BSSlotDefinition[] bindingSignalSlots();`
	`41`	`+`
	`42`	`+ boolean trainingAllowed() default true;`
`41`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@`
`36`	`36`	`@NeuronType(`
`37`	`37`	`type = BINDING,`
`38`	`38`	`activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,`
`39`		`- bindingSignalSlots = {SINGLE_INPUT, SINGLE_SAME}`
	`39`	`+ bindingSignalSlots = {SINGLE_INPUT, SINGLE_SAME},`
	`40`	`+ trainingAllowed = false`
`40`	`41`	`)`
`41`	`42`	`public class BindingCategoryNeuron extends CategoryNeuron {`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`	`@NeuronType(`
`36`	`36`	`type = INHIBITORY,`
`37`	`37`	`activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,`
`38`		`- bindingSignalSlots = SINGLE_INPUT`
	`38`	`+ bindingSignalSlots = SINGLE_INPUT,`
	`39`	`+ trainingAllowed = false`
`39`	`40`	`)`
`40`	`41`	`public class InhibitoryCategoryNeuron extends CategoryNeuron {`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@`
`41`	`41`	`@NeuronType(`
`42`	`42`	`type = INHIBITORY,`
`43`	`43`	`activationFunction = LIMITED_RECTIFIED_LINEAR_UNIT,`
`44`		`- bindingSignalSlots = SINGLE_INPUT`
	`44`	`+ bindingSignalSlots = SINGLE_INPUT,`
	`45`	`+ trainingAllowed = false`
`45`	`46`	`)`
`46`	`47`	`public class InhibitoryNeuron extends DisjunctiveNeuron<InhibitoryNeuron, InhibitoryActivation> {`
`47`	`48`
`@@ -93,9 +94,4 @@ public InhibitoryCategoryInputSynapse getCategoryInputSynapse() {`
`93`	`94`	`public InhibitoryCategorySynapse getCategoryOutputSynapse() {`
`94`	`95`	`return getOutputSynapseByType(InhibitoryCategorySynapse.class);`
`95`	`96`	`}`
`96`		`-`
`97`		`- @Override`
`98`		`- public boolean isTrainingAllowed() {`
`99`		`- return false;`
`100`		`- }`
`101`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,8 +353,8 @@ public Field getWeightForAnnealing() {`
`353`	`353`	`return weight;`
`354`	`354`	`}`
`355`	`355`
`356`		`- public boolean isTrainingAllowed() {`
`357`		`- return trainingAllowed && getOutput().isTrainingAllowed();`
	`356`	`+ public final boolean isTrainingAllowed() {`
	`357`	`+ return trainingAllowed && synapseType.isTrainingAllowed() && getOutput().isTrainingAllowed();`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`public void setTrainingAllowed(boolean trainingAllowed) {`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,6 @@`
`51`	`51`	`boolean propagateRange() default true;`
`52`	`52`
`53`	`53`	`DirectionEnum storedAt();`
	`54`	`+`
	`55`	`+ boolean trainingAllowed() default true;`
`54`	`56`	`}`