Implemented addition

Author: LukasMolzberger

CMakeLists.txt

@@ -16,6 +16,7 @@ set(SOURCES
         src/fields/field_definition.cpp
         src/fields/abstract_function_definition.cpp
         src/fields/input_field.cpp
+        src/fields/addition.cpp
         src/fields/subtraction.cpp
         src/fields/field_link_definition.cpp
         src/fields/obj.cpp

include/fields/addition.h

@@ -0,0 +1,18 @@
+#ifndef ADDITION_H
+#define ADDITION_H
+
+#include "fields/abstract_function_definition.h"
+#include "fields/type.h"
+#include "fields/obj.h"
+
+class Addition : public AbstractFunctionDefinition {
+public:
+
+    // Constructor
+    Addition(Type* ref, const std::string& name);
+
+    // Overridden method from AbstractFunctionDefinition
+    double computeUpdate(Obj* obj, FieldLinkDefinition* fl, double u) override;
+};
+
+#endif // ADDITION_H 

install_manifest.txt

@@ -19,6 +19,7 @@
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/abstract_function_definition.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/type_registry.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/queue_interceptor.h
+/Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/addition.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/field_update.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/flattened_type.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/rel_obj_iterator.h

python-tests/addition-test.py

@@ -0,0 +1,49 @@
+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 AdditionTestCase(unittest.TestCase):
+
+    def testAddition(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)
+
+        registry = aika.TypeRegistry()
+
+        typeA = aika.TestType(registry, "A")
+        typeB = aika.TestType(registry, "B")
+
+        a = typeA.inputField("a")
+        b = typeA.inputField("b")
+
+        c = typeB.add("c")
+
+        c.input(TEST_RELATION_FROM, a, 0)
+        c.input(TEST_RELATION_FROM, b, 1)
+
+        registry.flattenTypeHierarchy()
+
+        oa = typeA.instantiate()
+        ob = typeB.instantiate()
+
+        aika.TestObj.linkObjects(oa, ob)
+        ob.initFields()
+
+        oa.setFieldValue(a, 50.0)
+        oa.setFieldValue(b, 20.0)
+
+        print("ob.getFieldValue(c):", ob.getFieldValue(c))
+
+        self.assertEqual(70.0, ob.getFieldValue(c))
+
+if __name__ == '__main__':
+    unittest.main() 

src/fields/addition.cpp

@@ -0,0 +1,10 @@
+#include "fields/addition.h"
+
+// Constructor
+Addition::Addition(Type* ref, const std::string& name)
+    : AbstractFunctionDefinition(ref, name, 2, 0.0) {}
+
+// Overridden computeUpdate method
+double Addition::computeUpdate(Obj* obj, FieldLinkDefinition* fl, double u) {
+    return u;
+} 

src/fields/python_bindings.cpp

@@ -11,6 +11,7 @@
 #include "fields/test_type.h"
 #include "fields/test_object.h"
 #include "fields/field.h"
+#include "fields/addition.h"
 
 
 // ----------------
@@ -49,6 +50,9 @@ PYBIND11_MODULE(aika, m)
       // Bind Subtraction (inherits from AbstractFunctionDefinition)
       py::class_<Subtraction, AbstractFunctionDefinition>(m, "Subtraction");
 
+      // Bind Addition (inherits from AbstractFunctionDefinition)
+      py::class_<Addition, AbstractFunctionDefinition>(m, "Addition");
+
       py::class_<InputField, FieldDefinition>(m, "InputField")
             .def(py::init<Type*, const std::string &>())
             .def("__str__", [](const InputField &f) {
@@ -71,6 +75,12 @@ PYBIND11_MODULE(aika, m)
                         const_cast<Type*>(&ref),
                         name
                   );
+            }, py::return_value_policy::reference_internal)
+            .def("add", [](const Type &ref, const std::string &name) {
+                  return new Addition(
+                        const_cast<Type*>(&ref),
+                        name
+                  );
             }, py::return_value_policy::reference_internal);
 
       py::class_<Obj>(m, "Obj")