X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a21681e5aca1a37efb2e9001e5055dec94c5de41..1943ca63ab0af58abc75c70054783d962737f3e9:/src/surf/maxmin.cpp diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index 876fa33d9c..cb6085876a 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -1,10 +1,9 @@ -/* Copyright (c) 2004-2013. The SimGrid Team. +/* Copyright (c) 2004-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ - #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/mallocator.h" @@ -253,7 +252,7 @@ double lmm_variable_getvalue(lmm_variable_t var) return (var->value); } -XBT_INLINE double lmm_variable_getbound(lmm_variable_t var) +double lmm_variable_getbound(lmm_variable_t var) { return (var->bound); } @@ -307,7 +306,7 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, sys->modified = 1; - XBT_DEBUG("remove elem(value %lf, cnst %p, var %p) in var %p", + XBT_DEBUG("remove elem(value %f, cnst %p, var %p) in var %p", elem->value, elem->constraint, elem->variable, var); @@ -391,23 +390,6 @@ void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst, lmm_expand(sys, cnst, var, value); } -void lmm_elem_set_value(lmm_system_t sys, lmm_constraint_t cnst, - lmm_variable_t var, double value) -{ - int i; - - for (i = 0; i < var->cnsts_number; i++) - if (var->cnsts[i].constraint == cnst) - break; - - if (i < var->cnsts_number) { - var->cnsts[i].value = value; - sys->modified = 1; - lmm_update_modified_set(sys, cnst); - } else - DIE_IMPOSSIBLE; -} - lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t /*sys*/, lmm_variable_t var, int num) @@ -667,7 +649,7 @@ void lmm_solve(lmm_system_t sys) cnst->usage = elem->value / elem->variable->weight; make_elem_active(elem); - ActionLmmPtr action = static_cast(elem->variable->id); + ActionPtr action = static_cast(elem->variable->id); if (sys->keep_track && !action->is_linked()) sys->keep_track->push_back(*action); }