scipplan 0.1.0a1__py2.py3-none-any.whl → 0.1.0a2__py2.py3-none-any.whl

scipplan/__init__.py

@@ -1,5 +1,5 @@
-__version__ = "0.1.0alpha1"
+__version__ = "0.1.0alpha2"
 print(f"SCIPPlan Version: {__version__}")
 __release__ = "v0.1.0"
 __author__ = "Ari Gestetner, Buser Say"
-__email__ = "ages0001@student.monash.edu, buser.say@monash.edu"
+__email__ = "ari.gestetner@monash.edu, buser.say@monash.edu"

scipplan/config.py

@@ -32,17 +32,17 @@ class Config:
             "gap": False
         }
         if self.horizon is None:
-            print("Horizon is not provided, and is set to 1")
+            print("Horizon is not provided, and is set to 1. ")
             self.horizon = 1
             self._defaults["horizon"] = True
             
         if self.epsilon is None:
-            print("Epsilon is not provided, and is set to 0.1")
+            print("Epsilon is not provided, and is set to 0.1. ")
             self.epsilon = 0.1
             self._defaults["epsilon"] = True
             
         if self.gap is None:
-            print("Gap is not provided, and is set to 10.0%")
+            print("Gap is not provided, and is set to 10.0%. ")
             self.gap = 0.1
             self._defaults["gap"] = True
             
@@ -64,9 +64,11 @@ class Config:
         return dedent(text)
     
     def increment_horizon(self, value: int = 1):
-        self._defaults["horizon"] = False
+        # self._defaults["horizon"] = False
         self.horizon += value
         
+    def get_defaults(self) -> dict[str, bool]:
+        return self._defaults
     
     @classmethod
     def get_config(cls) -> Config:

scipplan/scipplan.py

@@ -130,9 +130,10 @@ class SCIPPlan:
      
     @classmethod
     def solve(cls, config: Config) -> tuple[SCIPPlan, float]:
+        # Time total solve time including incrementing horizon
+        start_time = time.time()
         while True:
             model = SCIPPlan(config)
-            start_time = time.time()
             try:
                 print(f"Encoding the problem over horizon h={config.horizon}.")
                 print("Solving the problem.")
@@ -144,12 +145,21 @@ class SCIPPlan:
                 return model, solve_time 
                     
             
-            except InfeasibilityError:
+            except InfeasibilityError:    
+                if config.get_defaults().get("horizon") is False:
+                    print(f"Horizon of h={model.config.horizon} is infeasible.")
+
+                    solve_time = (time.time() - start_time)
+                    print(f"Total time: {solve_time:.3f}")
+
+                    raise InfeasibilityError
+                    
+                
                 # print("Problem is infeasible for the given horizon.")
-                print(f"Horizon of h={model.config.horizon} is infeasible, incrementing to h={model.config.horizon + 1}")
+                print(f"Horizon of h={model.config.horizon} is infeasible, incrementing to h={model.config.horizon + 1}.")
                 config.increment_horizon()
                 if config.show_output is True:
-                    print(f"Horizon Time: {(time.time() - start_time): .3f} seconds")
+                    print(f"Horizon Time: {(time.time() - start_time): .3f} seconds.")
         
 
     def save_values(self, iteration: int):
@@ -162,8 +172,11 @@ def main():
     print(f"PySCIPOpt Version: {version('pyscipopt')}\n")
     config = Config.get_config()
     print(config)
-  
-    plan, solve_time = SCIPPlan.solve(config)  
+    
+    try:
+        plan, solve_time = SCIPPlan.solve(config)  
+    except InfeasibilityError:
+        return None
     
     if config.save_sols is True:
         write_to_csv("new_constraints", plan.new_constraints, config)
@@ -185,9 +198,9 @@ def main():
         for action_name in action_names:
             if action_name == config.dt_var:
                 continue
-            print(f"{action_name} at step {step} by value {plan.scip_model.getVal(plan.plan.variables[(action_name, step)].model_var):.3f}")
+            print(f"{action_name} at step {step} by value {plan.scip_model.getVal(plan.plan.variables[(action_name, step)].model_var):.3f}.")
         
-        print(f"Dt at step {step} by value {plan.scip_model.getVal(plan.plan.variables[('Dt', step)].model_var):.3f} \n")
+        print(f"Dt at step {step} by value {plan.scip_model.getVal(plan.plan.variables[('Dt', step)].model_var):.3f}. \n")
     
     print(f"Total reward: {(plan.scip_model.getObjVal()):.3f}")
     print(f"Total time: {solve_time:.3f}")

{scipplan-0.1.0a1.dist-info → scipplan-0.1.0a2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: scipplan
-Version: 0.1.0a1
+Version: 0.1.0a2
 Summary: Metric Hybrid Factored Planning in Nonlinear Domains with Constraint Generation in Python.
 Author: Ari Gestetner, Buser Say
-Author-email: ages0001@student.monash.edu, buser.say@monash.edu
+Author-email: ari.gestetner@monash.edu, buser.say@monash.edu
 License: MIT License
 Keywords: scip,automated planner
 Classifier: Development Status :: 3 - Alpha

{scipplan-0.1.0a1.dist-info → scipplan-0.1.0a2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-scipplan/__init__.py,sha256=UDxjLI2ncrtalcFrRMmLy7c097VACESqS51ELRaQpwY,196
-scipplan/config.py,sha256=wMu8jimLX9Bo4Y4rQ7NbhF5_ah3celnEaQOcrrUF9kk,5136
+scipplan/__init__.py,sha256=jClOsjTAC0gEL9LxLj39i7JJf5UcYhIofSUwQKwZnag,193
+scipplan/config.py,sha256=0D6UcLjrv4PTjYRiPoIYXAsRu4nwcaOIWnsI4lAdK6Y,5221
 scipplan/helpers.py,sha256=YwEr0NeDvb29_Ot686km3ZMJ-vHu-L8zjuexmlKDjpY,974
 scipplan/parse_model.py,sha256=-vssLQZHbXxkoiHjTHD-ZxY2h0w9LvGuJZXSd4RZvlM,9564
 scipplan/plan_model.py,sha256=daHnVHn2e89OtXXMl63QEoeKGOmy_LwT2oCRTjUUlKQ,11145
-scipplan/scipplan.py,sha256=aoHXP4YhYn9IAY4N2ZKQGgzKTG1tDEC_TpVctnO307k,7741
+scipplan/scipplan.py,sha256=z6cuRug4amCg6LU7S4RYHcV6uT3vWLHYGRh9OXFkKoU,8225
 scipplan/variables.py,sha256=3sxY3zQuxsa5z2fTFjv4zOSb9GarzojZ4W4kIx9FX68,2561
 scipplan/zero_crossing.py,sha256=kGyJsWZLLXqLW1p3LPDlPC34rTkFF8daDzqgbEcaXus,1043
 scipplan/translation/constants_navigation_1.txt,sha256=X0jvJe5MiwvayKBVXo9TQlGZGfUlpnFpMiReL68rsXc,43
@@ -30,9 +30,9 @@ scipplan/translation/temporal_constraints_navigation_3.txt,sha256=Ki4nAX9-QtBbY9
 scipplan/translation/transitions_navigation_1.txt,sha256=kfnr3_A9mCfflLsL4aq7OeR_BHSNST6eYuAg4ZxaPoU,411
 scipplan/translation/transitions_navigation_2.txt,sha256=kfnr3_A9mCfflLsL4aq7OeR_BHSNST6eYuAg4ZxaPoU,411
 scipplan/translation/transitions_navigation_3.txt,sha256=aIPP3FOjXZ3G6sTqicEIZ0JKJxdxHCRRZIdc5bUPFBM,395
-scipplan-0.1.0a1.dist-info/LICENSE,sha256=tfR4peJA8KJtYEn1NzNV-LWQVRAserdq7OJgYghreR0,1057
-scipplan-0.1.0a1.dist-info/METADATA,sha256=_mgsJkFO6gqiLO7b76i79d4sCbj-SD-XjNpgllWYeXk,11236
-scipplan-0.1.0a1.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-scipplan-0.1.0a1.dist-info/entry_points.txt,sha256=3qiNbbp6qIwivyPmmikyp7ByCfmsa9rGFNJPcN9Is8I,52
-scipplan-0.1.0a1.dist-info/top_level.txt,sha256=xO2FLRn7YQ-C25E8lagIEbik5T5FTr-Ta5bdiZezEPY,9
-scipplan-0.1.0a1.dist-info/RECORD,,
+scipplan-0.1.0a2.dist-info/LICENSE,sha256=tfR4peJA8KJtYEn1NzNV-LWQVRAserdq7OJgYghreR0,1057
+scipplan-0.1.0a2.dist-info/METADATA,sha256=MUXEq6y_8mBhdIUWVA9qUtfJof6yRVD70AWe9Wml_1s,11233
+scipplan-0.1.0a2.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+scipplan-0.1.0a2.dist-info/entry_points.txt,sha256=3qiNbbp6qIwivyPmmikyp7ByCfmsa9rGFNJPcN9Is8I,52
+scipplan-0.1.0a2.dist-info/top_level.txt,sha256=xO2FLRn7YQ-C25E8lagIEbik5T5FTr-Ta5bdiZezEPY,9
+scipplan-0.1.0a2.dist-info/RECORD,,