Fixed path setting for colab, included OAT function copying after loa…

…ding
DimitriWeiss · Oct 12, 2023 · 6c46c2e · 6c46c2e
1 parent 3301de9
commit 6c46c2e
Show file tree

Hide file tree

Showing 30 changed files with 49 additions and 194 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
diff --git a/README.rst b/README.rst
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/make.bat b/docs/make.bat
diff --git a/docs/requirements.txt b/docs/requirements.txt
diff --git a/docs/source/api.rst b/docs/source/api.rst
diff --git a/docs/source/conf.py b/docs/source/conf.py
diff --git a/docs/source/index.rst b/docs/source/index.rst
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/up_ac/OAT_configurator.py b/up_ac/OAT_configurator.py
@@ -88,6 +88,8 @@ def planner_feedback(config, instance, reader):
                     float: Feedback value based on the planner's performance.
                 """ 
                 path = os.getcwd().rsplit('up-ac', 1)[0]
+                if path[-1] != "/":
+                    path += "/"
                 path += 'up-ac/up_ac'
                 sys.path.append(r"{}".format(path))
 
@@ -242,6 +244,8 @@ def set_scenario(self, engine, param_space, gaci,
         param_file = gaci.get_ps_oat(param_space)
 
         path = os.getcwd().rsplit('up-ac', 2)[0]
+        if path[-1] != "/":
+            path += "/"
         path += 'up-ac/up_ac'
 
         path_to_xml = f'{path}/OAT/{engine}parameterTree.xml'

diff --git a/up_ac/Smac_configurator.py b/up_ac/Smac_configurator.py
@@ -135,6 +135,8 @@ def solve(config, metric, engine,
                     return feedback
 
             path = os.getcwd().rsplit('up-ac', 1)[0]
+            if path[-1] != "/":
+                path += "/"
             path += 'up-ac/up_ac/utils'
 
             self.feedback_path = path
@@ -219,6 +221,8 @@ def optimize(self, feedback_function=None, gray_box=False):
         if feedback_function is not None:
             # Import feedback function, since dask cannot pickle local objects            
             path = os.getcwd().rsplit('up-ac', 1)[0]
+            if path[-1] != "/":
+                path += "/"
             path += 'up-ac/up_ac/utils'
             sys.path.append(r"{}".format(path))
             from load_smac_feedback import get_feedback

diff --git a/up_ac/examples/enhsp_Irace_configuration.py b/up_ac/examples/enhsp_Irace_configuration.py
@@ -5,6 +5,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/enhsp_OAT_configuration.py b/up_ac/examples/enhsp_OAT_configuration.py
@@ -4,6 +4,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/enhsp_Smac_configuration.py b/up_ac/examples/enhsp_Smac_configuration.py
@@ -6,6 +6,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/fast-downward_Irace_configuration.py b/up_ac/examples/fast-downward_Irace_configuration.py
@@ -5,6 +5,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/fast-downward_OAT_configuration.py b/up_ac/examples/fast-downward_OAT_configuration.py
@@ -4,6 +4,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/fast-downward_Smac_configuration.py b/up_ac/examples/fast-downward_Smac_configuration.py
@@ -6,6 +6,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/lpg_Irace_configuration.py b/up_ac/examples/lpg_Irace_configuration.py
@@ -5,6 +5,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/lpg_OAT_configuration.py b/up_ac/examples/lpg_OAT_configuration.py
@@ -4,6 +4,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/lpg_Smac_configuration.py b/up_ac/examples/lpg_Smac_configuration.py
@@ -6,6 +6,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/pyperplan_Irace_configuration.py b/up_ac/examples/pyperplan_Irace_configuration.py
@@ -5,6 +5,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/pyperplan_OAT_configuration.py b/up_ac/examples/pyperplan_OAT_configuration.py
@@ -4,6 +4,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/pyperplan_Smac_configuration.py b/up_ac/examples/pyperplan_Smac_configuration.py
@@ -6,6 +6,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/tamer_Irace_configuration.py b/up_ac/examples/tamer_Irace_configuration.py
@@ -5,6 +5,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/tamer_OAT_configuration.py b/up_ac/examples/tamer_OAT_configuration.py
@@ -4,6 +4,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/examples/tamer_Smac_configuration.py b/up_ac/examples/tamer_Smac_configuration.py
@@ -6,6 +6,8 @@
 
 # make sure test can be run from anywhere
 path = os.getcwd().rsplit('up-ac', 1)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up-ac/up_ac'
 if not os.path.isfile(sys.path[0] + '/configurators.py') and \
         'up-ac' in sys.path[0]:

diff --git a/up_ac/utils/call_engine_OAT.py b/up_ac/utils/call_engine_OAT.py
@@ -17,6 +17,8 @@
 
 # Make sure modules are accesible
 path = os.getcwd().rsplit('up_ac', 2)[0]
+if path[-1] != "/":
+    path += "/"
 path += 'up_ac'
 sys.path.append(r"{}".format(path))