fix Taillard generation

Author: jube

library/sched/shop/instance/JobShopInstanceGenerator.cc

@@ -2,6 +2,8 @@
 // Copyright (c) 2022-2025 Julien Bernard
 
 #include <cstdint>
+#include <cmath>
+
 #include <sched/shop/instance/JobShopInstanceGenerator.h>
 #include "sched/shop/instance/JobShopData.h"
 
@@ -57,8 +59,8 @@ namespace sched::shop {
 
     for (std::size_t job = 0; job < instance.jobs; ++job) {
       for (std::size_t machine = 0; machine < instance.machines; ++machine) {
-        const std::size_t other = taillard_uniform(machine_seed, static_cast<int32_t>(machine), static_cast<int32_t>(instance.machines));
-        std::swap(instance_data.jobs[job].operations[machine], instance_data.jobs[job].operations[other]);
+        const std::size_t other = taillard_uniform(machine_seed, static_cast<int32_t>(machine), static_cast<int32_t>(instance.machines - 1));
+        std::swap(instance_data.jobs[job].operations[machine].machine, instance_data.jobs[job].operations[other].machine);
       }
     }
 

tests/shop/HoistScheduling.cc

@@ -20,21 +20,20 @@ namespace {
   "unload": 0,
   "machines": 13,
   "operations": [
-    { "processing": { "lo": 120            }, "transport": 31 },
-    { "processing": { "lo": 150, "hi": 200 }, "transport": 22 },
-    { "processing": { "lo":  90, "hi": 120 }, "transport": 22 },
-    { "processing": { "lo": 120, "hi": 180 }, "transport": 22 },
-    { "processing": { "lo":  90, "hi": 125 }, "transport": 25 },
-    { "processing": { "lo":  30, "hi":  40 }, "transport": 23 },
-    { "processing": { "lo":  60, "hi": 120 }, "transport": 22 },
-    { "processing": { "lo":  60, "hi": 120 }, "transport": 22 },
-    { "processing": { "lo":  45, "hi":  75 }, "transport": 22 },
-    { "processing": { "lo": 130            }, "transport": 47 },
-    { "processing": { "lo": 120            }, "transport": 27 },
-    { "processing": { "lo":  90, "hi": 120 }, "transport": 22 },
-    { "processing": { "lo":  30, "hi":  60 }, "transport": 30 }
+    { "processing": { "lo": 120            }, "machines": 1, "transport": 31 },
+    { "processing": { "lo": 150, "hi": 200 }, "machines": 1, "transport": 22 },
+    { "processing": { "lo":  90, "hi": 120 }, "machines": 1, "transport": 22 },
+    { "processing": { "lo": 120, "hi": 180 }, "machines": 1, "transport": 22 },
+    { "processing": { "lo":  90, "hi": 125 }, "machines": 1, "transport": 25 },
+    { "processing": { "lo":  30, "hi":  40 }, "machines": 1, "transport": 23 },
+    { "processing": { "lo":  60, "hi": 120 }, "machines": 1, "transport": 22 },
+    { "processing": { "lo":  60, "hi": 120 }, "machines": 1, "transport": 22 },
+    { "processing": { "lo":  45, "hi":  75 }, "machines": 1, "transport": 22 },
+    { "processing": { "lo": 130            }, "machines": 1, "transport": 47 },
+    { "processing": { "lo": 120            }, "machines": 1, "transport": 27 },
+    { "processing": { "lo":  90, "hi": 120 }, "machines": 1, "transport": 22 },
+    { "processing": { "lo":  30, "hi":  60 }, "machines": 1, "transport": 30 }
   ],
-  "vehicles": 1,
   "empty": [
     [  0, 11, 14, 16, 14, 19, 22, 24, 26, 29,  6,  8, 10 ],
     [ 11,  0,  2,  5,  2,  8, 10, 13, 15, 17, 10,  3,  1 ],