Work on direction

Author: LukasMolzberger

include/network/activation.h

@@ -68,17 +68,17 @@ class Activation : public Obj, public Element, public ModelProvider {
     int compareTo(Activation* act) const;
     bool equals(Activation* o) const;
     int hashCode() const;
-    std::string toString() const override;
-    std::string toKeyString() const override;
+    std::string toString() const;
+    std::string toKeyString() const;
 
 protected:
     int id;
     Neuron* neuron;
     Document* doc;
     std::map<BSType, BindingSignal*> bindingSignals;
     Activation* parent;
-    Timestamp created;
-    Timestamp fired;
+    long created;
+    long fired;
     Fired* firedStep;
     std::map<int, Link*> outputLinks;
 };

include/network/direction.h

@@ -1,25 +1,7 @@
 #ifndef NETWORK_DIRECTION_H
 #define NETWORK_DIRECTION_H
 
-#include "network/model.h"
-#include "network/activation.h"
-#include "network/link.h"
-#include "network/neuron.h"
-#include "network/synapse.h"
-#include "network/bs_type.h"
-#include "network/transition.h"
+// Use the Direction class from the fields folder
+#include "fields/direction.h"
 
-class Direction {
-public:
-    virtual ~Direction() = default;
-    virtual Direction* invert() = 0;
-    virtual Neuron* getNeuron(Model* m, Synapse* s) = 0;
-    virtual Activation* getActivation(Link* l) = 0;
-    virtual int getOrder() = 0;
-    virtual BSType* transition(BSType* s, Transition* t) = 0;
-    virtual void write(DataOutput* out) = 0;
-
-    static Direction* read(DataInput* in);
-};
-
-#endif // NETWORK_DIRECTION_H 
+#endif // NETWORK_DIRECTION_H

include/network/fired.h

@@ -18,7 +18,7 @@ class Fired : public Step {
     const Phase& getPhase() const override;
     Activation* getElement();
     Queue* getQueue() const override;
-    std::string toString() const override;
+    std::string toString() const;
     bool isQueued() const;
 
 private:

include/network/model.h

@@ -7,6 +7,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <mutex>
 
 class Neuron;
 class Document;
@@ -19,9 +20,11 @@ class Model : public Queue {
     long createNeuronId();
     void registerDocument(Document* doc);
     void deregisterDocument(Document* doc);
+    long getLowestDocumentId();
     void addToN(int l);
     long getN() const;
     void setN(long n);
+    long getTimeout() const;
     bool canBeSuspended(long lastUsed) const;
     Neuron* getNeuron(long id);
     void registerNeuron(Neuron* n);
@@ -35,6 +38,10 @@ class Model : public Queue {
     void readFields(std::istream& in, Model* m);
     std::string toString() const;
 
+    TypeRegistry* getTypeRegistry();
+    std::vector<Neuron*> getActiveNeurons();
+    void registerTokenId(int tokenId, Neuron* in);
+
 private:
     TypeRegistry* typeRegistry;
     SuspensionCallback* suspensionCallback;
@@ -44,6 +51,8 @@ class Model : public Queue {
     std::map<long, Neuron*> activeNeurons;
     std::map<long, Document*> documents;
     long lastProcessedDocument;
+    std::mutex documentMutex;
+    std::mutex neuronMutex;
 };
 
 #endif // NETWORK_MODEL_H

src/network/model.cpp

@@ -100,7 +100,7 @@ bool Model::canBeSuspended(long lastUsed) const {
     if (tId == 0) {
         tId = lastProcessedDocument;
     }
-    return lastUsed < tId - config.getNeuronProviderRetention();
+    return lastUsed < tId - config->getNeuronProviderRetention();
 }
 
 Neuron *Model::getNeuron(long id) {