Parcourir la source

add exploration over neighbors current solution obtained

Jérôme BUISINE il y a 3 ans
Parent
commit
a7e325c9cf
1 fichiers modifiés avec 6 ajouts et 2 suppressions
  1. 6 2
      optimization/LSSurrogate.py

+ 6 - 2
optimization/LSSurrogate.py

@@ -36,8 +36,9 @@ class LocalSearchSurrogate(Algorithm):
         # by default use of mother method to initialize variables
         super().run(_evaluations)
 
-        if self.parent:
-            self.bestSolution = self.parent.bestSolution
+        # do not use here the best solution known (default use of initRun and current solution)
+        # if self.parent:
+        #     self.bestSolution = self.parent.bestSolution
 
         # initialize current solution
         self.initRun()
@@ -72,6 +73,9 @@ class LocalSearchSurrogate(Algorithm):
                 if self.stop():
                     break
 
+            # after applying local search on currentSolution, we switch into new local area using known current bestSolution
+            self.currentSolution = self.bestSolution
+
         logging.info("End of %s, best solution found %s" %
                      (type(self).__name__, self.bestSolution))