Merge branch 'dev' into 'main'

Change pre-optimization behaviour

See merge request !2

src/alaspo/__version__.py

 
-__version__ = '0.2.5'
+__version__ = '0.2.6'
 

src/alaspo/initial.py

-
-import math
 from .__init__ import logger
 
 
@@ -37,10 +35,14 @@ class ClingoInitialOperator(AbstractInititalOperator):
         logger.debug('initial operator executing')
         if self.__pre_opt_time > 0:
             if type(self.__pre_opt_time) == float:
-                t = math.round(global_timeout * self.__pre_opt_time)
+                t = round(global_timeout * self.__pre_opt_time)
             else:
                 t = self.__pre_opt_time
-            return self.__internal_solver.solve(timelimit=min(t, global_timeout), configuration=self.__configuration)
+            res = self.__internal_solver.solve(timelimit=min(t, global_timeout), configuration=self.__configuration)
+            if not res.sat:
+                time_left = global_timeout - min(t, global_timeout)
+                res = self.__internal_solver.solve(timelimit=time_left, configuration=self.__configuration, modellimit=1)
+            return res
         else:
             return self.__internal_solver.solve(timelimit=global_timeout, configuration=self.__configuration, modellimit=1)