Fixes

Author: LukasMolzberger

include/fields/field_definition.h

@@ -55,8 +55,8 @@ class FieldDefinition {
     void addOutput(FieldLinkDefinition* fl);
     std::vector<FieldLinkDefinition*> getOutputs();
 
-    FieldDefinition& in(Relation* relation, FieldDefinition* input, int arg);
-    FieldDefinition& out(Relation* relation, FieldDefinition* output, int arg);
+    FieldDefinition& input(Relation& relation, FieldDefinition& input, int arg);
+    FieldDefinition& output(Relation& relation, FieldDefinition& output, int arg);
 
     FieldDefinition& setName(const std::string& name);
     std::string getName() const;

src/fields/field_definition.cpp

@@ -14,6 +14,7 @@ FieldDefinition::FieldDefinition(Type* objectType, const std::string& name, int
     objectType->setFieldDefinition(this);
 
     if (numArgs > 0) {
+        std::cout << "numArgs : " << numArgs << std::endl;
         inputs.reserve(numArgs);
     }
 }
@@ -66,11 +67,16 @@ void FieldDefinition::initializeField(Field* field) {
 }
 
 void FieldDefinition::addInput(FieldLinkDefinition* fl) {
-    throw std::logic_error("Unsupported operation.");
+    std::cout << "fl->getArgument() : " << fl->getArgument() << " inputs.size : " << inputs.size() << std::endl;
+
+    if(fl->getArgument() >= 0) 
+        inputs[fl->getArgument()] = fl;
+    else
+        inputs.push_back(fl);    
 }
 
 std::vector<FieldLinkDefinition*> FieldDefinition::getInputs() {
-    throw std::logic_error("Unsupported operation.");
+    return inputs;
 }
 
 void FieldDefinition::addOutput(FieldLinkDefinition* fl) {
@@ -81,14 +87,14 @@ std::vector<FieldLinkDefinition*> FieldDefinition::getOutputs() {
     return outputs;
 }
 
-FieldDefinition& FieldDefinition::in(Relation* relation, FieldDefinition* input, int arg) {
-    FieldLinkDefinition::link(input, this, relation, arg);
+FieldDefinition& FieldDefinition::input(Relation& relation, FieldDefinition& input, int arg) {
+    FieldLinkDefinition::link(&input, this, &relation, arg);
 //    assert(relation || objectType->isInstanceOf(output->getObjectType()) || output->getObjectType()->isInstanceOf(objectType));
     return *this;
 }
 
-FieldDefinition& FieldDefinition::out(Relation* relation, FieldDefinition* output, int arg) {
-    FieldLinkDefinition::link(this, output, relation, arg);
+FieldDefinition& FieldDefinition::output(Relation& relation, FieldDefinition& output, int arg) {
+    FieldLinkDefinition::link(this, &output, &relation, arg);
 //    assert(relation || objectType->isInstanceOf(output->getObjectType()) || output->getObjectType()->isInstanceOf(objectType));
     return *this;
 }

src/fields/field_link_definition.cpp

@@ -16,6 +16,7 @@ void FieldLinkDefinition::link(FieldDefinition* input,
 
     flo->setOppositeSide(fli);
     fli->setOppositeSide(flo);
+   
 }
 
 FieldLinkDefinition::FieldLinkDefinition(FieldDefinition* originFD,

src/fields/subtraction.cpp

@@ -3,7 +3,7 @@
 
 // Constructor
 Subtraction::Subtraction(Type* ref, const std::string& name)
-    : AbstractFunctionDefinition(ref, name, 0, 0.0) {}
+    : AbstractFunctionDefinition(ref, name, 2, 0.0) {}
 
 // Overridden computeUpdate method
 double Subtraction::computeUpdate(Obj* obj, FieldLinkDefinition* fl, double u) {

tests/subtraction-test.py

@@ -1,16 +1,27 @@
 import unittest
+import sys
+import os
+
+# Add the project root to Python's module search path
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+
 import aika
 
 class MyTestCase(unittest.TestCase):
     def test_something(self):
         self.assertEqual(True, False)  # add assertion here
 
     def testSubtraction(self):
+        print("Module 'aika' was loaded from:", aika.__file__)
+
         TEST_RELATION_FROM = aika.RelationOne(1, "TEST_FROM")
         TEST_RELATION_TO = aika.RelationOne(2, "TEST_TO")
         TEST_RELATION_TO.setReversed(TEST_RELATION_FROM)
         TEST_RELATION_FROM.setReversed(TEST_RELATION_TO)
 
+        assert isinstance(TEST_RELATION_FROM, aika.Relation)
+        assert isinstance(TEST_RELATION_TO, aika.Relation)
+
         registry = aika.TypeRegistry()
 
         typeA = aika.TestType(registry, "A")
@@ -20,31 +31,22 @@ def testSubtraction(self):
         b = typeB.inputField("b")
 
         c = typeB.sub("c")
-        c.in(TEST_RELATION_FROM, a, 0)
-        c.in(TEST_RELATION_FROM, b, 1)
-
-        registry.flattenTypeHierarchy()
 
-        oa = typeA.instantiate()
-        ob = typeB.instantiate()
-
-        if(linkingPos == 0)
-            linkObjects(oa, ob)
-            ob.initFields()
+        print("Type of c:", type(c))
+        print("Type of TEST_RELATION_FROM:", type(TEST_RELATION_FROM))
+        print("Type of a:", type(a))
 
-        oa.setFieldValue(a, 50.0)
+        assert isinstance(a, aika.FieldDefinition)
+        assert isinstance(c, aika.FieldDefinition)
 
-        if(linkingPos == 1)
-            linkObjects(oa, ob)
-            ob.initFields()
+        c.input(TEST_RELATION_FROM, a, 0)
+        c.input(TEST_RELATION_FROM, b, 1)
 
-        oa.setFieldValue(b, 20.0)
+        registry.flattenTypeHierarchy()
 
-        if(linkingPos == 2)
-            linkObjects(oa, ob)
-            ob.initFields()
+        oa = typeA.instantiate()
+        ob = typeB.instantiate()
 
-        Assertions.assertEquals(30.0, ob.getFieldOutput(c).getValue())
 
 if __name__ == '__main__':
     unittest.main()