modularizing an improvement trigger

arthurpaulino · Apr 15, 2019 · ff3f885 · ff3f885
1 parent 19a6156
commit ff3f885
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/miraiml/__init__.py b/miraiml/__init__.py
@@ -11,7 +11,7 @@
 >>> from miraiml import SearchSpace, Config, Engine
 """
 
-__version__ = '3.1.5.5'
+__version__ = '3.1.6.5'
 
 from .main import SearchSpace, Config, Engine
 

diff --git a/miraiml/main.py b/miraiml/main.py
@@ -385,6 +385,13 @@ def starter():
 
         Thread(target=lambda: starter()).start()
 
+    def __improvement_trigger__(self):
+        """
+        Called when an improvement happens.
+        """
+        if not self.on_improvement is None:
+            self.on_improvement(self.request_status())
+
     def __main_loop__(self):
         """
         Main optimization loop.
@@ -450,8 +457,7 @@ def __main_loop__(self):
                     self.best_score = score
                     self.best_id = ensemble_id
 
-        if not self.on_improvement is None and not self.must_interrupt:
-            self.on_improvement(self.request_status())
+        self.__improvement_trigger__()
 
         while not self.must_interrupt:
             for search_space in self.config.search_spaces:
@@ -484,8 +490,7 @@ def __main_loop__(self):
                             self.best_score = self.scores[ensemble_id]
                             self.best_id = ensemble_id
 
-                    if not self.on_improvement is None:
-                        self.on_improvement(self.request_status())
+                    self.__improvement_trigger__()
 
                     dump(base_model, self.models_dir + id)
 
@@ -496,8 +501,7 @@ def __main_loop__(self):
                         self.best_score = score
                         self.best_id = ensemble_id
 
-                    if not self.on_improvement is None and not self.must_interrupt:
-                        self.on_improvement(self.request_status())
+                    self.__improvement_trigger__()
 
         self.__is_running__ = False