Merge pull request #65 from fabienchaix/master

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

diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp
index 51afec6..385424c 100644 (file)
--- a/src/surf/maxmin.cpp
+++ b/src/surf/maxmin.cpp
@@ -751,11 +751,11 @@ void lmm_print(lmm_system_t sys)
     }
     XBT_DEBUG("%s", trace_buf);
     trace_buf[0] = '\000';
-    //   xbt_assert(!double_positive(sum - cnst->bound, cnst->bound*sg_maxmin_precision),
-    //           "Incorrect value (%f is not smaller than %f): %g",
-    //             sum, cnst->bound, sum - cnst->bound);
-    if(!double_positive(sum - cnst->bound, cnst->bound*sg_maxmin_precision))
-      XBT_ERROR("Incorrect value (%f is not smaller than %f): %g",sum, cnst->bound, sum - cnst->bound);
+       xbt_assert(!double_positive(sum - cnst->bound, cnst->bound*sg_maxmin_precision),
+               "Incorrect value (%f is not smaller than %f): %g",
+                 sum, cnst->bound, sum - cnst->bound);
+       //if(double_positive(sum - cnst->bound, cnst->bound*sg_maxmin_precision))
+       //XBT_ERROR("Incorrect value (%f is not smaller than %f): %g",sum, cnst->bound, sum - cnst->bound);
       
   }
 
@@ -844,7 +844,7 @@ void lmm_solve(lmm_system_t sys)
           sys->keep_track->push_back(*action);
       }
     }
-    XBT_DEBUG("Constraint '%d' usage: %f remaining: %f ", cnst->id_int, cnst->usage, cnst->remaining);
+    XBT_DEBUG("Constraint '%d' usage: %f remaining: %f concurrency: %i<=%i<=%i", cnst->id_int, cnst->usage, cnst->remaining,cnst->concurrency_current,cnst->concurrency_maximum,cnst->concurrency_limit);
     /* Saturated constraints update */
 
     if(cnst->usage > 0) {