Partially revert "modif simple"

[loba.git] / process.h

diff --git a/process.h b/process.h
index 8f96fd8e188eac0719b938b21af2085c77be9daa..1374bf4b9458e4f85601363651c44cb057fd4e9b 100644 (file)
--- a/process.h
+++ b/process.h
@@ -39,6 +39,11 @@ protected:
     pneigh_type pneigh;         // list of pointers to neighbors that
                                 // we are free to reorder
 
+    // Get and set current load, which may be real load, or expected
+    // load if opt::bookkeeping is true.
+    double get_load() const;
+    void set_load(double load);
+
     // Calls neighbor::print(verbose, logp, cat) for each member of neigh.
     void print_loads(bool verbose = false,
                      e_xbt_log_priority_t logp = xbt_log_priority_info,
@@ -77,8 +82,6 @@ private:
     double real_load;           // current load
     double expected_load;       // expected load in bookkeeping mode
 
-    double& lb_load() { return opt::bookkeeping ? expected_load : real_load; }
-
     // The load balancing algorithm comes here...
     // Parameter "my_load" is the load to take into account for myself
     // (may be real load or expected load).
@@ -107,6 +110,24 @@ private:
     void finalize();
 };
 
+inline
+double process::get_load() const
+{
+    if (opt::bookkeeping)
+        return expected_load;
+    else
+        return real_load;
+}
+
+inline
+void process::set_load(double load)
+{
+    if (opt::bookkeeping)
+        expected_load = load;
+    else
+        real_load = load;
+}
+
 #endif // !PROCESS_H
 
 // Local variables: