Added variable one time step definition.

GridOPTICS · Jan 18, 2014 · 53df63f · 53df63f
1 parent f4cd549
commit 53df63f
Show file tree

Hide file tree

Showing 15 changed files with 414 additions and 149 deletions.
diff --git a/absnetworkinterface.h b/absnetworkinterface.h
@@ -79,7 +79,7 @@ class AbsNetworkInterface {
 protected:
     vector<string> myObjects;
     bool registrationsAreFinalized;
-    CallBack<void,Message*,empty,empty> *messageCallBack;
+    CallBack<void,Message*,empty,empty,empty> *messageCallBack;
     bool canFork,killOnTerm;
     virtual void notifyFork() = 0;
 public:
@@ -141,7 +141,7 @@ class AbsNetworkInterface {
     /**
      * Registers a callback function to invoke when a Message is received.
      */
-    void setMessageCallBack(CallBack<void,Message*,empty,empty> *messageCallBack) {
+    void setMessageCallBack(CallBack<void,Message*,empty,empty,empty> *messageCallBack) {
         this->messageCallBack = messageCallBack;
     }
 

diff --git a/cintegrator.cpp b/cintegrator.cpp
@@ -175,7 +175,7 @@ void finalizeRegistrations()
 
 void setregistercallback(TIME (*callback)())
 {
-  CallBack<TIME,empty,empty,empty> *cb=CreateCallback(callback);
+  CallBack<TIME,empty,empty,empty,empty> *cb=CreateCallback(callback);
   Integrator::setTimeCallBack(cb);
 }
 

diff --git a/commmanager/abscommmanager.cpp b/commmanager/abscommmanager.cpp
@@ -43,7 +43,7 @@ namespace sim_comm{
     this->receiverRunning=false;
     this->allowRegistrations=true;
     this->currentInterface=current;
-    CallBack<void,Message*,empty,empty> *msgCallback=CreateObjCallback<AbsCommManager *, void (AbsCommManager::*)(Message*), void,Message*>(this, &AbsCommManager::messageReceived);
+    CallBack<void,Message*,empty,empty,empty> *msgCallback=CreateObjCallback<AbsCommManager *, void (AbsCommManager::*)(Message*), void,Message*>(this, &AbsCommManager::messageReceived);
 
     this->syncAlgoCallBackRecv=NULL;
     this->syncAlgoCallBackSend=NULL;
@@ -62,7 +62,7 @@ namespace sim_comm{
     this->syncAlgoCallBackSend=given.syncAlgoCallBackSend;
     this->receiverRunning=given.receiverRunning;
     this->currentInterface=given.currentInterface->duplicateInterface();
-    CallBack<void,Message*,empty,empty> *msgCallback=CreateObjCallback<AbsCommManager *, void (AbsCommManager::*)(Message*), void,Message*>(this, &AbsCommManager::messageReceived);
+    CallBack<void,Message*,empty,empty,empty> *msgCallback=CreateObjCallback<AbsCommManager *, void (AbsCommManager::*)(Message*), void,Message*>(this, &AbsCommManager::messageReceived);
     this->currentInterface->setMessageCallBack(msgCallback);
 #if DEBUG
     CERR << "Duplicated commmanager, send_count:" << sendCount << " receive_count: " << receiveCount << endl;

diff --git a/commmanager/abscommmanager.h b/commmanager/abscommmanager.h
@@ -114,7 +114,7 @@ namespace sim_comm{
 
 	TIME minNetworkDelay;
 	//uint8_t messageReceived();
-	CallBack<bool,Message*,empty,empty> *syncAlgoCallBackSend,*syncAlgoCallBackRecv;
+	CallBack<bool,Message*,empty,empty,empty> *syncAlgoCallBackSend,*syncAlgoCallBackRecv;
 	sim_comm::AbsNetworkInterface *currentInterface;
 	void adjustNetworkDelay(TIME msgDeliveryTime);
 	void signalNewMessage(ObjectCommInterface *comm,Message *msg);
@@ -199,8 +199,8 @@ namespace sim_comm{
     /**
      * Sets the callback for the sync algorithm.
      */
-    void setSyncAlgoCallBacks(CallBack<bool,Message*,empty,empty> *syncCallBackSend,
-			      CallBack<bool,Message*,empty,empty> *syncCallBackRecv){
+    void setSyncAlgoCallBacks(CallBack<bool,Message*,empty,empty,empty> *syncCallBackSend,
+			      CallBack<bool,Message*,empty,empty,empty> *syncCallBackRecv){
       this->syncAlgoCallBackRecv=syncCallBackRecv;
       this->syncAlgoCallBackSend=syncCallBackSend;
     }
@@ -266,7 +266,7 @@ namespace sim_comm{
      * This method returns the callback to the sync algorithm,
      * when a node needs to send message this callback is called.
      */
-    virtual CallBack<bool,Message*,empty,empty>* getSendMesgCallback(){
+    virtual CallBack<bool,Message*,empty,empty,empty>* getSendMesgCallback(){
       return this->syncAlgoCallBackSend;
     }
 

diff --git a/commmanager/communicationcommanager.cpp b/commmanager/communicationcommanager.cpp
@@ -36,7 +36,7 @@ namespace sim_comm{
 
     CommunicationComManager::CommunicationComManager(AbsNetworkInterface *interface) : AbsCommManager(interface)
     {
-      CallBack<void,Message*,empty,empty> *msgCallback=CreateObjCallback<CommunicationComManager *, void (CommunicationComManager::*)(Message*), void,Message*>(this, &CommunicationComManager::messageReceived);
+      CallBack<void,Message*,empty,empty,empty> *msgCallback=CreateObjCallback<CommunicationComManager *, void (CommunicationComManager::*)(Message*), void,Message*>(this, &CommunicationComManager::messageReceived);
 
 
       this->currentInterface->setMessageCallBack(msgCallback);