API format unification

[simgrid.git] / src / surf / network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 038b535..9100fea 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -129,12 +129,11 @@ namespace simgrid {
       return rate;
     }
 
-    double NetworkModel::next_occuring_event_full(double now)
+    double NetworkModel::nextOccuringEventFull(double now)
     {
-      ActionList *runningActions = surf_network_model->getRunningActionSet();
-      double minRes = shareResourcesMaxMin(runningActions, maxminSystem_, f_networkSolve);
+      double minRes = Model::nextOccuringEventFull(now);
 
-      for(auto it(runningActions->begin()), itend(runningActions->end()); it != itend ; ++it) {
+      for(auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; it++) {
         NetworkAction *action = static_cast<NetworkAction*>(&*it);
         if (action->latency_ > 0)
           minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_);