Implemented FieldActivationFunction

Author: LukasMolzberger

CMakeLists.txt

@@ -22,6 +22,7 @@ set(SOURCES
         src/fields/division.cpp
         src/fields/exponential_function.cpp
         src/fields/summation.cpp
+        src/fields/field_activation_function.cpp
         src/fields/field_link_definition.cpp
         src/fields/obj.cpp
         src/fields/type.cpp

include/fields/activation_function.h

@@ -0,0 +1,12 @@
+#ifndef ACTIVATION_FUNCTION_H
+#define ACTIVATION_FUNCTION_H
+
+class ActivationFunction {
+public:
+    virtual ~ActivationFunction() = default;
+
+    virtual double f(double x) = 0;
+    virtual double outerGrad(double x) = 0;
+};
+
+#endif // ACTIVATION_FUNCTION_H 

include/fields/field_activation_function.h

@@ -0,0 +1,21 @@
+#ifndef FIELD_ACTIVATION_FUNCTION_H
+#define FIELD_ACTIVATION_FUNCTION_H
+
+#include "fields/abstract_function_definition.h"
+#include "fields/type.h"
+#include "fields/obj.h"
+#include "fields/field_link_definition.h"
+#include "fields/activation_function.h"
+
+class FieldActivationFunction : public AbstractFunctionDefinition {
+public:
+    FieldActivationFunction(Type* ref, const std::string& name, ActivationFunction* actFunction, double tolerance);
+
+    double computeUpdate(Obj* obj, FieldLinkDefinition* fl, double u) override;
+
+private:
+    ActivationFunction* actFunction;
+    double tolerance;
+};
+
+#endif // FIELD_ACTIVATION_FUNCTION_H 

install_manifest.txt

@@ -16,11 +16,13 @@
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/field_link_definition.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/obj.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/direction.h
+/Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/field_activation_function.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/multiplication.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/subtraction.h
 /Users/lukasmolzberger/CLionProjects/aika-cpp/.venv/lib/python3.12/site-packages/aika/include/fields/queue_provider.h
 /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/activation_function.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

python-tests/field_activation_function_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 FieldActivationFunctionTestCase(unittest.TestCase):
+
+    def testFieldActivationFunction(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/field_activation_function.cpp

@@ -0,0 +1,10 @@
+#include "fields/field_activation_function.h"
+
+FieldActivationFunction::FieldActivationFunction(Type* ref, const std::string& name, ActivationFunction* actFunction, double tolerance)
+    : AbstractFunctionDefinition(ref, name, 1, tolerance), actFunction(actFunction) {}
+
+
+double FieldActivationFunction::computeUpdate(Obj* obj, FieldLinkDefinition* fl, double u) {
+    double value = obj->getOrCreateFieldInput(this)->getValue();
+    return actFunction->f(fl->getUpdatedInputValue(obj)) - value;
+} 

src/fields/python_bindings.cpp

@@ -16,6 +16,7 @@
 #include "fields/division.h"
 #include "fields/exponential_function.h"
 #include "fields/summation.h"
+#include "fields/field_activation_function.h"
 
 
 // ----------------
@@ -68,6 +69,10 @@ PYBIND11_MODULE(aika, m)
       // Bind Summation (inherits from AbstractFunctionDefinition)
       py::class_<Summation, AbstractFunctionDefinition>(m, "Summation");
 
+            // Bind FieldActivationFunction (inherits from AbstractFunctionDefinition)
+      py::class_<FieldActivationFunction, AbstractFunctionDefinition>(m, "FieldActivationFunction")
+            .def(py::init<Type*, const std::string&, ActivationFunction*, double>());
+
       py::class_<InputField, FieldDefinition>(m, "InputField")
             .def(py::init<Type*, const std::string &>())
             .def("__str__", [](const InputField &f) {
@@ -120,6 +125,14 @@ PYBIND11_MODULE(aika, m)
                         const_cast<Type*>(&ref),
                         name
                   );
+            }, py::return_value_policy::reference_internal)
+            .def("fieldActivationFunc", [](const Type &ref, const std::string &name, ActivationFunction* actFunction, double tolerance) {
+                  return new FieldActivationFunction(
+                        const_cast<Type*>(&ref),
+                        name,
+                        actFunction,
+                        tolerance
+                  );
             }, py::return_value_policy::reference_internal);
 
       py::class_<Obj>(m, "Obj")