New neighbor attribute: credit.

diff --git a/neighbor.cpp b/neighbor.cpp
index be8066472641c134d24d21a25e9fecc3f774c98f..e0925dac6d616809b9f1d0af9e79fa775a837d03 100644 (file)
--- a/neighbor.cpp
+++ b/neighbor.cpp
@@ -12,6 +12,7 @@ neighbor::neighbor(const char* hostname)
            (MSG_host_get_data(MSG_get_host_by_name(hostname))))
     , load(std::numeric_limits<double>::infinity())
     , debt(0.0)
            (MSG_host_get_data(MSG_get_host_by_name(hostname))))
     , load(std::numeric_limits<double>::infinity())
     , debt(0.0)

+    , credit(0.0)

     , to_send(0.0)
 {
 }
     , to_send(0.0)
 {
 }


@@ -24,8 +25,10 @@ void neighbor::print(bool verbose,
                      e_xbt_log_priority_t logp, xbt_log_category_t cat) const
 {
     if (verbose)
                      e_xbt_log_priority_t logp, xbt_log_category_t cat) const
 {
     if (verbose)

-        XBT_XCLOG(cat, logp, "%s: load = %g ; debt = %g ; to_send = %g",
-                  get_name(), get_load(), get_debt(), get_to_send());
+        XBT_XCLOG(cat, logp,
+                  "%s: load = %g ; debt = %g ; credit = %g ; to_send = %g",
+                  get_name(), get_load(), get_debt(), get_credit(),
+                  get_to_send());

     else
         XBT_XCLOG(cat, logp, "%s: load = %g", get_name(), get_load());
 }
     else
         XBT_XCLOG(cat, logp, "%s: load = %g", get_name(), get_load());
 }

diff --git a/neighbor.h b/neighbor.h
index 0605206628614d950dd02f4bb1361b11d38ca826..fdf096c9cf49b5badbcfe74cc6aa9e3ce84140f9 100644 (file)
--- a/neighbor.h
+++ b/neighbor.h
@@ -23,6 +23,10 @@ public:
     double get_debt() const             { return debt;   }
     void set_debt(double amount)        { debt = amount; }
 
     double get_debt() const             { return debt;   }
     void set_debt(double amount)        { debt = amount; }
 

+    // Getter and setter for credit
+    double get_credit() const           { return credit;   }
+    void set_credit(double amount)      { credit = amount; }
+

     // Getter and setter for to_send
     double get_to_send() const          { return to_send;    }
     void set_to_send(double amount)     { to_send = amount;  }
     // Getter and setter for to_send
     double get_to_send() const          { return to_send;    }
     void set_to_send(double amount)     { to_send = amount;  }


@@ -40,6 +44,8 @@ private:
     double debt;                // the load we had to send to it, but
                                 // that we have not currently sent
                                 // (bookkeeping mode)
     double debt;                // the load we had to send to it, but
                                 // that we have not currently sent
                                 // (bookkeeping mode)

+    double credit;              // the load we have to receive from it
+                                // (bookkeeping mode)

 
     double to_send;             // the load we have to send to it
 };
 
     double to_send;             // the load we have to send to it
 };