fixes

LukasMolzberger · LukasMolzberger · commit 78ee3902abb7 · 2025-01-11T08:54:57.000+01:00
diff --git a/core/src/main/java/network/aika/typedefs/LinkDefinition.java b/core/src/main/java/network/aika/typedefs/LinkDefinition.java
@@ -44,7 +44,7 @@ public class LinkDefinition extends Type<LinkDefinition, Link> {
     public static final RelationOne<LinkDefinition, Link, LinkDefinition, Link> CORRESPONDING_INPUT_LINK = new RelationOne<>(l -> l.getInput().getCorrespondingInputLink(l), 4, "CORRESPONDING_INPUT_LINK");
     public static final RelationOne<LinkDefinition, Link, LinkDefinition, Link> CORRESPONDING_OUTPUT_LINK = new RelationOne<>(l -> l.getOutput().getCorrespondingOutputLink(l), 5, "CORRESPONDING_OUTPUT_LINK");
 
-    public static final Relation[] RELATIONS = {INPUT, OUTPUT, SYNAPSE, CORRESPONDING_INPUT_LINK, CORRESPONDING_OUTPUT_LINK};
+    public static final Relation[] RELATIONS = {SELF, INPUT, OUTPUT, SYNAPSE, CORRESPONDING_INPUT_LINK, CORRESPONDING_OUTPUT_LINK};
 
     static {
         SYNAPSE.setReversed(SynapseDefinition.LINK);
diff --git a/core/src/main/java/network/aika/typedefs/NeuronDefinition.java b/core/src/main/java/network/aika/typedefs/NeuronDefinition.java
@@ -42,7 +42,7 @@ public class NeuronDefinition extends Type<NeuronDefinition, Neuron> {
     public static final RelationMany<NeuronDefinition, Neuron, SynapseDefinition, Synapse> OUTPUT = new RelationMany<>(Neuron::getOutputSynapsesAsStream, 2, "NEURON-OUTPUT");
     public static final RelationMany<NeuronDefinition, Neuron, ActivationDefinition, Activation> ACTIVATION = new RelationMany<>(null, 3, "NEURON-ACTIVATION");
 
-    public static final Relation[] RELATIONS = {INPUT, OUTPUT, ACTIVATION};
+    public static final Relation[] RELATIONS = {SELF, INPUT, OUTPUT, ACTIVATION};
 
     static {
         ACTIVATION.setReversed(ActivationDefinition.NEURON);
diff --git a/core/src/main/java/network/aika/typedefs/SynapseDefinition.java b/core/src/main/java/network/aika/typedefs/SynapseDefinition.java
@@ -46,7 +46,7 @@ public class SynapseDefinition extends Type<SynapseDefinition, Synapse> {
     public static final RelationOne<SynapseDefinition, Synapse, NeuronDefinition, Neuron> OUTPUT = new RelationOne<>(Synapse::getOutput, 2, "SYN-OUTPUT");
     public static final RelationMany<SynapseDefinition, Synapse, LinkDefinition, Link> LINK = new RelationMany<>(null, 3, "SYN-LINK");
 
-    public static final Relation[] RELATIONS = {INPUT, OUTPUT, LINK};
+    public static final Relation[] RELATIONS = {SELF, INPUT, OUTPUT, LINK};
 
     static {
         LINK.setReversed(LinkDefinition.SYNAPSE);
diff --git a/core/src/test/java/network/aika/activations/MinimalNetworkTest.java b/core/src/test/java/network/aika/activations/MinimalNetworkTest.java
@@ -46,6 +46,8 @@ public void minNetworkTest() {
         FieldDefinition<SynapseDefinition, Synapse> weight = typeModel.getNeuron().getWeight();
         FieldDefinition<ActivationDefinition, Activation> net = typeModel.getNeuron().getNet();
 
+        typeModel.flattenTypeHierarchy();
+
         Model m = new Model(typeModel)
                 .setConfig(new Config());
 
diff --git a/fields/src/main/java/network/aika/type/ObjImpl.java b/fields/src/main/java/network/aika/type/ObjImpl.java
@@ -41,7 +41,8 @@ public class ObjImpl<T extends Type<T, O>, O extends Obj<T, O>, M> implements Ob
     public ObjImpl(T type) {
         this.type = type;
 
-        fields = new Field[type.getFlattenedType().getNumberOfFields()];
+        if(type != null)
+            fields = new Field[type.getFlattenedType().getNumberOfFields()];
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ public class ObjImpl<T extends Type<T, O>, O extends Obj<T, O>, M> implements Ob`
`41`	`41`	`public ObjImpl(T type) {`
`42`	`42`	`this.type = type;`
`43`	`43`
`44`		`- fields = new Field[type.getFlattenedType().getNumberOfFields()];`
	`44`	`+ if(type != null)`
	`45`	`+ fields = new Field[type.getFlattenedType().getNumberOfFields()];`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`@Override`