Compile fixes

Author: LukasMolzberger

include/fields/relation.h

@@ -18,7 +18,7 @@ class Relation {
 
     int getRelationId() const;
     void setReversed(Relation* reversed);
-    Relation* getReverse();
+    virtual Relation* getReverse();
     virtual RelatedObjectIterable* followMany(Obj* fromObj) = 0;
     virtual bool testRelation(Obj* fromObj, Obj* toObj) const = 0;
     virtual std::string getRelationLabel() const = 0;
@@ -41,10 +41,20 @@ class RelationOne : public Relation {
 public:
     RelationOne(int relationId, const std::string& relationName);
 
-    Obj* followOne(Obj* fromObj) const;
+    virtual Obj* followOne(Obj* fromObj) const;
     RelatedObjectIterable* followMany(Obj* fromObj) override;
     bool testRelation(Obj* fromObj, Obj* toObj) const override;
     std::string getRelationLabel() const override;
 };
 
-#endif // RELATION_H
+class RelationSelf : public RelationOne {
+public:
+    RelationSelf(int relationId, const std::string& relationName);
+
+    Obj* followOne(Obj* fromObj) const override;
+    RelatedObjectIterable* followMany(Obj* fromObj) override;
+    bool testRelation(Obj* fromObj, Obj* toObj) const override;
+    std::string getRelationLabel() const override;
+};
+
+#endif // RELATION_H

include/network/neuron_definition.h

@@ -1,14 +1,12 @@
 #ifndef NETWORK_NEURON_DEFINITION_H
 #define NETWORK_NEURON_DEFINITION_H
 
+#include "fields/relation.h"
+#include "fields/type.h"
+#include "fields/type_registry.h"
 #include "network/activation.h"
 #include "network/model.h"
 #include "network/neuron.h"
-#include "network/relation.h"
-#include "network/relation_many.h"
-#include "network/relation_self.h"
-#include "network/type.h"
-#include "network/type_registry.h"
 
 #include <string>
 #include <vector>

include/network/node_definition.h

@@ -1,9 +1,9 @@
 #ifndef NETWORK_NODE_DEFINITION_H
 #define NETWORK_NODE_DEFINITION_H
 
+#include "fields/type_registry.h"
 #include "network/activation_definition.h"
 #include "network/neuron_definition.h"
-#include "network/type_registry.h"
 
 class NodeDefinition {
 public:

src/fields/python_bindings.cpp

@@ -39,6 +39,9 @@ PYBIND11_MODULE(aika, m)
       py::class_<RelationMany, Relation>(m, "RelationMany")
             .def(py::init<int, const std::string&>());      
 
+      py::class_<RelationSelf, RelationOne>(m, "RelationSelf")
+            .def(py::init<int, const std::string&>());
+
       py::class_<FieldUpdate>(m, "FieldUpdate")
             .def(py::init<ProcessingPhase&, QueueInterceptor*>());
 

src/fields/relation.cpp

@@ -1,5 +1,5 @@
-
 #include "fields/relation.h"
+#include <stdexcept>
 
 
 Relation::Relation(int relationId, const std::string& relationName)
@@ -51,3 +51,23 @@ bool RelationOne::testRelation(Obj* fromObj, Obj* toObj) const {
 std::string RelationOne::getRelationLabel() const {
     return relationName + " (One)"; // Append " (One)" to the relation name
 }
+
+// RelationSelf implementation
+RelationSelf::RelationSelf(int relationId, const std::string& relationName)
+    : RelationOne(relationId, relationName) {}
+
+Obj* RelationSelf::followOne(Obj* fromObj) const {
+    return fromObj; // Return the same object
+}
+
+RelatedObjectIterable* RelationSelf::followMany(Obj* fromObj) {
+    return new SingleObjectIterable(fromObj); // Return a singleton iterable with the same object
+}
+
+bool RelationSelf::testRelation(Obj* fromObj, Obj* toObj) const {
+    return fromObj == toObj; // Test if both objects are the same
+}
+
+std::string RelationSelf::getRelationLabel() const {
+    return relationName + " (Self)"; // Append " (Self)" to the relation name
+}