ens-ulm-1

commit cceb55b2c1bedc0f150dcead3d58319a009a8977
parent 24928d67a2807f940ce4feae7dafddaded8eafee
Author: Marc Jeanmougin <marc@jeanmougin.fr>
Date:   Thu, 10 Apr 2014 01:30:46 +0200

Merge branch 'master' of ssh://gitorious.org/ens-ulm-1/ens-ulm-1

Diffstat:
contest/mehdi/a.cpp
 | 
7
++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/contest/mehdi/a.cpp b/contest/mehdi/a.cpp
@@ -623,6 +623,7 @@ int main(int argc, char *argv[]) {
 
   int it = 0;
   for (int git = 0; git < MAX_GIT; git++) {
+    fprintf(stderr, "On passe aux rm<=%d et add<=%d\n", MAX_RM, MAX_ADD);
     ameliore = 1;
     for (; ameliore; it++) {
       debug_sol();
@@ -636,8 +637,12 @@ int main(int argc, char *argv[]) {
       check_interrupt();
 
       debug_sol();
-      for (int v = 0; v < n_vehicules; v++)
+
+      random_shuffle(order, order+n_vehicules);
+      for (int i = 0; i < n_vehicules; i++) {
+        int v = order[i];
         ameliore |= amel[v] = amel[v] || modif(v);
+      }
 
       ameliore |= prune_and_complete();
       ameliore |= simplif_elarnon();