TestType, TestObj

Author: LukasMolzberger

include/fields/obj.h

@@ -27,7 +27,6 @@ class Obj : public QueueProvider {
     double getFieldValue(FieldDefinition* fd);
     double getFieldUpdatedValue(FieldDefinition* fd);
     Field** getFields();
-    Queue* getQueue();
 
     std::string toKeyString();
     std::string toString() const;

include/fields/test_object.h

@@ -26,6 +26,8 @@ class TestObject : public Obj {
 
     // Follow a many-relation
     RelatedObjectIterable* followManyRelation(Relation* rel) const override;
+
+    Queue* getQueue() const override;
 };
 
 #endif // TEST_OBJECT_H

include/fields/test_type.h

@@ -4,9 +4,10 @@
 #include "fields/type.h"
 #include "fields/relation.h"
 #include "fields/type_registry.h"
-#include "fields/test_object.h"
 #include <vector>
 
+class TestObject;
+
 class TestType : public Type {
 public:
     // Static constants

src/fields/obj.cpp

@@ -60,10 +60,6 @@ Field** Obj::getFields() {
     return fields;
 }
 
-Queue* Obj::getQueue() {
-    return nullptr; // Implementation for queue handling, for now returning nullptr
-}
-
 std::string Obj::toKeyString() {
     return ""; // Implementation as needed
 }

src/fields/test_object.cpp

@@ -4,7 +4,7 @@
 TestObject::TestObject(TestType* type) : Obj(type) {}
 
 // Follow a single relation
-Obj* followSingleRelation(const Relation* rel) {
+Obj* TestObject::followSingleRelation(const Relation* rel) {
     if (rel == &TestType::TEST_RELATION_FROM || rel == &TestType::TEST_RELATION_TO) {
         return getRelatedTestObject();
     } else {
@@ -24,6 +24,10 @@ void TestObject::linkObjects(TestObject* objA, TestObject* objB) {
 }
 
 // Follow a many-relation (returns a vector instead of Stream)
-RelatedObjectIterable* followManyRelation(Relation* rel) {
-    return new SingleObjectIterator(relatedTestObject);
+RelatedObjectIterable* TestObject::followManyRelation(Relation* rel) const {
+    return new SingleObjectIterable(relatedTestObject);
+}
+
+Queue* TestObject::getQueue() const {
+    return nullptr;
 }

src/fields/test_type.cpp

@@ -1,4 +1,5 @@
 #include "fields/test_type.h"
+#include "fields/test_object.h"
 
 // Initialize static members
 RelationOne TestType::SELF(0, "TEST_SELF");

tests/subtraction-test.py

@@ -8,8 +8,8 @@ def test_something(self):
     def testSubtraction(self):
         registry = aika.TypeRegistry()
 
-        typeA = aika.Type(registry, "A")
-        typeB = aika.Type(registry, "B")
+        typeA = aika.TestType(registry, "A")
+        typeB = aika.TestType(registry, "B")
 
         a = typeA.inputField("a")
         b = typeB.inputField("b")