Reinstated success fitness values stop criterion.

gprMax/optimisation_taguchi.py

@@ -132,12 +132,12 @@ def run_opt_sim(args, numbermodelruns, inputfile, usernamespace):
             break
 
         # Stop optimisation if successive fitness values are within a percentage threshold
-#        if iteration > 2:
+        if iteration > 2:
-#            fitnessvaluesclose = (np.abs(fitnessvalueshist[iteration - 2] - fitnessvalueshist[iteration - 1]) / fitnessvalueshist[iteration - 1]) * 100
+            fitnessvaluesclose = (np.abs(fitnessvalueshist[iteration - 2] - fitnessvalueshist[iteration - 1]) / fitnessvalueshist[iteration - 1]) * 100
-#            fitnessvaluesthres = 0.1
+            fitnessvaluesthres = 0.1
-#            if fitnessvaluesclose < fitnessvaluesthres:
+            if fitnessvaluesclose < fitnessvaluesthres:
-#                print('\nTaguchi optimisation stopped as successive fitness values within {}%'.format(fitnessvaluesthres))
+                print('\nTaguchi optimisation stopped as successive fitness values within {}%'.format(fitnessvaluesthres))
-#                break
+                break
 
     # Save optimisation parameters history and fitness values history to file
     opthistfile = inputfileparts[0] + '_hist.pickle'