Merge pull request #39 from popmonkey/v2.2

* standard solver + diagnostic solver are now merged as an elastic solver that can do both
* fixed (re-added because it was lost between v1 and v2) full minimum rest enforcement

Author: popmonkey

CMakeLists.txt

@@ -161,7 +161,6 @@ add_library(jres_solver_lib
   src/jres_internal_types.cpp
   src/jres_solver_base.cpp
   src/jres_standard_solver.cpp
-  src/jres_diagnostic_solver.cpp
 )
 set_target_properties(jres_solver_lib PROPERTIES OUTPUT_NAME "jres_solver")
 

README.md

@@ -39,7 +39,7 @@ The C-API uses the following structs to pass data to and from the solver.
 | `isDriver` | `int` | `1` if the member can drive, `0` otherwise. |
 | `isSpotter` | `int` | `1` if the member can spot, `0` otherwise. |
 | `maxStints`| `int` | Hard constraint: Maximum number of consecutive stints a member can perform. |
-| `minimumRestHours` | `int` | Hard constraint: Minimum rest time required after a driving shift before driving again. |
+| `minimumRestHours` | `int` | Hard constraint: Minimum contiguous rest time required once per race. <br> **Integrated Mode:** Applies to combined Driving and Spotting time. <br> **Sequential Mode:** Applies only to Driving. |
 | `tzOffset` | `double` | Timezone offset in hours from UTC. |
 
 `JresStint`
@@ -180,7 +180,7 @@ The `raceDataJson` string passed to `jres_input_from_json` must strictly follow
 | `isDriver` | Boolean | `true` | Can this member drive? |
 | `isSpotter` | Boolean | `false` | Can this member spot? |
 | `maxStints` | Integer| `1` | Hard constraint: Maximum number of consecutive stints a member can perform. |
-| `minimumRestHours` | Integer| `0` | Hard constraint: Minimum rest time required after a driving shift before driving again. |
+| `minimumRestHours` | Integer| `0` | Hard constraint: Minimum contiguous rest time required once per race. <br> **Integrated Mode:** Applies to combined Driving and Spotting time. <br> **Sequential Mode:** Applies only to Driving. |
 | `tzOffset` | Number | `0.0` | Timezone offset in hours from UTC. |
 
 #### Availability Map & Time Formatting

cmd/solver/cli.cpp

@@ -135,6 +135,24 @@ int main(int argc, char **argv)
         return 1;
     }
 
+    if (!quiet && solverOutput->stats) {
+        std::cout << "\n--- Complexity ---" << std::endl;
+        std::cout << "Rows: " << solverOutput->stats->modelRows << " | "
+                    << "Cols: " << solverOutput->stats->modelColumns << " | "
+                    << "Nodes: " << solverOutput->stats->searchNodes << std::endl;
+        if (solverOutput->stats->finalGap > 0) {
+            std::cout << "Final Gap: " << solverOutput->stats->finalGap << std::endl;
+        }
+
+        std::cout << "\n--- Timing Performance ---" << std::endl;
+        std::cout << std::fixed << std::setprecision(2);
+        std::cout << "Setup/Model Build : " << std::setw(8) << solverOutput->stats->setupDurationMs << " ms" << std::endl;
+        std::cout << "Driver Solve      : " << std::setw(8) << solverOutput->stats->driverSolveDurationMs << " ms" << std::endl;
+        if (solverOutput->stats->spotterSolveDurationMs > 0) {
+            std::cout << "Spotter Solve     : " << std::setw(8) << solverOutput->stats->spotterSolveDurationMs << " ms" << std::endl;
+        }
+    }
+
     if (solverOutput->diagnosis_len > 0) {
         if (runDiagnostics) {
              if (!quiet) {
@@ -150,23 +168,6 @@ int main(int argc, char **argv)
             }
         }
     } else if (!quiet) {
-        if (solverOutput->stats) {
-            std::cout << "\n--- Complexity ---" << std::endl;
-            std::cout << "Rows: " << solverOutput->stats->modelRows << " | "
-                        << "Cols: " << solverOutput->stats->modelColumns << " | "
-                        << "Nodes: " << solverOutput->stats->searchNodes << std::endl;
-            if (solverOutput->stats->finalGap > 0) {
-                std::cout << "Final Gap: " << solverOutput->stats->finalGap << std::endl;
-            }
-
-            std::cout << "\n--- Timing Performance ---" << std::endl;
-            std::cout << std::fixed << std::setprecision(2);
-            std::cout << "Setup/Model Build : " << std::setw(8) << solverOutput->stats->setupDurationMs << " ms" << std::endl;
-            std::cout << "Driver Solve      : " << std::setw(8) << solverOutput->stats->driverSolveDurationMs << " ms" << std::endl;
-            if (solverOutput->stats->spotterSolveDurationMs > 0) {
-                std::cout << "Spotter Solve     : " << std::setw(8) << solverOutput->stats->spotterSolveDurationMs << " ms" << std::endl;
-            }
-        }
         // Print the schedule
         std::cout << "\n--- Race Schedule ---" << std::endl;
         bool hasSpotters = (solverOptions.spotterMode != JRES_SPOTTER_MODE_NONE);

data/24h_race.json

@@ -7,47 +7,47 @@
       "isSpotter": true,
       "tzOffset": 1,
       "maxStints": 1,
-      "minimumRestHours": 8
+      "minimumRestHours": 6
     },
     {
       "name": "Ayrton",
       "isDriver": true,
       "isSpotter": false,
       "tzOffset": -3,
       "maxStints": 2,
-      "minimumRestHours": 8
+      "minimumRestHours": 6
     },
     {
       "name": "Jack",
       "isDriver": true,
       "isSpotter": true,
       "tzOffset": 11,
       "maxStints": 3,
-      "minimumRestHours": 8
+      "minimumRestHours": 6
     },
     {
       "name": "James",
       "isDriver": true,
       "isSpotter": true,
       "tzOffset": 0,
       "maxStints": 2,
-      "minimumRestHours": 8
+      "minimumRestHours": 6
     },
     {
       "name": "Mario",
       "isDriver": true,
       "isSpotter": true,
       "tzOffset": -5,
       "maxStints": 1,
-      "minimumRestHours": 8
+      "minimumRestHours": 6
     },
     {
       "name": "Ricky",
       "isDriver": false,
       "isSpotter": true,
       "tzOffset": -6,
       "maxStints": 2,
-      "minimumRestHours": 8
+      "minimumRestHours": 6
     }
   ],
   "availability": {
@@ -368,4 +368,4 @@
     }
   ],
   "firstStintDriver": "James"
-}
+}

data/short_race.json

@@ -7,23 +7,23 @@
       "isDriver": true,
       "isSpotter": true,
       "preferredStints": 2,
-      "minimumRestHours": 8
+      "minimumRestHours": 0
     },
     {
       "name": "Ayrton",
       "tzOffset": -3,
       "isDriver": true,
       "isSpotter": true,
       "preferredStints": 2,
-      "minimumRestHours": 8
+      "minimumRestHours": 0
     },
     {
       "name": "Alain",
       "tzOffset": 1,
       "isDriver": false,
       "isSpotter": true,
       "preferredStints": 2,
-      "minimumRestHours": 8
+      "minimumRestHours": 0
     }
   ],
   "availability": {

src/formatter/formatter_core.cpp

@@ -287,13 +287,19 @@ std::string generate_full_text_report(
     for (const auto& [name, itinerary] : itineraries) {
         if (itinerary.items.empty()) continue;
 
+        size_t max_activity_width = 0;
+        for (const auto& item : itinerary.items) {
+            max_activity_width = std::max(max_activity_width, item.activity.length());
+        }
+
         std::string tz_string = std::string("UTC") + (itinerary.tz_offset >= 0 ? "+" : "") + std::to_string(itinerary.tz_offset);
         f << "\nSchedule for " << name << " (" << tz_string << "):\n";
 
         for (const auto& item : itinerary.items) {
              double dur = item.end_local.diff_seconds(item.start_local);
              f << "  " << item.start_local.to_string() << " to " << item.end_local.time_string() 
-               << " (" << DateTime::format_duration((long long)dur) << "): " << item.activity << "\n";
+               << " " << std::left << std::setw(max_activity_width) << item.activity 
+               << " (" << DateTime::format_duration((long long)dur) << ")\n";
         }
     }
     return f.str();