close #34: added preemption

src/Makevars

@@ -1 +1 @@
-PKG_CXXFLAGS = -DBOOST_NO_LONG_LONG
+PKG_CXXFLAGS = -DBOOST_NO_LONG_LONG -Wno-long-long

src/entity.cpp

@@ -32,23 +32,20 @@ inline void Arrival::run() {
 inline void Arrival::activate() {
   Process::activate();
   busy_until = sim->now() + remaining;
-  Rcpp::Rcout << "activate: " << this->name << " " << sim->now() << " " << remaining << std::endl;
   sim->schedule(remaining, this, activity ? activity->priority : 0);
   remaining = 0;
 }
 
 inline void Arrival::deactivate() {
   Process::deactivate();
   remaining = busy_until - sim->now();
-  Rcpp::Rcout << "deactivate: " << this->name << " " << sim->now() << " " << remaining << std::endl;
 }
 
 inline void Arrival::leave(std::string name, double time) {
   gen->notify_release(time, this, name);
 }
 
 void Arrival::reject(double time) {
-  Rcpp::Rcout << "reject: " << this->name << " " << sim->now() << std::endl;
   gen->notify_end(time, this, false);
 }
 
@@ -120,8 +117,10 @@ int Resource::release(Arrival* arrival, int amount) {
   if (queue_ptr) {
     RPQueue::iterator next = queue_ptr->begin();
     if (room_in_server(next->amount, next->priority)) {
-      if (next->arrival->is_monitored())
-        next->arrival->set_activity(this->name, sim->now());
+      if (next->arrival->is_monitored()) {
+        double last = next->arrival->get_activity(this->name);
+        next->arrival->set_activity(this->name, sim->now() - last);
+      }
       next->arrival->activate();
       insert_in_server(next->arrived_at, next->arrival, next->amount,
                        next->priority, next->preemptible, next->restart);

src/entity.h

@@ -340,18 +340,11 @@ class Resource: public Entity {
     }
     queue_count += amount;
     queue.emplace(time, arrival, amount, priority, preemptible, restart);
-    /////////
-    Rcpp::Rcout << "insert_in_queue: " << arrival->name << std::endl;
-    Rcpp::Rcout << "queue: " << queue.size() << " | ";
-    foreach_ (RPQueue::value_type& itr, queue) {
-      Rcpp::Rcout << itr.arrival->name << " ";
-    }
-    Rcpp::Rcout << std::endl;
   }
 
   virtual inline RPQueue* get_queue_ptr() {
-    if (queue_count) return &queue;
-    return NULL;
+    if (!queue_count) return NULL;
+    return &queue;
   }
 };
 
@@ -398,6 +391,10 @@ class PreemptiveResource: public Resource {
     if (capacity > 0) while (server_count + amount > capacity) {
       typename T::iterator first = server.begin();
       first->arrival->deactivate();
+      if (first->arrival->is_monitored()) {
+        double last = first->arrival->get_activity(this->name);
+        first->arrival->set_activity(this->name, time - last);
+      }
       preempted.insert((*first));
       queue_count += first->amount;
       server_count -= first->amount;
@@ -415,9 +412,12 @@ class PreemptiveResource: public Resource {
   }
 
   virtual inline RPQueue* get_queue_ptr() {
-    if (!preempted.empty()) return &preempted;
-    if (queue_count) return &queue;
-    return NULL;
+    if (!queue_count) return NULL;
+    if (queue.empty()) return &preempted;
+    if (preempted.empty()) return &queue;
+    if (preempted.begin()->priority > queue.begin()->priority)
+      return &preempted;
+    return &queue;
   }
 };
 

working_dir/__working_file.R

@@ -58,7 +58,7 @@ env <- simmer(verbose=F) %>%
   add_generator("customer", mm1, function() rexp(1, 60), mon=F) %>%
   run(10000)
 })
-# 24 seconds! (Simpy: 30 seconds)
+# 26 seconds (Simpy: 30 seconds)
 
 plot_resource_usage(env, "server")