Work on Relations

LukasMolzberger · LukasMolzberger · commit 7e9fc240d383 · 2025-01-05T07:47:52.000+01:00
diff --git a/core/src/main/java/network/aika/typedefs/ActivationDefinition.java b/core/src/main/java/network/aika/typedefs/ActivationDefinition.java
@@ -63,7 +63,7 @@ public ActivationDefinition(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<ActivationDefinition, Activation, ?, ?>[] getRelationTypes() {
+    public Relation<ActivationDefinition, Activation, ?, ?>[] getRelations() {
         return RELATIONS;
     }
 
diff --git a/core/src/main/java/network/aika/typedefs/LinkDefinition.java b/core/src/main/java/network/aika/typedefs/LinkDefinition.java
@@ -63,7 +63,7 @@ public LinkDefinition(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<LinkDefinition, Link, ?, ?>[] getRelationTypes() {
+    public Relation<LinkDefinition, Link, ?, ?>[] getRelations() {
         return RELATIONS;
     }
 
diff --git a/core/src/main/java/network/aika/typedefs/NeuronDefinition.java b/core/src/main/java/network/aika/typedefs/NeuronDefinition.java
@@ -59,7 +59,7 @@ public NeuronDefinition(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<NeuronDefinition, Neuron, ?, ?>[] getRelationTypes() {
+    public Relation<NeuronDefinition, Neuron, ?, ?>[] getRelations() {
         return RELATIONS;
     }
 
diff --git a/core/src/main/java/network/aika/typedefs/SynapseDefinition.java b/core/src/main/java/network/aika/typedefs/SynapseDefinition.java
@@ -72,7 +72,7 @@ public SynapseDefinition(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<SynapseDefinition, Synapse, ?, ?>[] getRelationTypes() {
+    public Relation<SynapseDefinition, Synapse, ?, ?>[] getRelations() {
         return RELATIONS;
     }
 
diff --git a/fields/src/main/java/network/aika/fields/defs/FieldDefinition.java b/fields/src/main/java/network/aika/fields/defs/FieldDefinition.java
@@ -24,7 +24,6 @@
 import network.aika.type.Obj;
 import network.aika.queue.ProcessingPhase;
 import network.aika.type.Type;
-import network.aika.type.relations.RelationSelf;
 import network.aika.utils.ToleranceUtils;
 
 import java.util.ArrayList;
@@ -99,7 +98,7 @@ public void initializeField(Obj<?, ?> sourceObj, O obj) {
     public void propagateUpdate(O fromObj, double update) {
         for(int rel = 0; rel < getObjectType().getFlattenedType().getOutputs().length; rel++) {
             FieldLinkDefinition<T, O, ?, ?>[][] outputs = getObjectType().getFlattenedType().getOutputs()[rel];
-            Relation<T, O, ?, ?> relation = getObjectType().getRelationTypes()[rel];
+            Relation<T, O, ?, ?> relation = getObjectType().getRelations()[rel];
 
             if(outputs != null) {
                 relation.followAll(fromObj)
diff --git a/fields/src/main/java/network/aika/type/FlattenedType.java b/fields/src/main/java/network/aika/type/FlattenedType.java
@@ -67,9 +67,9 @@ public void flattenFieldLinks() {
 
     @SuppressWarnings("unchecked")
     private FieldLinkDefinition<?, ?, T, O>[][][] flattenInputs() {
-        FieldLinkDefinition<?, ?, T, O>[][][] results = new FieldLinkDefinition[type.getRelationTypes().length][][];
+        FieldLinkDefinition<?, ?, T, O>[][][] results = new FieldLinkDefinition[type.getRelations().length][][];
 
-        for(Relation<T, O, ?, ?> rel: type.getRelationTypes()) {
+        for(Relation<T, O, ?, ?> rel: type.getRelations()) {
             FieldLinkDefinition<?, ?, T, O>[][] resultsPerRelation = new FieldLinkDefinition[type.getTypeRegistry().getTypes().size()][];
             for (Type<?, ?> relType : type.getTypeRegistry().getTypes()) {
                 resultsPerRelation[relType.getId()] = flattenInputsPerType(relType);
@@ -104,9 +104,9 @@ public void flattenFieldLinks() {
 
     @SuppressWarnings("unchecked")
     private FieldLinkDefinition<T, O, ?, ?>[][][] flattenOutputs() {
-        FieldLinkDefinition<T, O, ?, ?>[][][] results = new FieldLinkDefinition[type.getRelationTypes().length][][];
+        FieldLinkDefinition<T, O, ?, ?>[][][] results = new FieldLinkDefinition[type.getRelations().length][][];
 
-        for(Relation<T, O, ?, ?> rel: type.getRelationTypes()) {
+        for(Relation<T, O, ?, ?> rel: type.getRelations()) {
             FieldLinkDefinition<T, O, ?, ?>[][] resultsPerRelation = new FieldLinkDefinition[type.getTypeRegistry().getTypes().size()][];
             for (Type<?, ?> relType : type.getTypeRegistry().getTypes()) {
                 resultsPerRelation[relType.getId()] = flattenOutputsPerType(relType);
diff --git a/fields/src/main/java/network/aika/type/Type.java b/fields/src/main/java/network/aika/type/Type.java
@@ -68,7 +68,7 @@ public boolean isAbstract() {
         return !children.isEmpty();
     }
 
-    public abstract Relation<T, O, ?, ?>[] getRelationTypes();
+    public abstract Relation<T, O, ?, ?>[] getRelations();
 
     public void initFlattenedType() {
         flattenedType = new FlattenedType<>((T)this);
diff --git a/fields/src/test/java/network/aika/fields/manyobjects/TestTypeMany.java b/fields/src/test/java/network/aika/fields/manyobjects/TestTypeMany.java
@@ -24,7 +24,7 @@ public TestTypeMany(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<TestTypeMany, TestObjectMany, ?, ?>[] getRelationTypes() {
+    public Relation<TestTypeMany, TestObjectMany, ?, ?>[] getRelations() {
         return new Relation[] {TEST_RELATION_FROM};
     }
 
diff --git a/fields/src/test/java/network/aika/fields/manyobjects/TestTypeOne.java b/fields/src/test/java/network/aika/fields/manyobjects/TestTypeOne.java
@@ -25,7 +25,7 @@ public TestTypeOne(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<TestTypeOne, TestObjectOne, ?, ?>[] getRelationTypes() {
+    public Relation<TestTypeOne, TestObjectOne, ?, ?>[] getRelations() {
         return new Relation[] {TEST_RELATION_TO};
     }
 
diff --git a/fields/src/test/java/network/aika/fields/oneobject/TestType.java b/fields/src/test/java/network/aika/fields/oneobject/TestType.java
@@ -27,7 +27,7 @@ public TestType(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<TestType, TestObject, ?, ?>[] getRelationTypes() {
+    public Relation<TestType, TestObject, ?, ?>[] getRelations() {
         return new Relation[] {SELF, TEST_RELATION_FROM, TEST_RELATION_TO};
     }
 
diff --git a/fields/src/test/java/network/aika/fields/softmax/SoftmaxInputType.java b/fields/src/test/java/network/aika/fields/softmax/SoftmaxInputType.java
@@ -25,7 +25,7 @@ public SoftmaxInputType(TypeRegistry registry, String name) {
     }
 
     @Override
-    public Relation<SoftmaxInputType, SoftmaxInputObj, ?, ?>[] getRelationTypes() {
+    public Relation<SoftmaxInputType, SoftmaxInputObj, ?, ?>[] getRelations() {
         return new Relation[] {INPUT_TO_NORM, NORM_TO_INPUT};
     }
 
diff --git a/fields/src/test/java/network/aika/fields/softmax/SoftmaxNormType.java b/fields/src/test/java/network/aika/fields/softmax/SoftmaxNormType.java
@@ -31,7 +31,7 @@ public SoftmaxNormObj instantiate() {
     }
 
     @Override
-    public Relation<SoftmaxNormType, SoftmaxNormObj, ?, ?>[] getRelationTypes() {
+    public Relation<SoftmaxNormType, SoftmaxNormObj, ?, ?>[] getRelations() {
         return new Relation[] {NORM_TO_OUTPUT, OUTPUT_TO_NORM};
     }
 }
diff --git a/fields/src/test/java/network/aika/fields/softmax/SoftmaxOutputType.java b/fields/src/test/java/network/aika/fields/softmax/SoftmaxOutputType.java
@@ -31,7 +31,7 @@ public SoftmaxOutputObj instantiate(int bsId) {
     }
 
     @Override
-    public Relation<SoftmaxOutputType, SoftmaxOutputObj, ?, ?>[] getRelationTypes() {
+    public Relation<SoftmaxOutputType, SoftmaxOutputObj, ?, ?>[] getRelations() {
         return new Relation[] {CORRESPONDING_INPUT_LINK, CORRESPONDING_OUTPUT_LINK};
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public ActivationDefinition(TypeRegistry registry, String name) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public Relation<ActivationDefinition, Activation, ?, ?>[] getRelationTypes() {`
	`66`	`+ public Relation<ActivationDefinition, Activation, ?, ?>[] getRelations() {`
`67`	`67`	`return RELATIONS;`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public LinkDefinition(TypeRegistry registry, String name) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public Relation<LinkDefinition, Link, ?, ?>[] getRelationTypes() {`
	`66`	`+ public Relation<LinkDefinition, Link, ?, ?>[] getRelations() {`
`67`	`67`	`return RELATIONS;`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public NeuronDefinition(TypeRegistry registry, String name) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- public Relation<NeuronDefinition, Neuron, ?, ?>[] getRelationTypes() {`
	`62`	`+ public Relation<NeuronDefinition, Neuron, ?, ?>[] getRelations() {`
`63`	`63`	`return RELATIONS;`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public SynapseDefinition(TypeRegistry registry, String name) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
`75`		`- public Relation<SynapseDefinition, Synapse, ?, ?>[] getRelationTypes() {`
	`75`	`+ public Relation<SynapseDefinition, Synapse, ?, ?>[] getRelations() {`
`76`	`76`	`return RELATIONS;`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public boolean isAbstract() {`
`68`	`68`	`return !children.isEmpty();`
`69`	`69`	`}`
`70`	`70`
`71`		`- public abstract Relation<T, O, ?, ?>[] getRelationTypes();`
	`71`	`+ public abstract Relation<T, O, ?, ?>[] getRelations();`
`72`	`72`
`73`	`73`	`public void initFlattenedType() {`
`74`	`74`	`flattenedType = new FlattenedType<>((T)this);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public TestTypeMany(TypeRegistry registry, String name) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`		`- public Relation<TestTypeMany, TestObjectMany, ?, ?>[] getRelationTypes() {`
	`27`	`+ public Relation<TestTypeMany, TestObjectMany, ?, ?>[] getRelations() {`
`28`	`28`	`return new Relation[] {TEST_RELATION_FROM};`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public TestTypeOne(TypeRegistry registry, String name) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`		`- public Relation<TestTypeOne, TestObjectOne, ?, ?>[] getRelationTypes() {`
	`28`	`+ public Relation<TestTypeOne, TestObjectOne, ?, ?>[] getRelations() {`
`29`	`29`	`return new Relation[] {TEST_RELATION_TO};`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public TestType(TypeRegistry registry, String name) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- public Relation<TestType, TestObject, ?, ?>[] getRelationTypes() {`
	`30`	`+ public Relation<TestType, TestObject, ?, ?>[] getRelations() {`
`31`	`31`	`return new Relation[] {SELF, TEST_RELATION_FROM, TEST_RELATION_TO};`
`32`	`32`	`}`
`33`	`33`