A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Need to have my own link list.
[simgrid.git]
/
src
/
surf
/
maxmin.c
diff --git
a/src/surf/maxmin.c
b/src/surf/maxmin.c
index
78e34a1
..
dc331ad
100644
(file)
--- a/
src/surf/maxmin.c
+++ b/
src/surf/maxmin.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2011
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-115,7
+115,7
@@
static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
lmm_constraint_t cnst)
{
static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
lmm_constraint_t cnst)
{
-/* xbt_assert
0
(xbt_swag_size(&(cnst->element_set)), */
+/* xbt_assert(xbt_swag_size(&(cnst->element_set)), */
/* "This list should be empty!"); */
remove_active_constraint(sys, cnst);
free(cnst);
/* "This list should be empty!"); */
remove_active_constraint(sys, cnst);
free(cnst);
@@
-249,7
+249,7
@@
void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
sys->modified = 1;
sys->modified = 1;
- xbt_assert
0
(var->cnsts_number < var->cnsts_size, "Too much constraints");
+ xbt_assert(var->cnsts_number < var->cnsts_size, "Too much constraints");
elem = &(var->cnsts[var->cnsts_number++]);
elem = &(var->cnsts[var->cnsts_number++]);
@@
-423,8
+423,7
@@
void lmm_print(lmm_system_t sys)
trace_buf =
xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
strcat(trace_buf, print_buf);
trace_buf =
xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
strcat(trace_buf, print_buf);
- fprintf(stderr, "%s", trace_buf);
- //XBT_DEBUG("%20s", trace_buf); FIXME
+ XBT_DEBUG("%20s", trace_buf);
trace_buf[0] = '\000';
XBT_DEBUG("Constraints");
trace_buf[0] = '\000';
XBT_DEBUG("Constraints");
@@
-466,10
+465,9
@@
void lmm_print(lmm_system_t sys)
strlen(trace_buf) + strlen(print_buf) + 1);
strcat(trace_buf, print_buf);
}
strlen(trace_buf) + strlen(print_buf) + 1);
strcat(trace_buf, print_buf);
}
- // XBT_DEBUG("%s", trace_buf);
- fprintf(stderr, "%s\n", trace_buf);
+ XBT_DEBUG("%s", trace_buf);
trace_buf[0] = '\000';
trace_buf[0] = '\000';
- xbt_assert
3
(!double_positive(sum - cnst->bound),
+ xbt_assert(!double_positive(sum - cnst->bound),
"Incorrect value (%f is not smaller than %f): %g",
sum, cnst->bound, sum - cnst->bound);
}
"Incorrect value (%f is not smaller than %f): %g",
sum, cnst->bound, sum - cnst->bound);
}
@@
-480,7
+478,7
@@
void lmm_print(lmm_system_t sys)
if (var->bound > 0) {
XBT_DEBUG("'%d'(%f) : %f (<=%f)", var->id_int, var->weight, var->value,
var->bound);
if (var->bound > 0) {
XBT_DEBUG("'%d'(%f) : %f (<=%f)", var->id_int, var->weight, var->value,
var->bound);
- xbt_assert
2
(!double_positive(var->value - var->bound),
+ xbt_assert(!double_positive(var->value - var->bound),
"Incorrect value (%f is not smaller than %f",
var->value, var->bound);
} else {
"Incorrect value (%f is not smaller than %f",
var->value, var->bound);
} else {