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

scipplan/__init__.py

@@ -1,5 +1,5 @@
-__version__ = "0.1.0alpha0"
+__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

@@ -12,7 +12,7 @@ class Config:
     Alternatively, the `get_config` class method will return a config instance using variables set by the programs args (e.g. -D 'domain').
     """
     domain: str
-    instance: int
+    instance: str
     horizon: int = field(default=None)
     epsilon: float = field(default=None)
     gap: float = field(default=None)
@@ -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
             
@@ -55,7 +55,7 @@ class Config:
         Dt Variable Name: {self.dt_var}
         
         Domain (str): {self.domain}
-        Instance (int): {self.instance}
+        Instance (str): {self.instance}
         Horizon (int): {self.horizon} {'(default)' if self._defaults['horizon'] is True else ''}
         Epsilon (float): {self.epsilon} {'(default)' if self._defaults['epsilon'] is True else ''}
         Gap (float): {self.gap * 100}% {'(default)' if self._defaults['gap'] is True else ''}
@@ -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:
@@ -84,7 +86,7 @@ class Config:
             "-I", 
             "--instance", 
             required=True,
-            type=int,
+            type=str,
             help="This is the instance number of the domain (e.g. navigation has instances 1, 2 and 3)"
         )
         parser.add_argument(

scipplan/parse_model.py

@@ -218,53 +218,17 @@ class ParseModel:
         raise Exception("Unknown ast type")
 
 
-functions = {
-    'exp': exp, 
-    'log': log, 
-    'sqrt': sqrt, 
-    'sin': sin, 
-    'cos': cos,
-}
-variables = {
-    'c': 0.15, 
-    'Removed': 634.9055920077616, 
-    'Removed_dash': 1811.3128718631383, 
-    'b2': 0.1, 
-    'Makespan': 180.0, 
-    'Susceptible': 1218.7473517769768, 
-    'Susceptible_dash': 87.1003300803328, 
-    'DurationMax': 90.0, 
-    'N': 2000.0, 
-    'Dt': 0.0, 
-    'Infected': 146.34705621526638, 
-    'Infected_dash': 101.58679805652946, 
-    'TotalTime': 90.87927389935685, 
-    'TotalTime_dash': 136.34829117841537, 
-    'b': 0.19999999999999973, 
-    'Epsilon': 1.0, 
-    'Percentage': 0.8, 
-    'DurationMin': 30.0, 
-    'b1': 0.2, 
-    'Duration': 100.0, 
-    'D': 150.0, 
-    'InitialInfected': 50.0, 
-    'Lockdown': 0.0
-}
-
-constraint = "Infected * exp((b / (b - c)) * log(1 + (Infected / Susceptible))) * exp(-1.0 * (b / (b - c)) * log(1 + (Infected / Susceptible) * exp((b - c) * Dt))) * exp((b - c) * Dt) <= D"
-
-
 
 if __name__ == "__main__":
-    params = EvalParams.as_calculator(variables, functions, {})
-    calc = ParseModel(params).evaluate
+    # params = EvalParams.as_calculator(variables, functions, {})
+    # calc = ParseModel(params).evaluate
     
-    print(calc(constraint))
+    # print(calc(constraint))
     eqtns = """
 1 + 2
 1 + 5 < 5    
 """
-    print(calc(eqtns))
+    print((eqtns))
 #     print(calc(
 # """
 # a >= b if a + b + c >= 5 else a - b - c == 10

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.0a0.dist-info → scipplan-0.1.0a2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: scipplan
-Version: 0.1.0a0
+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.0a0.dist-info → scipplan-0.1.0a2.dist-info}/RECORD

@@ -1,54 +1,38 @@
-scipplan/__init__.py,sha256=DFKsXFuWCEPlRh1XozFuUiyTqLf47yVYHnKpFjKtbkI,196
-scipplan/config.py,sha256=VmsdogXHy535KheufJtREI8ZQ7lJVxYxzzPXzLoU-38,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=THP1TX6kllK4fwvxVGuzGIS4w2PVCg83GP1QhLiA8U0,10516
+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_infection_1.txt,sha256=7MFkFGycNWOrdDJ7gZyEPmVtAzphbJXnXMFv1ogT3bg,179
 scipplan/translation/constants_navigation_1.txt,sha256=X0jvJe5MiwvayKBVXo9TQlGZGfUlpnFpMiReL68rsXc,43
 scipplan/translation/constants_navigation_2.txt,sha256=eMN8PnTBS5qc_8u6W7Q-wSlXvX_wFjFaFCT38wviiQE,44
 scipplan/translation/constants_navigation_3.txt,sha256=ItHwvPfASUvSbdKlek4GFZweDGmxT1wRr3SH7W4-CBc,24
-scipplan/translation/constants_pandemic_1.txt,sha256=7MFkFGycNWOrdDJ7gZyEPmVtAzphbJXnXMFv1ogT3bg,179
-scipplan/translation/goals_infection_1.txt,sha256=IuVcZ7jkt1f12UR0y8FsyqUNZ8ypYLLqlTeFte5u6zQ,49
 scipplan/translation/goals_navigation_1.txt,sha256=uxlsrr_M5maa8FGVZXrsnzu7CG-R1ubKVu8Wj5eAqks,35
 scipplan/translation/goals_navigation_2.txt,sha256=uxlsrr_M5maa8FGVZXrsnzu7CG-R1ubKVu8Wj5eAqks,35
 scipplan/translation/goals_navigation_3.txt,sha256=uxlsrr_M5maa8FGVZXrsnzu7CG-R1ubKVu8Wj5eAqks,35
-scipplan/translation/goals_pandemic_1.txt,sha256=IuVcZ7jkt1f12UR0y8FsyqUNZ8ypYLLqlTeFte5u6zQ,49
-scipplan/translation/initials_infection_1.txt,sha256=PM5-6kvHk-VMV_sSWpvC2tbq5Uvavm4DRelrRKOGsCQ,95
 scipplan/translation/initials_navigation_1.txt,sha256=6uKI2B_vG-AACgFrBmmPBqC_NEQ2znHTcV44aI-rbXY,66
 scipplan/translation/initials_navigation_2.txt,sha256=s7ukUEHwcmMsey1bHCRJh515PLKYXODz8Sb5jQBtGeM,65
 scipplan/translation/initials_navigation_3.txt,sha256=s7ukUEHwcmMsey1bHCRJh515PLKYXODz8Sb5jQBtGeM,65
-scipplan/translation/initials_pandemic_1.txt,sha256=PM5-6kvHk-VMV_sSWpvC2tbq5Uvavm4DRelrRKOGsCQ,95
-scipplan/translation/instantaneous_constraints_infection_1.txt,sha256=gr9bxKFi_A3ZMCxB1nFemLrnJZpNvWzc9em4lk8AZuc,167
 scipplan/translation/instantaneous_constraints_navigation_1.txt,sha256=WbITeszv_n93_BhE2eiNqFPAZVO4f2s44KcKUsNURyA,244
 scipplan/translation/instantaneous_constraints_navigation_2.txt,sha256=e5YdZn3OKLJh0kEiCNqpOgxgAAQxIHMB3J5OTYvPlgw,333
 scipplan/translation/instantaneous_constraints_navigation_3.txt,sha256=HnzfFntGIQ0WIMnEfcYPg1cy7u9dJn3xuYqdXZVFFvE,422
-scipplan/translation/instantaneous_constraints_pandemic_1.txt,sha256=gr9bxKFi_A3ZMCxB1nFemLrnJZpNvWzc9em4lk8AZuc,167
-scipplan/translation/pvariables_infection_1.txt,sha256=TfBDRG_FrKgxRYUFCA2ypQJZCIWLvDhUzLr_DwQFiKA,187
 scipplan/translation/pvariables_navigation_1.txt,sha256=97t5uPWAWKmtbDPJZIor5nn5qPU6aMcGdpLAuKnlDbQ,217
 scipplan/translation/pvariables_navigation_2.txt,sha256=lGUNN04bC-CJFTThNC3dwP9kU2xGftSshx-24I6zlZw,216
 scipplan/translation/pvariables_navigation_3.txt,sha256=1-yvM5BSJ5TXBlHkMbcXWd5zoc2ezSBpIIuM_zwEXSo,216
-scipplan/translation/pvariables_pandemic_1.txt,sha256=TfBDRG_FrKgxRYUFCA2ypQJZCIWLvDhUzLr_DwQFiKA,187
-scipplan/translation/reward_infection_1.txt,sha256=3AZZGt7w5voiqwVlEkc2-NXXh6NxBqFPWraCZKwhpcM,20
 scipplan/translation/reward_navigation_1.txt,sha256=dvR0CkxkWRbO3wP0fenXDSDMpueEUtSUqw990UnCcJY,26
 scipplan/translation/reward_navigation_2.txt,sha256=ck6uUGNhM_DWiG1hHN6_xTps1muychzqTOpz1iLF9bk,26
 scipplan/translation/reward_navigation_3.txt,sha256=O8unFCIySCz4GCBX_9mQcm-JMn5Ur6upp3HBbA4e_C8,22
-scipplan/translation/reward_pandemic_1.txt,sha256=3AZZGt7w5voiqwVlEkc2-NXXh6NxBqFPWraCZKwhpcM,20
-scipplan/translation/temporal_constraints_infection_1.txt,sha256=pReUU1lQsTwrREYJwlEeslSp56boHCKaIE1kIrXbPV8,175
 scipplan/translation/temporal_constraints_navigation_1.txt,sha256=h06iRA5TDr6R5XdjhEyYnZ3f-FQwUkbKGNw-t0k0jm8,875
 scipplan/translation/temporal_constraints_navigation_2.txt,sha256=x73dbxxb_YzvdvtVNaJfG-S9ggf-yqTYdoU6NiDQBqk,1319
 scipplan/translation/temporal_constraints_navigation_3.txt,sha256=Ki4nAX9-QtBbY9ZdHwHdqta8JQoLrAVvlZrLa1pWLnQ,1668
-scipplan/translation/temporal_constraints_pandemic_1.txt,sha256=pReUU1lQsTwrREYJwlEeslSp56boHCKaIE1kIrXbPV8,175
-scipplan/translation/transitions_infection_1.txt,sha256=iDxrZUngYgxgZmGTur4sSWLZssG9AGGuY_BaYHmoxn0,564
 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/translation/transitions_pandemic_1.txt,sha256=iDxrZUngYgxgZmGTur4sSWLZssG9AGGuY_BaYHmoxn0,564
-scipplan-0.1.0a0.dist-info/LICENSE,sha256=tfR4peJA8KJtYEn1NzNV-LWQVRAserdq7OJgYghreR0,1057
-scipplan-0.1.0a0.dist-info/METADATA,sha256=BePW-SSEWLg7-0QhOoaiBRWI336Wp6wJ8hB3iRg8flA,11236
-scipplan-0.1.0a0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-scipplan-0.1.0a0.dist-info/entry_points.txt,sha256=3qiNbbp6qIwivyPmmikyp7ByCfmsa9rGFNJPcN9Is8I,52
-scipplan-0.1.0a0.dist-info/top_level.txt,sha256=xO2FLRn7YQ-C25E8lagIEbik5T5FTr-Ta5bdiZezEPY,9
-scipplan-0.1.0a0.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,,

scipplan/translation/constants_infection_1.txt

@@ -1,17 +0,0 @@
-b1 = 0.2
-b2 = 0.1
-c = 0.15
-N = 2000.0
-D = 150.0
-
-Makespan = 180.0
-
-Epsilon = 1.0
-
-Duration = 100.0
-DurationMin = 30.0
-DurationMax = 90.0
-
-Percentage = 0.8
-
-InitialInfected = 50.0

scipplan/translation/constants_pandemic_1.txt

@@ -1,17 +0,0 @@
-b1 = 0.2
-b2 = 0.1
-c = 0.15
-N = 2000.0
-D = 150.0
-
-Makespan = 180.0
-
-Epsilon = 1.0
-
-Duration = 100.0
-DurationMin = 30.0
-DurationMax = 90.0
-
-Percentage = 0.8
-
-InitialInfected = 50.0

scipplan/translation/goals_infection_1.txt

@@ -1,3 +0,0 @@
-Removed >= N * Percentage
-
-TotalTime == Makespan

scipplan/translation/goals_pandemic_1.txt

@@ -1,3 +0,0 @@
-Removed >= N * Percentage
-
-TotalTime == Makespan

scipplan/translation/initials_infection_1.txt

@@ -1,5 +0,0 @@
-Susceptible == N - InitialInfected
-Infected == InitialInfected
-Removed == 0.0
-
-TotalTime == 0.0

scipplan/translation/initials_pandemic_1.txt

@@ -1,5 +0,0 @@
-Susceptible == N - InitialInfected
-Infected == InitialInfected
-Removed == 0.0
-
-TotalTime == 0.0

scipplan/translation/instantaneous_constraints_infection_1.txt

@@ -1,12 +0,0 @@
-b - b1 + Lockdown >= 0.0
-b - b1 - Lockdown <= 0.0
-
-b - b2 + (1 - Lockdown) >= 0.0
-b - b2 - (1 - Lockdown) <= 0.0
-
-
-b <= b1
-b >= b2
-
-Dt >= DurationMin
-Dt <= DurationMax

scipplan/translation/instantaneous_constraints_pandemic_1.txt

@@ -1,12 +0,0 @@
-b - b1 + Lockdown >= 0.0
-b - b1 - Lockdown <= 0.0
-
-b - b2 + (1 - Lockdown) >= 0.0
-b - b2 - (1 - Lockdown) <= 0.0
-
-
-b <= b1
-b >= b2
-
-Dt >= DurationMin
-Dt <= DurationMax

scipplan/translation/pvariables_infection_1.txt

@@ -1,12 +0,0 @@
-state_continuous: Susceptible
-state_continuous: Infected
-state_continuous: Removed
-
-state_continuous: TotalTime
-
-action_boolean: Lockdown
-action_continuous: Dt
-
-auxiliary_continuous: b
-
- 

scipplan/translation/pvariables_pandemic_1.txt

@@ -1,12 +0,0 @@
-state_continuous: Susceptible
-state_continuous: Infected
-state_continuous: Removed
-
-state_continuous: TotalTime
-
-action_boolean: Lockdown
-action_continuous: Dt
-
-auxiliary_continuous: b
-
- 

scipplan/translation/reward_infection_1.txt

@@ -1 +0,0 @@
--1.0 * Lockdown * Dt

scipplan/translation/reward_pandemic_1.txt

@@ -1 +0,0 @@
--1.0 * Lockdown * Dt

scipplan/translation/temporal_constraints_infection_1.txt

@@ -1 +0,0 @@
-Infected * exp((b / (b - c)) * log(1 + (Infected / Susceptible))) * exp(-1.0 * (b / (b - c)) * log(1 + (Infected / Susceptible) * exp((b - c) * Dt))) * exp((b - c) * Dt) <= D

scipplan/translation/temporal_constraints_pandemic_1.txt

@@ -1 +0,0 @@
-Infected * exp((b / (b - c)) * log(1 + (Infected / Susceptible))) * exp(-1.0 * (b / (b - c)) * log(1 + (Infected / Susceptible) * exp((b - c) * Dt))) * exp((b - c) * Dt) <= D

scipplan/translation/transitions_infection_1.txt

@@ -1,7 +0,0 @@
-Susceptible_dash - Susceptible * exp((b / (b - c)) * log(1 + (Infected / Susceptible))) * exp(-1.0 * (b / (b - c)) * log(1 + (Infected / Susceptible) * exp((b - c) * Dt))) == 0.0
-
-Infected_dash - Infected * exp((b / (b - c)) * log(1 + (Infected / Susceptible))) * exp(-1.0 * (b / (b - c)) * log(1 + (Infected / Susceptible) * exp((b - c) * Dt))) * exp((b - c) * Dt) == 0.0
-
-Removed_dash - N + exp((b / (b - c)) * log(Susceptible + Infected)) * exp(-1.0 * (c / (b - c)) * log(Susceptible + Infected * exp((b - c) * Dt))) == 0.0
-
-TotalTime_dash - TotalTime - Dt == 0

scipplan/translation/transitions_pandemic_1.txt

@@ -1,7 +0,0 @@
-Susceptible_dash - Susceptible * exp((b / (b - c)) * log(1 + (Infected / Susceptible))) * exp(-1.0 * (b / (b - c)) * log(1 + (Infected / Susceptible) * exp((b - c) * Dt))) == 0.0
-
-Infected_dash - Infected * exp((b / (b - c)) * log(1 + (Infected / Susceptible))) * exp(-1.0 * (b / (b - c)) * log(1 + (Infected / Susceptible) * exp((b - c) * Dt))) * exp((b - c) * Dt) == 0.0
-
-Removed_dash - N + exp((b / (b - c)) * log(Susceptible + Infected)) * exp(-1.0 * (c / (b - c)) * log(Susceptible + Infected * exp((b - c) * Dt))) == 0.0
-
-TotalTime_dash - TotalTime - Dt == 0