Compile fixes

Author: LukasMolzberger

include/network/activation.h

@@ -4,6 +4,7 @@
 
 #include "fields/queue_provider.h"
 
+#include "network/activation_definition.h"
 #include "network/element.h"
 #include "network/model_provider.h"
 #include "network/neuron.h"

include/network/fired.h

@@ -1,7 +1,7 @@
 #ifndef NETWORK_FIRED_H
 #define NETWORK_FIRED_H
 
-#include "network/step.h"
+#include "fields/step.h"
 #include "network/activation.h"
 #include "network/phase.h"
 #include "network/queue.h"

include/network/link.h

@@ -31,12 +31,12 @@ class Link : public Obj, public Element, public ModelProvider, public QueueProvi
     bool isCausal();
     static bool isCausal(Activation* iAct, Activation* oAct);
     Document* getDocument();
-    Queue* getQueue() override;
+    Queue* getQueue() const override;
     Model* getModel() override;
     std::string getInputKeyString();
     std::string getOutputKeyString();
-    std::string toString() override;
-    std::string toKeyString() override;
+    std::string toString();
+    std::string toKeyString();
 
 private:
     Synapse* synapse;

include/network/link_definition.h

@@ -1,14 +1,15 @@
 #ifndef NETWORK_LINK_DEFINITION_H
 #define NETWORK_LINK_DEFINITION_H
 
+#include "fields/type.h"
+#include "fields/type_registry.h"
+
 #include "network/activation.h"
 #include "network/link.h"
 #include "network/relation.h"
 #include "network/relation_one.h"
 #include "network/relation_self.h"
 #include "network/synapse.h"
-#include "network/type.h"
-#include "network/type_registry.h"
 
 #include <string>
 #include <vector>

include/network/typedefs.h

@@ -4,8 +4,5 @@
 #include <functional>
 #include <string>
 
-// Define any necessary type aliases or typedefs here
-using Relation = std::string;
-using FieldOutput = double;
 
 #endif // NETWORK_TYPEDEFS_H 

src/network/document.cpp

@@ -1,4 +1,5 @@
 #include "network/document.h"
+#include "network/activation.h"
 #include "network/model.h"
 
 Document::Document(Model* m, int length) : model(m), length(length), activationIdCounter(0), isStale(false) {