go back to regex

Author: Vaibhavdixit02

src/utils.jl

@@ -72,29 +72,29 @@ using SciMLBase: ReturnCode
 
 # Define a dictionary to map regular expressions to ReturnCode values
 const STOP_REASON_MAP = Dict(
-    "Delta fitness .* below tolerance .*" => ReturnCode.Success,
-    "Fitness .* within tolerance .* of optimum" => ReturnCode.Success,
-    "CONVERGENCE: NORM_OF_PROJECTED_GRADIENT_<=_PGTOL" => ReturnCode.Success,
-    "CONVERGENCE: REL_REDUCTION_OF_F_<=_FACTR*EPSMCH" => ReturnCode.Success,
-    "Terminated" => ReturnCode.Terminated,
-    "MaxIters|MAXITERS_EXCEED|Max number of steps .* reached" => ReturnCode.MaxIters,
-    "MaxTime|TIME_LIMIT" => ReturnCode.MaxTime,
-    "Max time" => ReturnCode.MaxTime,
-    "DtLessThanMin" => ReturnCode.DtLessThanMin,
-    "Unstable" => ReturnCode.Unstable,
-    "InitialFailure" => ReturnCode.InitialFailure,
-    "ConvergenceFailure|ITERATION_LIMIT" => ReturnCode.ConvergenceFailure,
-    "Infeasible|INFEASIBLE|DUAL_INFEASIBLE|LOCALLY_INFEASIBLE|INFEASIBLE_OR_UNBOUNDED" => ReturnCode.Infeasible,
-    "STOP: TOTAL NO. of ITERATIONS REACHED LIMIT" => ReturnCode.MaxIters,
-    "STOP: TOTAL NO. of f AND g EVALUATIONS EXCEEDS LIMIT" => ReturnCode.MaxIters,
-    "STOP: ABNORMAL_TERMINATION_IN_LNSRCH" => ReturnCode.Unstable,
-    "STOP: ERROR INPUT DATA" => ReturnCode.InitialFailure,
-    "STOP: FTOL.TOO.SMALL" => ReturnCode.ConvergenceFailure,
-    "STOP: GTOL.TOO.SMALL" => ReturnCode.ConvergenceFailure,
-    "STOP: XTOL.TOO.SMALL" => ReturnCode.ConvergenceFailure,
-    "STOP: TERMINATION" => ReturnCode.Terminated,
-    "Optimization completed" => ReturnCode.Success,
-    "Convergence achieved" => ReturnCode.Success
+    r"Delta fitness .* below tolerance .*" => ReturnCode.Success,
+    r"Fitness .* within tolerance .* of optimum" => ReturnCode.Success,
+    r"CONVERGENCE: NORM_OF_PROJECTED_GRADIENT_<=_PGTOL" => ReturnCode.Success,
+    r"^CONVERGENCE: REL_REDUCTION_OF_F_<=_FACTR\*EPSMCH\s*$" => ReturnCode.Success,
+    r"Terminated" => ReturnCode.Terminated,
+    r"MaxIters|MAXITERS_EXCEED|Max number of steps .* reached" => ReturnCode.MaxIters,
+    r"MaxTime|TIME_LIMIT" => ReturnCode.MaxTime,
+    r"Max time" => ReturnCode.MaxTime,
+    r"DtLessThanMin" => ReturnCode.DtLessThanMin,
+    r"Unstable" => ReturnCode.Unstable,
+    r"InitialFailure" => ReturnCode.InitialFailure,
+    r"ConvergenceFailure|ITERATION_LIMIT" => ReturnCode.ConvergenceFailure,
+    r"Infeasible|INFEASIBLE|DUAL_INFEASIBLE|LOCALLY_INFEASIBLE|INFEASIBLE_OR_UNBOUNDED" => ReturnCode.Infeasible,
+    r"STOP: TOTAL NO. of ITERATIONS REACHED LIMIT" => ReturnCode.MaxIters,
+    r"STOP: TOTAL NO. of f AND g EVALUATIONS EXCEEDS LIMIT" => ReturnCode.MaxIters,
+    r"STOP: ABNORMAL_TERMINATION_IN_LNSRCH" => ReturnCode.Unstable,
+    r"STOP: ERROR INPUT DATA" => ReturnCode.InitialFailure,
+    r"STOP: FTOL.TOO.SMALL" => ReturnCode.ConvergenceFailure,
+    r"STOP: GTOL.TOO.SMALL" => ReturnCode.ConvergenceFailure,
+    r"STOP: XTOL.TOO.SMALL" => ReturnCode.ConvergenceFailure,
+    r"STOP: TERMINATION" => ReturnCode.Terminated,
+    r"Optimization completed" => ReturnCode.Success,
+    r"Convergence achieved" => ReturnCode.Success
 )
 
 # Function to deduce ReturnCode from a stop_reason string using the dictionary