Merge pull request #1397 from orichters/improvefails

count failing regions correctly
remindmodel · Sep 11, 2023 · a0e4e79 · a0e4e79
2 parents d7094ec + 297af22
commit a0e4e79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules/80_optimization/nash/declarations.gms b/modules/80_optimization/nash/declarations.gms
@@ -57,7 +57,7 @@ p80_repy_iteration(all_regi,solveinfo80,iteration) "summary report from solver i
 p80_repyLastOptim(all_regi,solveinfo80)    "p80_repy from last iteration"
 p80_messageFailedMarket(tall,all_enty)     "nash display helper"
 p80_messageShow(convMessage80)             "nash display helper"
-p80_trackConsecFail(all_regi)              "Parameter to keep track of consecutive solve failurs of regions in Nash mode."
+p80_trackConsecFail(all_regi)              "Parameter to keep track of consecutive solve failures of regions in Nash mode."
 
 p80_curracc(ttot,all_regi)                 "current account"
 

diff --git a/modules/80_optimization/nash/postsolve.gms b/modules/80_optimization/nash/postsolve.gms
@@ -572,10 +572,11 @@ if(cm_abortOnConsecFail, !! execute only if consecutive failures switch is non-z
         else
             p80_trackConsecFail(regi) = p80_trackConsecFail(regi) + 1;
         );
-
+    );
+    loop(regi,
         if(p80_trackConsecFail(regi) >= cm_abortOnConsecFail,
             execute_unload "abort.gdx";
-
+            display p80_trackConsecFail;
             abort "Run was aborted because the maximum number of consecutive failures was reached in at least one region!";
         );
     )