Merge pull request #3 from MikeHeiber/development

Development
MikeHeiber · May 12, 2017 · 25dbddd · 25dbddd
2 parents 5873711 + 323dd6b
commit 25dbddd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/Event.cpp b/Event.cpp
@@ -20,6 +20,10 @@ Event::Event(){
     coords_dest.z = 0;
 }
 
+void Event::calculateExecutionTime(const double rate,const double current_time){
+    execution_time = current_time-(1/rate)*log(rand01());
+}
+
 Coords Event::getDestCoords() const{
     return coords_dest;
 }

diff --git a/Event.h b/Event.h
@@ -22,7 +22,7 @@ class Event{
         static mt19937 gen;
         virtual ~Event();
         Event();
-        virtual void calculateEvent(const Coords& dest_coords, const double rate,const double current_time) = 0;
+        void calculateExecutionTime(const double rate,const double current_time);
         Coords getDestCoords() const;
         virtual string getName() const;
         list<Object*>::iterator getObjectIt() const;

diff --git a/Object.cpp b/Object.cpp
@@ -47,6 +47,18 @@ double Object::getCreationTime() const{
     return time_created;
 }
 
+int Object::getDX() const{
+    return dx;
+}
+
+int Object::getDY() const{
+    return dy;
+}
+
+int Object::getDZ() const{
+    return dz;
+}
+
 list<Event*>::iterator Object::getEventIt() const{
     return event_it;
 }

diff --git a/Object.h b/Object.h
@@ -23,6 +23,9 @@ class Object{
         double calculateDisplacement();
         Coords getCoords() const;
         double getCreationTime() const;
+        int getDX() const;
+        int getDY() const;
+        int getDZ() const;
         list<Event*>::iterator getEventIt() const;
         virtual string getName() const;
         int getTag() const;