Compile fixes

Author: LukasMolzberger

include/network/activation_key.h

@@ -12,4 +12,13 @@ class ActivationKey {
     int actId;
 };
 
+struct ActivationKeyComparator {
+    bool operator()(ActivationKey* a, ActivationKey* b) const {
+        if(a->getNeuronId() != b->getNeuronId())
+            return a->getNeuronId() < b->getNeuronId();
+        else
+            return a->getActId() < b->getActId();
+    }
+};
+
 #endif // NETWORK_ACTIVATION_KEY_H 

include/network/link.h

@@ -20,7 +20,7 @@ class Link : public Obj, public Element, public ModelProvider {
 public:
     Link(LinkDefinition* type, Synapse* s, Activation* input, Activation* output);
 
-    Stream<Obj*> followManyRelation(Relation* rel) override;
+    RelatedObjectIterable* followManyRelation(Relation* rel) override;
     Obj* followSingleRelation(Relation* rel) override;
     Timestamp getFired() override;
     Timestamp getCreated() override;

include/network/link_definition.h

@@ -12,6 +12,7 @@
 #include <vector>
 
 class Link;
+class Synapse;
 class SynapseDefinition;
 
 

include/network/neuron.h

@@ -19,7 +19,7 @@ class Neuron : public Obj, public Element, public ModelProvider {
     Neuron(NeuronDefinition* type, Model* model, long id);
     Neuron(NeuronDefinition* type, Model* model);
 
-    Stream<Obj*> followManyRelation(Relation* rel) override;
+    RelatedObjectIterable* followManyRelation(Relation* rel) override;
     Obj* followSingleRelation(Relation* rel) override;
     long getId() const;
     void updatePropagable(Neuron* n, bool isPropagable);

include/network/synapse.h

@@ -23,7 +23,7 @@ class Synapse : public Obj, public Element {
 
     virtual ~Synapse() = default;
 
-    virtual std::vector<Obj*> followManyRelation(Relation* rel) = 0;
+    virtual RelatedObjectIterable* followManyRelation(Relation* rel) = 0;
     virtual Obj* followSingleRelation(Relation* rel) = 0;
 
     int getSynapseId() const;