Skip to content

Commit 9745421

Browse files
LukasMolzbergerLukasMolzberger
committed
Work on Relations
1 parent 7a53bad commit 9745421

File tree

12 files changed

+43
-28
lines changed

12 files changed

+43
-28
lines changed

‎core/src/test/java/network/aika/activations/model/TestNeuronDef.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import static network.aika.misc.utils.Utils.TOLERANCE;
3939
import static network.aika.queue.Phase.INFERENCE;
4040
import static network.aika.queue.Phase.TRAINING;
41+
import static network.aika.typedefs.ActivationDefinition.SELF;
4142

4243
/**
4344
*
@@ -83,10 +84,10 @@ public void init() {
8384
"FIRED",
8485
(fd, act) -> act.updateFiredStep(act.getField(fd)),
8586
TOLERANCE)
86-
.in(net, 0);
87+
.in(SELF, net, 0);
8788

8889
value = actFunc(node.activation, "VALUE", LIMITED_RECTIFIED_LINEAR_UNIT, TOLERANCE)
89-
.in(net, 0)
90+
.in(SELF, net, 0)
9091
.setQueued(INFERENCE);
9192

9293
weight = sum(edge.synapse, "WEIGHT");

‎fields/src/test/java/network/aika/fields/hierarchy/MultipleInheritanceTest.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import network.aika.type.TypeRegistry;
2222
import network.aika.type.TypeRegistryImpl;
2323
import network.aika.type.relations.RelationOne;
24+
import network.aika.type.relations.RelationSelf;
2425
import org.junit.jupiter.api.BeforeEach;
2526
import org.junit.jupiter.params.ParameterizedTest;
2627
import org.junit.jupiter.params.provider.ValueSource;
@@ -31,13 +32,6 @@
3132
*/
3233
public class MultipleInheritanceTest {
3334

34-
public static RelationOne<TestType, TestObject, TestType, TestObject> TEST_RELATION_FROM = new RelationOne<>(TestObject::getRelatedTestObject, "TEST_FROM");
35-
public static RelationOne<TestType, TestObject, TestType, TestObject> TEST_RELATION_TO = new RelationOne<>(TestObject::getRelatedTestObject, "TEST_TO");
36-
37-
static {
38-
TEST_RELATION_TO.setReversed(TEST_RELATION_FROM);
39-
TEST_RELATION_FROM.setReversed(TEST_RELATION_TO);
40-
}
4135

4236
protected TestType[][][] type;
4337

‎fields/src/test/java/network/aika/fields/hierarchy/TypeHierarchyTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import static network.aika.fields.IdentityFunction.identity;
3030
import static network.aika.fields.InputField.inputField;
3131
import static network.aika.fields.Subtraction.sub;
32+
import static network.aika.fields.oneobject.TestType.SELF;
3233

3334

3435
/**
@@ -61,16 +62,16 @@ public void testInheritance() {
6162
FieldDefinition<TestType, TestObject> b = inputField(parent, "b");
6263

6364
FieldDefinition<TestType, TestObject> parentC = add(parent, "c")
64-
.in(a, 0)
65-
.in(b, 1);
65+
.in(SELF, a, 0)
66+
.in(SELF, b, 1);
6667

6768
FieldDefinition<TestType, TestObject> c = sub(child, "c")
68-
.in(a, 0)
69-
.in(b, 1)
69+
.in(SELF, a, 0)
70+
.in(SELF, b, 1)
7071
.setParent(parentC);
7172

7273
FieldDefinition<TestType, TestObject> d = identity(parent, "d")
73-
.in(c, 0);
74+
.in(SELF, c, 0);
7475

7576
registry.flattenTypeHierarchy();
7677

‎fields/src/test/java/network/aika/fields/oneobject/AbstractTestWithObjects.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77

88
public abstract class AbstractTestWithObjects {
99

10-
public static RelationOne<TestType, TestObject, TestType, TestObject> TEST_RELATION_FROM = new RelationOne<>(TestObject::getRelatedTestObject, "TEST_FROM");
11-
public static RelationOne<TestType, TestObject, TestType, TestObject> TEST_RELATION_TO = new RelationOne<>(TestObject::getRelatedTestObject, "TEST_TO");
12-
13-
static {
14-
TEST_RELATION_TO.setReversed(TEST_RELATION_FROM);
15-
TEST_RELATION_FROM.setReversed(TEST_RELATION_TO);
16-
}
17-
1810
protected TestType typeA;
1911
protected TestType typeB;
2012

‎fields/src/test/java/network/aika/fields/oneobject/DivisionTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static network.aika.fields.Division.div;
2626
import static network.aika.fields.InputField.inputField;
2727
import static network.aika.fields.oneobject.TestObject.linkObjectsAndInitFields;
28+
import static network.aika.fields.oneobject.TestType.TEST_RELATION_FROM;
2829

2930

3031
/**

‎fields/src/test/java/network/aika/fields/oneobject/ExponentialFunctionTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import static network.aika.fields.ExponentialFunction.exp;
2828
import static network.aika.fields.InputField.inputField;
29+
import static network.aika.fields.oneobject.TestType.SELF;
2930

3031

3132
/**
@@ -42,7 +43,7 @@ public void testExponentialFunction() {
4243

4344
FieldDefinition<TestType, TestObject> a = inputField(type, "a");
4445
FieldDefinition<TestType, TestObject> b = exp(type, "b")
45-
.in(a, 0);
46+
.in(SELF, a, 0);
4647

4748
Obj o = new ObjImpl(type);
4849

‎fields/src/test/java/network/aika/fields/oneobject/FieldInstantiationTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static network.aika.fields.InputField.inputField;
2525
import static network.aika.fields.Multiplication.mul;
2626
import static network.aika.fields.SumField.sum;
27+
import static network.aika.fields.oneobject.TestType.SELF;
2728

2829

2930
/**
@@ -40,7 +41,7 @@ public void testFieldInstantiation() {
4041

4142
FieldDefinition<TestType, TestObject> a = inputField(type, "a");
4243
FieldDefinition<TestType, TestObject> b = sum(type, "b")
43-
.in(a);
44+
.in(SELF, a);
4445

4546
Obj o = new ObjImpl(type);
4647

@@ -65,9 +66,9 @@ public void testFieldInstantiationChain() {
6566

6667
FieldDefinition<TestType, TestObject> a = inputField(type, "a");
6768
FieldDefinition<TestType, TestObject> b = sum(type, "b")
68-
.in(a);
69+
.in(SELF, a);
6970
FieldDefinition<TestType, TestObject> c = sum(type, "c")
70-
.in(b);
71+
.in(SELF, b);
7172

7273
Obj o = new ObjImpl(type);
7374

@@ -89,8 +90,8 @@ public void testMultiplication() {
8990
FieldDefinition<TestType, TestObject> b = inputField(type, "b");
9091

9192
FieldDefinition c = mul(type, "c")
92-
.in(a, 0)
93-
.in(b, 1);
93+
.in(SELF, a, 0)
94+
.in(SELF, b, 1);
9495

9596
Obj o = new ObjImpl(type);
9697

‎fields/src/test/java/network/aika/fields/oneobject/FieldInstantiationWithObjectsTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static network.aika.fields.InputField.inputField;
2525
import static network.aika.fields.SumField.sum;
2626
import static network.aika.fields.oneobject.TestObject.linkObjectsAndInitFields;
27+
import static network.aika.fields.oneobject.TestType.TEST_RELATION_TO;
2728

2829

2930
/**

‎fields/src/test/java/network/aika/fields/oneobject/MultiplicationTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static network.aika.fields.InputField.inputField;
2626
import static network.aika.fields.Multiplication.mul;
2727
import static network.aika.fields.oneobject.TestObject.linkObjectsAndInitFields;
28+
import static network.aika.fields.oneobject.TestType.TEST_RELATION_FROM;
2829

2930

3031
/**

‎fields/src/test/java/network/aika/fields/oneobject/SubtractionTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static network.aika.fields.InputField.inputField;
2626
import static network.aika.fields.Subtraction.sub;
2727
import static network.aika.fields.oneobject.TestObject.linkObjectsAndInitFields;
28+
import static network.aika.fields.oneobject.TestType.TEST_RELATION_FROM;
2829

2930

3031
/**

0 commit comments

Comments
 (0)