- Added some debug output

lukas.molzberger · lukas.molzberger · commit ae5a44a578ef · 2024-10-18T09:50:06.000+02:00
diff --git a/fields/src/main/java/network/aika/enums/sign/Negative.java b/fields/src/main/java/network/aika/enums/sign/Negative.java
@@ -41,7 +41,7 @@ public Sign invert() {
     @Override
     public <D extends Type<D, O>, O extends Obj<D, O>> FieldDefinition<D, O> getValue(D ref, FieldDefinition<D, O> v) {
         return InvertFunction.invert(ref, NEGATION)
-                .in(v.getFieldOutput(), argLink(0));
+                .in(v.getFieldOutput(), v.getFieldOutput().getFieldTag(), argLink(0));
     }
 
     @Override
diff --git a/fields/src/main/java/network/aika/fielddefs/FieldDefinition.java b/fields/src/main/java/network/aika/fielddefs/FieldDefinition.java
@@ -58,25 +58,25 @@ public FieldDefinition(Class<? extends Field> clazz, T objectType, FieldTag fiel
         this.tolerance = tolerance;
     }
 
-    public FieldDefinition<T, O> in(FieldOutputDefinition fieldOutDef, FieldLinkTypeDefinition flType) {
+    public FieldDefinition<T, O> in(FieldOutputDefinition fieldOutDef, FieldTag targetFieldDocu, FieldLinkTypeDefinition flType) {
         Function<O, FieldOutput> pathProvider = o -> o.getFieldOutput(fieldOutDef.getFieldTag());
         FieldInputDefinition out = objectType.getFieldInput(getFieldTag());
-        out.addInput(new InputFieldLinkDefinition(pathProvider, flType));
+        out.addInput(new InputFieldLinkDefinition(pathProvider, targetFieldDocu, flType));
 
         return this;
     }
 
-    public FieldDefinition<T, O> in(Function<O, FieldOutput> pathProvider, FieldLinkTypeDefinition flType) {
+    public FieldDefinition<T, O> in(Function<O, FieldOutput> pathProvider, FieldTag targetFieldDocu, FieldLinkTypeDefinition flType) {
         FieldInputDefinition out = objectType.getFieldInput(getFieldTag());
-        out.addInput(new InputFieldLinkDefinition(pathProvider, flType));
+        out.addInput(new InputFieldLinkDefinition(pathProvider, targetFieldDocu, flType));
 
         return this;
     }
 
-    public FieldDefinition<T, O> out(Function<O, FieldInput> pathProvider, FieldLinkTypeDefinition flType) {
+    public FieldDefinition<T, O> out(Function<O, FieldInput> pathProvider, FieldTag targetFieldDocu, FieldLinkTypeDefinition flType) {
         FieldOutputDefinition in = objectType.getFieldOutput(getFieldTag());
 
-        in.addOutput(new OutputFieldLinkDefinition(pathProvider, flType));
+        in.addOutput(new OutputFieldLinkDefinition(pathProvider, targetFieldDocu, flType));
 
         return this;
     }
diff --git a/fields/src/main/java/network/aika/fielddefs/link/FieldLinkDefinition.java b/fields/src/main/java/network/aika/fielddefs/link/FieldLinkDefinition.java
@@ -1,5 +1,6 @@
 package network.aika.fielddefs.link;
 
+import network.aika.fielddefs.FieldTag;
 import network.aika.fields.FieldInput;
 import network.aika.fields.FieldOutput;
 import network.aika.fields.link.FieldLink;
@@ -8,9 +9,11 @@
 public abstract class FieldLinkDefinition {
 
     private FieldLinkTypeDefinition typeDefinition;
+    private FieldTag targetFieldDocu;
 
-    public FieldLinkDefinition(FieldLinkTypeDefinition typeDefinition) {
+    public FieldLinkDefinition(FieldLinkTypeDefinition typeDefinition, FieldTag targetFieldDocu) {
         this.typeDefinition = typeDefinition;
+        this.targetFieldDocu = targetFieldDocu;
     }
 
     public FieldLinkTypeDefinition getTypeDefinition() {
@@ -20,4 +23,9 @@ public FieldLinkTypeDefinition getTypeDefinition() {
     public FieldLink instantiate(FieldOutput input, FieldInput output) {
         return typeDefinition.instantiate(input, output);
     }
+
+    @Override
+    public String toString() {
+        return "" + typeDefinition + " -> " + targetFieldDocu;
+    }
 }
diff --git a/fields/src/main/java/network/aika/fielddefs/link/FixedFieldLinkDefinition.java b/fields/src/main/java/network/aika/fielddefs/link/FixedFieldLinkDefinition.java
@@ -40,4 +40,9 @@ public FieldLink instantiate(FieldOutput input, FieldInput output) {
     public Integer getArg() {
         return arg;
     }
+
+    @Override
+    public String toString() {
+        return "FIXED(" + arg + ")";
+    }
 }
diff --git a/fields/src/main/java/network/aika/fielddefs/link/InputFieldLinkDefinition.java b/fields/src/main/java/network/aika/fielddefs/link/InputFieldLinkDefinition.java
@@ -37,8 +37,8 @@ public class InputFieldLinkDefinition<T extends Type<T, O>, O extends Obj<T, O>>
 
     private Function<O, FieldOutput> pathProvider;
 
-    public InputFieldLinkDefinition(Function<O, FieldOutput> pathProvider, FieldLinkTypeDefinition typeDefinition) {
-        super(typeDefinition);
+    public InputFieldLinkDefinition(Function<O, FieldOutput> pathProvider, FieldTag targetFieldDocu, FieldLinkTypeDefinition typeDefinition) {
+        super(typeDefinition, targetFieldDocu);
         this.pathProvider = pathProvider;
     }
 
@@ -67,4 +67,9 @@ public FieldLink instantiateAndLink(FieldOutput input, FieldInput output) {
 
         return fl;
     }
+
+    @Override
+    public String toString() {
+        return "OUT " + super.toString();
+    }
 }
diff --git a/fields/src/main/java/network/aika/fielddefs/link/OutputFieldLinkDefinition.java b/fields/src/main/java/network/aika/fielddefs/link/OutputFieldLinkDefinition.java
@@ -19,6 +19,7 @@
 
 import network.aika.enums.Direction;
 import network.aika.fielddefs.FieldOutputDefinition;
+import network.aika.fielddefs.FieldTag;
 import network.aika.fielddefs.Type;
 import network.aika.fields.Field;
 import network.aika.fields.FieldInput;
@@ -40,8 +41,8 @@ public class OutputFieldLinkDefinition<T extends Type<T, O>, O extends Obj<T, O>
 
     private Function<O, FieldInput> pathProvider;
 
-    public OutputFieldLinkDefinition(Function<O, FieldInput> pathProvider, FieldLinkTypeDefinition typeDefinition) {
-        super(typeDefinition);
+    public OutputFieldLinkDefinition(Function<O, FieldInput> pathProvider, FieldTag targetFieldDocu, FieldLinkTypeDefinition typeDefinition) {
+        super(typeDefinition, targetFieldDocu);
 
         this.pathProvider = pathProvider;
     }
@@ -71,4 +72,9 @@ public FieldLink instantiateAndLink(FieldOutput input, FieldInput output) {
 
         return fl;
     }
+
+    @Override
+    public String toString() {
+        return "OUT " + super.toString();
+    }
 }
diff --git a/fields/src/main/java/network/aika/fielddefs/link/VariableFieldLinkDefinition.java b/fields/src/main/java/network/aika/fielddefs/link/VariableFieldLinkDefinition.java
@@ -25,4 +25,9 @@ public class VariableFieldLinkDefinition extends FieldLinkTypeDefinition {
     public VariableFieldLinkDefinition(boolean propagateUpdates) {
         super(propagateUpdates);
     }
+
+    @Override
+    public String toString() {
+        return "VARIABLE";
+    }
 }
diff --git a/model/src/main/java/network/aika/model/BindingDef.java b/model/src/main/java/network/aika/model/BindingDef.java
@@ -116,10 +116,10 @@ public void initNodes() {
         sum(activation, UPDATE_VALUE);
 
         activation.getState(OUTER_FEEDBACK).getField(NET)
-                .in(o -> o.getActivation().getState(NON_FEEDBACK).getFieldOutput(NET), varLink());
+                .in(o -> o.getActivation().getState(NON_FEEDBACK).getFieldOutput(NET), NET, varLink());
 
         activation.getState(INNER_FEEDBACK).getField(NET)
-                .in(o -> o.getActivation().getState(OUTER_FEEDBACK).getFieldOutput(NET), varLink());
+                .in(o -> o.getActivation().getState(OUTER_FEEDBACK).getFieldOutput(NET), NET, varLink());
 
 
         neuron = new NeuronDefinition(
@@ -337,8 +337,8 @@ public void initRelations() {
         max(negativeFeedbackLink, INPUT_VALUE);
 
         negativeWeight = scale(negativeFeedbackLink, NEGATIVE_WEIGHT, -1)
-                .in(o -> o.getSynapse().getFieldOutput(WEIGHT), argLink(0))
-                .out(o -> o.getOutput().getState(negativeFeedbackSynapse.outputState()).getFieldInput(NET), varLink(false));
+                .in(o -> o.getSynapse().getFieldOutput(WEIGHT), WEIGHT, argLink(0))
+                .out(o -> o.getOutput().getState(negativeFeedbackSynapse.outputState()).getFieldInput(NET), NET, varLink(false));
 
 
         relationInputLink = new LinkDefinition(
@@ -432,10 +432,10 @@ public void initRelations() {
 
 
         identity(bindingLink, INPUT_VALUE)  // TODO: check if a placeholder field can be used
-                .in(o -> o.getInput().getState(INNER_FEEDBACK).getFieldOutput(NET), argLink(0));
+                .in(o -> o.getInput().getState(INNER_FEEDBACK).getFieldOutput(NET), NET, argLink(0));
 
         identity(sameObjectLink, INPUT_VALUE)  // TODO: check if a placeholder field can be used
-                .in(o -> o.getInput().getState(OUTER_FEEDBACK).getFieldOutput(NET), argLink(0));
+                .in(o -> o.getInput().getState(OUTER_FEEDBACK).getFieldOutput(NET), NET, argLink(0));
 
     }
 
diff --git a/model/src/main/java/network/aika/model/ConjunctiveDef.java b/model/src/main/java/network/aika/model/ConjunctiveDef.java
@@ -117,8 +117,8 @@ public void initRelations() {
                 .setQueued(TRAINING);
 
         identity(link, SYNAPSE_BIAS)
-                .in(o -> o.getSynapse().getFieldOutput(SYNAPSE_BIAS), argLink(0))
-                .out(o -> o.getOutput().getState(NON_FEEDBACK).getFieldInput(NET), varLink());
+                .in(o -> o.getSynapse().getFieldOutput(SYNAPSE_BIAS), SYNAPSE_BIAS, argLink(0))
+                .out(o -> o.getOutput().getState(NON_FEEDBACK).getFieldInput(NET), NET, varLink());
     }
 
     @Override
diff --git a/model/src/main/java/network/aika/model/DisjunctiveDef.java b/model/src/main/java/network/aika/model/DisjunctiveDef.java
@@ -106,9 +106,9 @@ public void initRelations() {
         identity(outputSlot, SLOT);
 
         mul(link, WEIGHT_UPDATE)
-                .in(o -> o.getFieldOutput(INPUT_IS_FIRED), argLink(0))
-                .in(o -> o.getOutput().getFieldOutput(UPDATE_VALUE), argLink(1))
-                .out(o -> o.getSynapse().getFieldInput(WEIGHT), varLink());
+                .in(o -> o.getFieldOutput(INPUT_IS_FIRED), INPUT_IS_FIRED, argLink(0))
+                .in(o -> o.getOutput().getFieldOutput(UPDATE_VALUE), UPDATE_VALUE, argLink(1))
+                .out(o -> o.getSynapse().getFieldInput(WEIGHT), WEIGHT, varLink());
     }
 
     @Override
diff --git a/model/src/main/java/network/aika/model/NeuronDef.java b/model/src/main/java/network/aika/model/NeuronDef.java
@@ -144,18 +144,18 @@ inputValue, isInputSideActive(), true,
                 .setQueued(TRAINING);
 
         identity(link, INPUT_VALUE)
-                .in(o -> o.getInput().getState(NON_FEEDBACK).getFieldOutput(NET), argLink(0));
+                .in(o -> o.getInput().getState(NON_FEEDBACK).getFieldOutput(NET), NET, argLink(0));
 
         threshold(link, INPUT_IS_FIRED, 0.0, ABOVE)
-                .in(o -> o.getFieldOutput(INPUT_VALUE), argLink(0));
+                .in(o -> o.getFieldOutput(INPUT_VALUE), INPUT_VALUE, argLink(0));
 
         invert(link, NEG_INPUT_IS_FIRED)
-                .in(o -> o.getFieldOutput(INPUT_IS_FIRED), argLink(0));
+                .in(o -> o.getFieldOutput(INPUT_IS_FIRED), INPUT_IS_FIRED, argLink(0));
 
         mul(link, WEIGHTED_INPUT)
-                .in(o -> o.getFieldOutput(INPUT_VALUE), argLink(0))
-                .in(o -> o.getSynapse().getFieldOutput(WEIGHT), argLink(1))
-                .out(o -> o.getOutputSlot().getFieldInput(SLOT), varLink());
+                .in(o -> o.getFieldOutput(INPUT_VALUE), INPUT_VALUE, argLink(0))
+                .in(o -> o.getSynapse().getFieldOutput(WEIGHT), WEIGHT, argLink(1))
+                .out(o -> o.getOutputSlot().getFieldInput(SLOT), SLOT, varLink());
     }
 
     public StateDefinition getNonFeedbackState() {
diff --git a/model/src/main/java/network/aika/model/PatternDef.java b/model/src/main/java/network/aika/model/PatternDef.java
@@ -90,15 +90,15 @@ public void initNodes(Config conf) {
                 .addStateType(typeModel.neuron.getNonFeedbackState());
 
         FieldDefinition<ActivationDefinition, Activation> g = mul(activation, ACT_GRADIENT)
-                .in(o -> o.getFieldOutput(GRADIENT), argLink(0))
-                .in(o -> o.getFieldOutput(NET_OUTER_GRADIENT), argLink(1));
+                .in(o -> o.getFieldOutput(GRADIENT), GRADIENT, argLink(0))
+                .in(o -> o.getFieldOutput(NET_OUTER_GRADIENT), NET_OUTER_GRADIENT, argLink(1));
 
         scale(
                 activation,
                 UPDATE_VALUE,
                 conf.getLearnRate(false/*neuron.isAbstract()*/)
         )
-                .in(g.getFieldOutput(), argLink(0));
+                .in(g.getFieldOutput(), UPDATE_VALUE, argLink(0));
 
 
         neuron = new NeuronDefinition(
@@ -131,7 +131,7 @@ public void initNodes(Config conf) {
         neuronStatistic = new FieldDefinition(NeuronStatistic.class, neuron, STATISTIC, TOLERANCE);
 
         neuronAverageCoveredSpace
-                .out(o -> o.getFieldInput(STATISTIC), argLink(0));
+                .out(o -> o.getFieldInput(STATISTIC), STATISTIC, argLink(0));
 
         categoryActivation = new ActivationDefinition(
                 getTypeModel(),
@@ -249,7 +249,7 @@ public void initRelations(Config conf) {
 
 
         identity(link, INPUT_VALUE)  // TODO: check if a placeholder field can be used
-                .in(o -> o.getInput().getState(OUTER_FEEDBACK).getFieldOutput(NET), argLink(0));
+                .in(o -> o.getInput().getState(OUTER_FEEDBACK).getFieldOutput(NET), NET, argLink(0));
     }
 
     @Override
diff --git a/model/src/main/java/network/aika/model/StateDef.java b/model/src/main/java/network/aika/model/StateDef.java
@@ -49,10 +49,10 @@ public void init(String name, StateType stateType) {
         firedListener(state, FIRED, TOLERANCE);
 
         sum(state, NET)
-                .out(o -> o.getFieldInput(FIRED), argLink(0));
+                .out(o -> o.getFieldInput(FIRED), FIRED, argLink(0));
 
         actFunc(state, VALUE, TOLERANCE)
-                .in(o -> o.getFieldOutput(NET), argLink(0))
+                .in(o -> o.getFieldOutput(NET), NET, argLink(0))
                 .setQueued(INFERENCE);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Sign invert() {`
`41`	`41`	`@Override`
`42`	`42`	`public <D extends Type<D, O>, O extends Obj<D, O>> FieldDefinition<D, O> getValue(D ref, FieldDefinition<D, O> v) {`
`43`	`43`	`return InvertFunction.invert(ref, NEGATION)`
`44`		`- .in(v.getFieldOutput(), argLink(0));`
	`44`	`+ .in(v.getFieldOutput(), v.getFieldOutput().getFieldTag(), argLink(0));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,9 @@ public FieldLink instantiate(FieldOutput input, FieldInput output) {`
`40`	`40`	`public Integer getArg() {`
`41`	`41`	`return arg;`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ @Override`
	`45`	`+ public String toString() {`
	`46`	`+ return "FIXED(" + arg + ")";`
	`47`	`+ }`
`43`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public class InputFieldLinkDefinition<T extends Type<T, O>, O extends Obj<T, O>>`
`37`	`37`
`38`	`38`	`private Function<O, FieldOutput> pathProvider;`
`39`	`39`
`40`		`- public InputFieldLinkDefinition(Function<O, FieldOutput> pathProvider, FieldLinkTypeDefinition typeDefinition) {`
`41`		`- super(typeDefinition);`
	`40`	`+ public InputFieldLinkDefinition(Function<O, FieldOutput> pathProvider, FieldTag targetFieldDocu, FieldLinkTypeDefinition typeDefinition) {`
	`41`	`+ super(typeDefinition, targetFieldDocu);`
`42`	`42`	`this.pathProvider = pathProvider;`
`43`	`43`	`}`
`44`	`44`
`@@ -67,4 +67,9 @@ public FieldLink instantiateAndLink(FieldOutput input, FieldInput output) {`
`67`	`67`
`68`	`68`	`return fl;`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+ @Override`
	`72`	`+ public String toString() {`
	`73`	`+ return "OUT " + super.toString();`
	`74`	`+ }`
`70`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,9 @@ public class VariableFieldLinkDefinition extends FieldLinkTypeDefinition {`
`25`	`25`	`public VariableFieldLinkDefinition(boolean propagateUpdates) {`
`26`	`26`	`super(propagateUpdates);`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ @Override`
	`30`	`+ public String toString() {`
	`31`	`+ return "VARIABLE";`
	`32`	`+ }`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,8 @@ public void initRelations() {`
`117`	`117`	`.setQueued(TRAINING);`
`118`	`118`
`119`	`119`	`identity(link, SYNAPSE_BIAS)`
`120`		`- .in(o -> o.getSynapse().getFieldOutput(SYNAPSE_BIAS), argLink(0))`
`121`		`- .out(o -> o.getOutput().getState(NON_FEEDBACK).getFieldInput(NET), varLink());`
	`120`	`+ .in(o -> o.getSynapse().getFieldOutput(SYNAPSE_BIAS), SYNAPSE_BIAS, argLink(0))`
	`121`	`+ .out(o -> o.getOutput().getState(NON_FEEDBACK).getFieldInput(NET), NET, varLink());`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Override`