Saved values for reportSimplexPhaseIterations now in HighsSimplexInfo…

… rather than static
ERGO-Code · Apr 16, 2023 · 767478e · 767478e
1 parent e8af018
commit 767478e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/src/simplex/HSimplexReport.cpp b/src/simplex/HSimplexReport.cpp
@@ -18,35 +18,30 @@
 
 void reportSimplexPhaseIterations(const HighsLogOptions& log_options,
                                   const HighsInt iteration_count,
-                                  const HighsSimplexInfo& info,
+                                  HighsSimplexInfo& info,
                                   const bool initialise) {
   if (info.run_quiet) return;
-  static HighsInt iteration_count0 = 0;
-  static HighsInt dual_phase1_iteration_count0 = 0;
-  static HighsInt dual_phase2_iteration_count0 = 0;
-  static HighsInt primal_phase1_iteration_count0 = 0;
-  static HighsInt primal_phase2_iteration_count0 = 0;
-  static HighsInt primal_bound_swap0 = 0;
   if (initialise) {
-    iteration_count0 = iteration_count;
-    dual_phase1_iteration_count0 = info.dual_phase1_iteration_count;
-    dual_phase2_iteration_count0 = info.dual_phase2_iteration_count;
-    primal_phase1_iteration_count0 = info.primal_phase1_iteration_count;
-    primal_phase2_iteration_count0 = info.primal_phase2_iteration_count;
-    primal_bound_swap0 = info.primal_bound_swap;
+    info.iteration_count0 = iteration_count;
+    info.dual_phase1_iteration_count0 = info.dual_phase1_iteration_count;
+    info.dual_phase2_iteration_count0 = info.dual_phase2_iteration_count;
+    info.primal_phase1_iteration_count0 = info.primal_phase1_iteration_count;
+    info.primal_phase2_iteration_count0 = info.primal_phase2_iteration_count;
+    info.primal_bound_swap0 = info.primal_bound_swap;
     return;
   }
-  const HighsInt delta_iteration_count = iteration_count - iteration_count0;
+  const HighsInt delta_iteration_count =
+      iteration_count - info.iteration_count0;
   const HighsInt delta_dual_phase1_iteration_count =
-      info.dual_phase1_iteration_count - dual_phase1_iteration_count0;
+      info.dual_phase1_iteration_count - info.dual_phase1_iteration_count0;
   const HighsInt delta_dual_phase2_iteration_count =
-      info.dual_phase2_iteration_count - dual_phase2_iteration_count0;
+      info.dual_phase2_iteration_count - info.dual_phase2_iteration_count0;
   const HighsInt delta_primal_phase1_iteration_count =
-      info.primal_phase1_iteration_count - primal_phase1_iteration_count0;
+      info.primal_phase1_iteration_count - info.primal_phase1_iteration_count0;
   const HighsInt delta_primal_phase2_iteration_count =
-      info.primal_phase2_iteration_count - primal_phase2_iteration_count0;
+      info.primal_phase2_iteration_count - info.primal_phase2_iteration_count0;
   const HighsInt delta_primal_bound_swap =
-      info.primal_bound_swap - primal_bound_swap0;
+      info.primal_bound_swap - info.primal_bound_swap0;
 
   HighsInt check_delta_iteration_count =
       delta_dual_phase1_iteration_count + delta_dual_phase2_iteration_count +

diff --git a/src/simplex/HSimplexReport.h b/src/simplex/HSimplexReport.h
@@ -19,6 +19,6 @@
 
 void reportSimplexPhaseIterations(const HighsLogOptions& log_options,
                                   const HighsInt iteration_count,
-                                  const HighsSimplexInfo& info,
+                                  HighsSimplexInfo& info,
                                   const bool initialise = false);
 #endif  // SIMPLEX_HSIMPLEXREPORT_H_
diff --git a/src/simplex/SimplexStruct.h b/src/simplex/SimplexStruct.h
@@ -219,6 +219,14 @@ struct HighsSimplexInfo {
   HighsInt primal_phase2_iteration_count = 0;
   HighsInt primal_bound_swap = 0;
 
+  // Starting values for use in reportSimplexPhaseIterations
+  HighsInt iteration_count0 = 0;
+  HighsInt dual_phase1_iteration_count0 = 0;
+  HighsInt dual_phase2_iteration_count0 = 0;
+  HighsInt primal_phase1_iteration_count0 = 0;
+  HighsInt primal_phase2_iteration_count0 = 0;
+  HighsInt primal_bound_swap0 = 0;
+
   HighsInt min_concurrency = 1;
   HighsInt num_concurrency = 1;
   HighsInt max_concurrency = kSimplexConcurrencyLimit;