- work on instantiation

lukas.molzberger · lukas.molzberger · commit 2b1862e927ba · 2024-05-11T15:30:32.000+02:00
diff --git a/core/src/main/java/network/aika/elements/links/CategoryInputLink.java b/core/src/main/java/network/aika/elements/links/CategoryInputLink.java
@@ -35,18 +35,20 @@ public interface CategoryInputLink {
 
     Synapse getSynapse();
 
-    CategorySynapse createCategorySynapse();
-
     default void instantiateCategoryLink(Activation instanceAct) {
         Link tl = (Link) this;
         CategoryActivation categoryAct = (CategoryActivation) tl.getInput();
 
         if(categoryAct == null || instanceAct == null)
             return;
 
-        CategorySynapse s = createCategorySynapse();
+        CategorySynapse s = getOutput().getNeuron().createCategorySynapse();
+
         s.initFromTemplate(instanceAct.getNeuron(), categoryAct.getNeuron(), getSynapse());
 
+        s.setInputSideInstantiable(false);
+        s.setOutputSideInstantiable(false);
+
         CategoryInputSynapse cis = (CategoryInputSynapse) getSynapse();
         s.setWeight(cis.getInitialCategorySynapseWeight());
 
diff --git a/core/src/main/java/network/aika/elements/links/types/BindingCategoryInputLink.java b/core/src/main/java/network/aika/elements/links/types/BindingCategoryInputLink.java
@@ -34,9 +34,4 @@ public BindingCategoryInputLink(BindingCategoryInputSynapse s, CategoryActivatio
         super(s, input, output);
     }
 
-    @Override
-    public CategorySynapse createCategorySynapse() {
-        return new BindingCategorySynapse();
-    }
-
 }
diff --git a/core/src/main/java/network/aika/elements/links/types/InhibitoryCategoryInputLink.java b/core/src/main/java/network/aika/elements/links/types/InhibitoryCategoryInputLink.java
@@ -40,10 +40,4 @@ public InhibitoryCategoryInputLink(InhibitoryCategoryInputSynapse s, CategoryAct
                         crossConnectFields((InhibitoryActivation) act, output)
                 );
     }
-
-    @Override
-    public CategorySynapse createCategorySynapse() {
-        return new InhibitoryCategorySynapse();
-    }
-
 }
diff --git a/core/src/main/java/network/aika/elements/links/types/PatternCategoryInputLink.java b/core/src/main/java/network/aika/elements/links/types/PatternCategoryInputLink.java
@@ -33,11 +33,6 @@ public PatternCategoryInputLink(PatternCategoryInputSynapse s, CategoryActivatio
         super(s, input, output);
     }
 
-    @Override
-    public CategorySynapse createCategorySynapse() {
-        return new PatternCategorySynapse();
-    }
-
     @Override
     protected void connectGradientFields() {
     }
diff --git a/core/src/main/java/network/aika/elements/neurons/Neuron.java b/core/src/main/java/network/aika/elements/neurons/Neuron.java
@@ -247,6 +247,8 @@ protected void initFromTemplate(Neuron templateN) {
 
         createCategorySynapse()
                 .setWeight(cis.getInitialCategorySynapseWeight())
+                .setInputSideInstantiable(false)
+                .setOutputSideInstantiable(false)
                 .link(this, cis.getInput());
     }
 
@@ -267,17 +269,6 @@ public N setInstantiable(boolean instantiable) {
         return (N) this;
     }
 
-    public N setInputSynapsesInstantiable(boolean inputSideInstantiable, boolean outputSideInstantiable) {
-        getInputSynapses()
-                .stream()
-                .filter(s -> !(s instanceof CategoryInputSynapse))
-                .forEach(s ->
-                        s.setInstantiable(inputSideInstantiable, outputSideInstantiable)
-                );
-
-        return (N) this;
-    }
-
     public boolean isInstantiable() {
         return instantiable;
     }
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
@@ -98,8 +98,7 @@ public BindingCategoryInputSynapse makeAbstract(boolean instantiable) {
                 .setLabel(getLabel() + CATEGORY_LABEL);
 
         BindingCategoryInputSynapse s = new BindingCategoryInputSynapse()
-                .link(bindingCategory, this)
-                .setInstantiable(instantiable, instantiable);
+                .link(bindingCategory, this);
 
         s.setInitialCategorySynapseWeight(1.0);
 
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
@@ -63,8 +63,7 @@ public InhibitoryCategoryInputSynapse makeAbstract(boolean instantiable) {
                 .setLabel(getLabel() + CATEGORY_LABEL);
 
         InhibitoryCategoryInputSynapse s = new InhibitoryCategoryInputSynapse()
-                .link(inhibCategory, this)
-                .setInstantiable(instantiable, instantiable);
+                .link(inhibCategory, this);
 
         s.setInitialCategorySynapseWeight(1.0);
 
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
@@ -86,8 +86,7 @@ public PatternCategoryInputSynapse makeAbstract(boolean instantiable) {
                 .setLabel(getCategoryLabel(getLabel()));
 
         PatternCategoryInputSynapse s = new PatternCategoryInputSynapse()
-                .link(patternCategory, this)
-                .setInstantiable(instantiable, instantiable);
+                .link(patternCategory, this);
 
         s.setInitialCategorySynapseWeight(1.0);
 
diff --git a/core/src/main/java/network/aika/elements/synapses/ConjunctiveSynapse.java b/core/src/main/java/network/aika/elements/synapses/ConjunctiveSynapse.java
@@ -140,6 +140,7 @@ public Field getSynapseBias() {
         return synapseBias;
     }
 
+    @Override
     public boolean isOptional() {
         return optional;
     }
diff --git a/core/src/main/java/network/aika/elements/synapses/Synapse.java b/core/src/main/java/network/aika/elements/synapses/Synapse.java
@@ -77,8 +77,8 @@ public abstract class Synapse<S extends Synapse, I extends Neuron, O extends Neu
 
     private Relation relation;
 
-    private boolean inputSideInstantiable;
-    private boolean outputSideInstantiable;
+    private Boolean inputSideInstantiable;
+    private Boolean outputSideInstantiable;
 
     protected SumField weight = (SumField) new SumField(this, "weight", TOLERANCE)
             .setQueued(getQueue(), TRAINING, false)
@@ -193,6 +193,10 @@ public boolean isWeak() {
         return false;
     }
 
+    public boolean isOptional() {
+        return false;
+    }
+
     public static Link getLatentLink(Synapse synA, Synapse synB, Activation iActA, Activation iActB) {
         Stream<Link> linksA = iActA.getOutputLinks(synA);
         return linksA.filter(l -> synB.getLink(iActB, l.getOutput()) != null)
@@ -271,6 +275,9 @@ public void initFromTemplate(I input, O output, Synapse templateSyn) {
         setInput(input);
         setOutput(output);
 
+        inputSideInstantiable = templateSyn.inputSideInstantiable;
+        outputSideInstantiable = templateSyn.outputSideInstantiable;
+
         link();
 
         if(templateSyn.relation != null)
@@ -281,19 +288,31 @@ public void initFromTemplate(I input, O output, Synapse templateSyn) {
         );
     }
 
-    public S setInstantiable(boolean inputSideInstantiable, boolean outputSideInstantiable) {
-        this.inputSideInstantiable = inputSideInstantiable;
-        this.outputSideInstantiable = outputSideInstantiable;
+    public S setInputSideInstantiable(Boolean instantiable) {
+        this.inputSideInstantiable = instantiable;
 
         return (S) this;
     }
 
-    public boolean isInputSideInstantiable() {
-        return inputSideInstantiable;
+    public Boolean isInputSideInstantiable() {
+        return inputSideInstantiable != null ?
+                inputSideInstantiable :
+                input.getNeuron().isInstantiable() &&
+                        (output.getNeuron().isInstantiable() || isOptional());
+    }
+
+    public S setOutputSideInstantiable(Boolean instantiable) {
+        this.outputSideInstantiable = instantiable;
+
+        return (S) this;
     }
 
-    public boolean isOutputSideInstantiable() {
-        return outputSideInstantiable;
+    public Boolean isOutputSideInstantiable() {
+        boolean cis = this instanceof CategoryInputSynapse;
+
+        return outputSideInstantiable != null ?
+                outputSideInstantiable :
+                output.getNeuron().isInstantiable() && (!cis || input.getNeuron().isInstantiable());
     }
 
     public S link(Neuron input, Neuron output) {
@@ -447,8 +466,15 @@ public void write(DataOutput out) throws IOException {
         out.writeLong(output.getId());
 
         weight.write(out);
-        out.writeBoolean(inputSideInstantiable);
-        out.writeBoolean(outputSideInstantiable);
+
+        out.writeBoolean(inputSideInstantiable != null);
+        if(inputSideInstantiable != null)
+            out.writeBoolean(inputSideInstantiable);
+
+        out.writeBoolean(outputSideInstantiable != null);
+
+        if(outputSideInstantiable != null)
+            out.writeBoolean(outputSideInstantiable);
 
         out.writeBoolean(relation != null);
         if(relation != null)
@@ -470,8 +496,12 @@ public void readFields(DataInput in, Model m) throws IOException {
         output = m.lookupNeuronProvider(in.readLong(), SYNAPSE_OUT);
 
         weight.readFields(in);
-        inputSideInstantiable = in.readBoolean();
-        outputSideInstantiable = in.readBoolean();
+
+        if(in.readBoolean())
+            inputSideInstantiable = in.readBoolean();
+
+        if(in.readBoolean())
+            outputSideInstantiable = in.readBoolean();
 
         if(in.readBoolean())
             relation = Relation.read(in, m);
diff --git a/text/src/main/java/network/aika/meta/NetworkMotifs.java b/text/src/main/java/network/aika/meta/NetworkMotifs.java
@@ -90,37 +90,32 @@ public static OuterPositiveFeedbackSynapse addOuterPositiveFeedbackLoop(
             PatternNeuron pn,
             BindingNeuron bn,
             PatternNeuron feedbackPN,
-            double psWeight,
-            boolean instantiable
+            double psWeight
     ) {
         addPositiveFeedbackLoop(
                 bn,
                 pn,
                 psWeight,
                 0.0,
                 false,
-                false,
-                instantiable
+                false
         ).setPropagable(true);
 
         return new OuterPositiveFeedbackSynapse()
                 .setWeight(getPositiveFeedbackWeight(bn.getTargetNet(), bn.getTargetValue()))
                 .link(feedbackPN, bn)
-                .setInstantiable(true, true)
                 .adjustBias();
     }
 
-    public static void addInhibitoryLoop(BindingNeuron bn, InhibitoryNeuron in, double weight, boolean instantiable) {
+    public static void addInhibitoryLoop(BindingNeuron bn, InhibitoryNeuron in, double weight) {
         new InhibitorySynapse()
                 .setWeight(1.0)
-                .link(bn, in)
-                .setInstantiable(instantiable, instantiable);
+                .link(bn, in);
 
         new NegativeFeedbackSynapse()
                 .setWeight(weight)
                 .link(in, bn)
-                .adjustBias()
-                .setInstantiable(instantiable, instantiable);
+                .adjustBias();
     }
 
     public static InnerPositiveFeedbackSynapse addPositiveFeedbackLoop(
@@ -129,14 +124,12 @@ public static InnerPositiveFeedbackSynapse addPositiveFeedbackLoop(
             double weight,
             double weakInputMargin,
             boolean allowRelaxedMatching,
-            boolean isOptional,
-            boolean instantiable
+            boolean isOptional
     ) {
         PatternSynapse pSyn = new PatternSynapse()
                 .setWeight(weight)
                 .setOptional(isOptional)
                 .link(bn, pn)
-                .setInstantiable(instantiable, instantiable)
                 .setPropagable(true)
                 .adjustBias(bn.getTargetValue() + weakInputMargin);
 
@@ -150,7 +143,6 @@ public static InnerPositiveFeedbackSynapse addPositiveFeedbackLoop(
                                 null
                 )
                 .link(pn, bn)
-                .setInstantiable(instantiable, instantiable)
                 .adjustBias();
 
         LOG.info("  " + posFeedSyn + " targetNetContr:" + -posFeedSyn.getSynapseBias().getValue());
@@ -171,12 +163,10 @@ public static void addRelation(
             BindingNeuron bn,
             LatentRelationNeuron relN,
             double relWeight,
-            double spsWeight,
-            boolean instantiable
+            double spsWeight
     ) {
         RelationInputSynapse relSyn = new RelationInputSynapse()
                 .setWeight(relWeight)
-                .setInstantiable(instantiable, instantiable)
                 .link(relN, bn)
                 .adjustBias();
 
@@ -188,7 +178,6 @@ public static void addRelation(
         SameObjectSynapse spSyn = new SameObjectSynapse()
                 .setWeight(spsWeight)
                 .setRelation(rel)
-                .setInstantiable(instantiable, instantiable)
                 .link(lastBN, bn)
                 .setPropagable(true)
                 .adjustBias(prevValueTarget);
diff --git a/text/src/main/java/network/aika/meta/entities/EntityModel.java b/text/src/main/java/network/aika/meta/entities/EntityModel.java
@@ -163,8 +163,7 @@ public void initTemplateNeurons() {
                 2.5,
                 0.0,
                 false,
-                false,
-                true
+                false
         );
 
         inhibitoryN = new InhibitoryNeuron(getModel(), TEMPLATE_MODEL)
@@ -179,8 +178,7 @@ public void initTemplateNeurons() {
         addInhibitoryLoop(
                 entityBN,
                 inhibitoryN,
-                NEG_MARGIN * -entityBN.getTargetNet(),
-                true
+                NEG_MARGIN * -entityBN.getTargetNet()
         );
 
         topicBN = addBindingNeuron(
@@ -203,8 +201,7 @@ public void initOuterSynapses() {
                 entityPattern,
                 topicBN,
                 topicModel.getTopicPatternNeuron(),
-                2.5,
-                true
+                2.5
         );
     }
 
@@ -246,18 +243,18 @@ public void mapResults(Document doc) {
         entityPattern.setPersistent(true);
 
         entityPattern.getOutputSynapseByType(OuterPositiveFeedbackSynapse.class)
-                .setInstantiable(true, true)
                 .setOptional(true);
 
         Synapse s = entityPattern.getOutputSynapse(getTopicModel().getTopicBindingNeuron().getProvider());
         if(s != null)
-            s.setInstantiable(false, false);
+            s.setInputSideInstantiable(false)
+                    .setOutputSideInstantiable(false);
 
         entityBN = lookupInstance(doc, parent.entityBN);
         entityBN.setPersistent(true);
 
         entityBN.getInputSynapseByType(InputObjectSynapse.class)
-                .setInstantiable(false, true);
+                .setInputSideInstantiable(false);
 
         topicBN = lookupInstance(doc, parent.topicBN);
         if(topicBN != null)
@@ -290,16 +287,9 @@ public void postProcess(Document doc) {
 
     public void setInstantiable(boolean instantiable) {
         entityPattern.setInstantiable(instantiable);
-        entityPattern.setInputSynapsesInstantiable(instantiable, instantiable);
-
         entityBN.setInstantiable(instantiable);
-        entityBN.setInputSynapsesInstantiable(instantiable, instantiable);
-
         topicBN.setInstantiable(instantiable);
-        topicBN.setInputSynapsesInstantiable(instantiable, instantiable);
-
         inhibitoryN.setInstantiable(instantiable);
-        inhibitoryN.setInputSynapsesInstantiable(instantiable, instantiable);
     }
 
     public Model getModel() {
diff --git a/text/src/main/java/network/aika/meta/sequences/PhraseModel.java b/text/src/main/java/network/aika/meta/sequences/PhraseModel.java
diff --git a/text/src/main/java/network/aika/meta/sequences/SequenceModel.java b/text/src/main/java/network/aika/meta/sequences/SequenceModel.java
diff --git a/text/src/main/java/network/aika/meta/topics/TopicModel.java b/text/src/main/java/network/aika/meta/topics/TopicModel.java
diff --git a/text/src/test/java/network/aika/TestHelper.java b/text/src/test/java/network/aika/TestHelper.java
diff --git a/text/src/test/java/network/aika/TestUtils.java b/text/src/test/java/network/aika/TestUtils.java

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,4 @@ public BindingCategoryInputLink(BindingCategoryInputSynapse s, CategoryActivatio`
`34`	`34`	`super(s, input, output);`
`35`	`35`	`}`
`36`	`36`
`37`		`- @Override`
`38`		`- public CategorySynapse createCategorySynapse() {`
`39`		`- return new BindingCategorySynapse();`
`40`		`- }`
`41`		`-`
`42`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,4 @@ public InhibitoryCategoryInputLink(InhibitoryCategoryInputSynapse s, CategoryAct`
`40`	`40`	`crossConnectFields((InhibitoryActivation) act, output)`
`41`	`41`	`);`
`42`	`42`	`}`
`43`		`-`
`44`		`- @Override`
`45`		`- public CategorySynapse createCategorySynapse() {`
`46`		`- return new InhibitoryCategorySynapse();`
`47`		`- }`
`48`		`-`
`49`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,6 @@ public PatternCategoryInputLink(PatternCategoryInputSynapse s, CategoryActivatio`
`33`	`33`	`super(s, input, output);`
`34`	`34`	`}`
`35`	`35`
`36`		`- @Override`
`37`		`- public CategorySynapse createCategorySynapse() {`
`38`		`- return new PatternCategorySynapse();`
`39`		`- }`
`40`		`-`
`41`	`36`	`@Override`
`42`	`37`	`protected void connectGradientFields() {`
`43`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ public Field getSynapseBias() {`
`140`	`140`	`return synapseBias;`
`141`	`141`	`}`
`142`	`142`
	`143`	`+ @Override`
`143`	`144`	`public boolean isOptional() {`
`144`	`145`	`return optional;`
`145`	`146`	`}`