1. We fixed the const qualifiers for methods in:

    - Element, Activation, Neuron, Link, Document classes for getQueue method
    - Activation, Neuron, Link classes for getCreated and getFired methods
    - Updated all classes to properly override methods from their base classes
  2. We added implementations of getConfig method to:
    - Activation, Neuron, Link classes
  3. We made several other minor adjustments to ensure proper inheritance relationships and method overriding across the codebase.

Author: LukasMolzberger

include/fields/queue.h

@@ -22,7 +22,7 @@ class Queue {
     void checkTimeout(long startTime);
 
 public:
-    long getTimeout();
+    virtual long getTimeout() const;
     long getTimestampOnProcess();
     long getCurrentTimestamp();
     long getNextTimestamp();

include/network/activation.h

@@ -46,16 +46,17 @@ class Activation : public Obj, public Element, public ModelProvider {
     virtual void linkIncoming(Activation* excludedInputAct) = 0;
     std::set<Activation*> collectLinkingTargets(Neuron* n);
     int getId();
-    long getCreated() override;
+    long getCreated() const override;
     void setCreated(long ts);
-    long getFired() override;
+    long getFired() const override;
     void setFired();
     void setFired(long f);
     void updateFiredStep(Field* net);
-    Queue* getQueue();
+    Queue* getQueue() const override;
     Neuron* getNeuron();
     Document* getDocument();
-    Model* getModel();
+    Model* getModel() override;
+    Config* getConfig() override;
     Link* getCorrespondingInputLink(Link* l);
     Link* getCorrespondingOutputLink(Link* l);
     std::vector<Link*> getInputLinks(LinkDefinition* linkDefinition);

include/network/conjunctive_synapse.h

@@ -10,10 +10,10 @@ class ConjunctiveSynapse : public Synapse {
 
     RelatedObjectIterable* followManyRelation(Relation* rel) const override;
     Obj* followSingleRelation(const Relation* rel) override;
-
+/*
     void write(DataOutput* out) override;
     void readFields(DataInput* in, TypeRegistry* tr) override;
-
+*/
 private:
     bool propagable;
 };

include/network/document.h

@@ -28,7 +28,7 @@ class Document : public Queue, public ModelProvider, public QueueProvider {
     Activation* getActivationByNeuron(Neuron* outputNeuron);
     int createActivationId();
     void disconnect();
-    Queue* getQueue() override;
+    Queue* getQueue() const override;
     Activation* addToken(Neuron* n, BSType* bsType, int tokenId);
     BindingSignal* getOrCreateBindingSignal(int tokenId);
     BindingSignal* getBindingSignal(int tokenId);

include/network/element.h

@@ -8,6 +8,8 @@ class Element : public QueueProvider {
     virtual ~Element() = default;
     virtual long getCreated() = 0;
     virtual long getFired() = 0;
+    // inherited from QueueProvider
+    virtual Queue* getQueue() const = 0;
 };
 
 #endif // NETWORK_ELEMENT_H 

include/network/link.h

@@ -22,8 +22,8 @@ class Link : public Obj, public Element, public ModelProvider {
 
     RelatedObjectIterable* followManyRelation(Relation* rel) const override;
     Obj* followSingleRelation(const Relation* rel) override;
-    long getFired() override;
-    long getCreated() override;
+    long getFired() const override;
+    long getCreated() const override;
     Synapse* getSynapse();
     void setSynapse(Synapse* synapse);
     Activation* getInput();
@@ -33,6 +33,7 @@ class Link : public Obj, public Element, public ModelProvider {
     Document* getDocument();
     Queue* getQueue() const override;
     Model* getModel() override;
+    Config* getConfig() override;
     std::string getInputKeyString();
     std::string getOutputKeyString();
     std::string toString();

include/network/model_provider.h

@@ -6,8 +6,9 @@
 
 class ModelProvider {
 public:
-    virtual Model* getModel();
-    virtual Config* getConfig();
+    virtual ~ModelProvider() = default;
+    virtual Model* getModel() = 0;
+    virtual Config* getConfig() = 0;
 
 protected:
     Model* model;

include/network/neuron.h

@@ -29,6 +29,7 @@ class Neuron : public Obj, public Element, public ModelProvider {
     Activation* createActivation(Activation* parent, Document* doc, std::map<BSType*, BindingSignal*> bindingSignals);
     void deleteNeuron();
     Model* getModel() override;
+    Config* getConfig() override;
     void setModified();
     void resetModified();
     bool isModified() const;
@@ -48,9 +49,9 @@ class Neuron : public Obj, public Element, public ModelProvider {
     Synapse* getOutputSynapseByType(Type* synapseType) const;
     std::vector<Synapse*> getOutputSynapsesByType(Type* synapseType) const;
     Synapse* selectInputSynapse(std::function<bool(Synapse*)> predicate) const;
-    long getCreated() override;
-    long getFired() override;
-    Queue* getQueue() override;
+    long getCreated() const override;
+    long getFired() const override;
+    Queue* getQueue() const override;
     void increaseRefCount(RefType rt);
     void decreaseRefCount(RefType rt);
     int getRefCount() const;

src/network/activation.cpp

@@ -147,15 +147,15 @@ int Activation::getId() {
     return id;
 }
 
-long Activation::getCreated() {
+long Activation::getCreated() const {
     return created;
 }
 
 void Activation::setCreated(long ts) {
     created = ts;
 }
 
-long Activation::getFired() {
+long Activation::getFired() const {
     return fired;
 }
 
@@ -180,7 +180,7 @@ void Activation::updateFiredStep(Field* net) {
     doc->addStep(firedStep);
 }
 
-Queue* Activation::getQueue() {
+Queue* Activation::getQueue() const {
     return doc;
 }
 
@@ -196,6 +196,10 @@ Model* Activation::getModel() {
     return neuron->getModel();
 }
 
+Config* Activation::getConfig() {
+    return neuron->getModel()->getConfig();
+}
+
 Link* Activation::getCorrespondingInputLink(Link* l) {
     return nullptr;
 }

src/network/link.cpp

@@ -31,11 +31,11 @@ Obj* Link::followSingleRelation(const Relation* rel) {
     throw std::runtime_error("Invalid Relation: " + rel->getRelationName());
 }
 
-Timestamp Link::getFired() {
+long Link::getFired() const {
     return input && isCausal() ? input->getFired() : output->getFired();
 }
 
-Timestamp Link::getCreated() {
+long Link::getCreated() const {
     return input && isCausal() ? input->getCreated() : output->getCreated();
 }
 
@@ -67,14 +67,18 @@ Document* Link::getDocument() {
     return output->getDocument();
 }
 
-Queue* Link::getQueue() {
+Queue* Link::getQueue() const {
     return output->getDocument();
 }
 
 Model* Link::getModel() {
     return output->getModel();
 }
 
+Config* Link::getConfig() {
+    return output->getModel()->getConfig();
+}
+
 std::string Link::getInputKeyString() {
     return input ? input->toKeyString() : "id:X n:[" + synapse->getInput() + "]";
 }