Fix

LukasMolzberger · LukasMolzberger · commit 3be4a3bb7ab5 · 2025-01-24T17:47:03.000+01:00
diff --git a/fields/src/main/java/network/aika/fields/direction/Direction.java b/fields/src/main/java/network/aika/fields/direction/Direction.java
@@ -34,8 +34,6 @@ public interface Direction {
     >
     FlattenedType<T, O, RT, RO> getFlattenedType(Type<T, O> type);
 
-    Relation<?, ?, ?, ?> getRelation(Relation<?, ?, ?, ?> rel);
-
     <
             T extends Type<T, O>,
             O extends Obj<T, O>,
diff --git a/fields/src/main/java/network/aika/fields/direction/Input.java b/fields/src/main/java/network/aika/fields/direction/Input.java
@@ -42,11 +42,6 @@ FlattenedType<T, O, RT, RO> getFlattenedType(Type<T, O> type) {
         return (FlattenedType<T, O, RT, RO>) type.getFlattenedTypeInputSide();
     }
 
-    @Override
-    public Relation<?, ?, ?, ?> getRelation(Relation<?, ?, ?, ?> rel) {
-        return rel;
-    }
-
     @Override
     public <
             T extends Type<T, O>,
diff --git a/fields/src/main/java/network/aika/fields/direction/Output.java b/fields/src/main/java/network/aika/fields/direction/Output.java
@@ -44,11 +44,6 @@ FlattenedType<T, O, RT, RO> getFlattenedType(Type<T, O> type) {
         return (FlattenedType<T, O, RT, RO>) type.getFlattenedTypeOutputSide();
     }
 
-    @Override
-    public Relation<?, ?, ?, ?> getRelation(Relation<?, ?, ?, ?> rel) {
-        return rel.getReverse();
-    }
-
     @Override
     public <
             T extends Type<T, O>,
diff --git a/fields/src/main/java/network/aika/type/FlattenedType.java b/fields/src/main/java/network/aika/type/FlattenedType.java
@@ -132,7 +132,7 @@ private FlattenedTypeRelation<T, O, RT, RO> flattenPerType(
                 .flatMap(Stream::of)
                 .<FieldLinkDefinition<T, O, ?, ?>>flatMap(direction::getFieldLinkDefinitions)
                 .filter(fl ->
-                        direction.getRelation(fl.getRelation()).getRelationId() == relation.getRelationId()
+                        fl.getRelation().getRelationId() == relation.getRelationId()
                 )
                 .filter(fl ->
                         relatedType.isInstanceOf(fl.getRelatedFD().getObjectType())
diff --git a/fields/src/test/java/network/aika/fields/softmax/SoftmaxTest.java b/fields/src/test/java/network/aika/fields/softmax/SoftmaxTest.java
@@ -105,6 +105,9 @@ public void testSoftmax(int setInputValuesPos) {
         if(setInputValuesPos == 3)
             setInputValues(inputsObjs, softmaxFields);
 
+        double normValue = normObj.getFieldValue(softmaxFields.getNorm());
+        Assertions.assertEquals(22.9, normValue);
+
         double[] outputValues = new double[inputValues.length];
         for(int i = 0; i < outputValues.length; i++)
             outputValues[i] = outputsObjs[i].getFieldOutput(softmaxFields.getOutputs()).getValue();

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ public interface Direction {`
`34`	`34`	`>`
`35`	`35`	`FlattenedType<T, O, RT, RO> getFlattenedType(Type<T, O> type);`
`36`	`36`
`37`		`- Relation<?, ?, ?, ?> getRelation(Relation<?, ?, ?, ?> rel);`
`38`		`-`
`39`	`37`	`<`
`40`	`38`	`T extends Type<T, O>,`
`41`	`39`	`O extends Obj<T, O>,`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ private FlattenedTypeRelation<T, O, RT, RO> flattenPerType(`
`132`	`132`	`.flatMap(Stream::of)`
`133`	`133`	`.<FieldLinkDefinition<T, O, ?, ?>>flatMap(direction::getFieldLinkDefinitions)`
`134`	`134`	`.filter(fl ->`
`135`		`- direction.getRelation(fl.getRelation()).getRelationId() == relation.getRelationId()`
	`135`	`+ fl.getRelation().getRelationId() == relation.getRelationId()`
`136`	`136`	`)`
`137`	`137`	`.filter(fl ->`
`138`	`138`	`relatedType.isInstanceOf(fl.getRelatedFD().getObjectType())`