Cleanup: ensure debug_bdf_order.cpp uses correct integrator and includes; update timeout_integrator.hpp for thread safety and robust timeout handling.

Author: WenyinWei

debug_bdf_order.cpp

@@ -2,7 +2,7 @@
 #include <vector>
 #include <iomanip>
 #include <cmath>
-#include <integrators/ode/bdf_scipy.hpp>
+#include <diffeq.hpp>
 
 // Simple exponential decay: dy/dt = -y
 void exponential_decay(double t, const std::vector<double>& y, std::vector<double>& dydt) {
@@ -19,7 +19,7 @@ int main() {
     double t_end = 1.0;
     double dt = 0.1;
 
-    auto integrator = diffeq::ScipyBDFIntegrator<std::vector<double>>(exponential_decay, 1e-3, 1e-6);
+    auto integrator = diffeq::BDFIntegrator<std::vector<double>>(exponential_decay, 1e-3, 1e-6);
     integrator.set_time(t_start);
 
     std::cout << "Integration steps:" << std::endl;

include/core/timeout_integrator.hpp

@@ -261,11 +261,26 @@ bool integrate_with_timeout(Integrator& integrator, State& state,
                            typename Integrator::time_type dt, 
                            typename Integrator::time_type end_time,
                            std::chrono::milliseconds timeout = std::chrono::milliseconds{5000}) {
-    auto future = std::async(std::launch::async, [&integrator, &state, dt, end_time]() {
-        integrator.integrate(state, dt, end_time);
+    // Create a copy of the state to avoid race conditions
+    State state_copy = state;
+    
+    auto future = std::async(std::launch::async, [&integrator, &state_copy, dt, end_time]() {
+        integrator.integrate(state_copy, dt, end_time);
     });
 
-    return future.wait_for(timeout) == std::future_status::ready;
+    auto status = future.wait_for(timeout);
+    
+    if (status == std::future_status::ready) {
+        try {
+            future.get(); // Check for exceptions
+            state = state_copy; // Update original state only if successful
+            return true;
+        } catch (...) {
+            return false;
+        }
+    } else {
+        return false; // Timed out
+    }
 }
 
 } // namespace diffeq::core