From 00253973ee949cd569d43ac65acc6699316f6621 Mon Sep 17 00:00:00 2001
From: Hamish Brown <hamish.brown@plantandfood.co.nz>
Date: Tue, 5 Mar 2024 13:28:37 +1300
Subject: [PATCH] Change paths back

---
 TestComponents/Test.cs           | 4 ++--
 TestGraphs/MakeConfigs/WS2.ipynb | 6 +++---
 TestGraphs/MakeConfigs/WS2.py    | 6 +++---
 TestGraphs/MakeGraphs/WS2.ipynb  | 6 ++++--
 TestGraphs/MakeGraphs/WS2.py     | 6 ++++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/TestComponents/Test.cs b/TestComponents/Test.cs
index 09c225b..7883b4b 100644
--- a/TestComponents/Test.cs
+++ b/TestComponents/Test.cs
@@ -17,9 +17,9 @@ public class Test
     {
         public static void RunAllTests()
         {
-            string root = Directory.GetCurrentDirectory();
             //string root = "C:\\GitHubRepos\\FieldNBalance";
-            string path = Path.Join(root, "TestComponents", "TestSets");
+            //string path = Path.Join(root, "TestComponents", "TestSets");
+            string path = Path.Join("TestComponents", "TestSets");
             List<string> sets = new List<string> { "WS2", "Residues", "Location", "Moisture" };
 
             //Delete graphs from previous test run
diff --git a/TestGraphs/MakeConfigs/WS2.ipynb b/TestGraphs/MakeConfigs/WS2.ipynb
index fada72e..8a102e5 100644
--- a/TestGraphs/MakeConfigs/WS2.ipynb
+++ b/TestGraphs/MakeConfigs/WS2.ipynb
@@ -44,9 +44,9 @@
    },
    "outputs": [],
    "source": [
-    "root = os.split(os.abspath('WS2.ipynb'))[0][:-23]\n",
-    "path = os.join(root,\"TestComponents\", \"TestSets\", \"WS2\")\n",
-    "#path = join(\"TestComponents\", \"TestSets\", \"WS2\")"
+    "#root = os.split(os.abspath('WS2.ipynb'))[0][:-23]\n",
+    "#path = os.join(root,\"TestComponents\", \"TestSets\", \"WS2\")\n",
+    "path = join(\"TestComponents\", \"TestSets\", \"WS2\")"
    ]
   },
   {
diff --git a/TestGraphs/MakeConfigs/WS2.py b/TestGraphs/MakeConfigs/WS2.py
index fc51451..0f4f265 100644
--- a/TestGraphs/MakeConfigs/WS2.py
+++ b/TestGraphs/MakeConfigs/WS2.py
@@ -28,9 +28,9 @@
  9: 'Oakley'
 }
 
-root = os.split(os.abspath('WS2.ipynb'))[0][:-23]
-path = os.join(root,"TestComponents", "TestSets", "WS2")
-#path = join("TestComponents", "TestSets", "WS2")
+#root = os.split(os.abspath('WS2.ipynb'))[0][:-23]
+#path = os.join(root,"TestComponents", "TestSets", "WS2")
+path = join("TestComponents", "TestSets", "WS2")
 
 Configs = pd.read_excel(os.join(path, "FieldConfigs.xlsx"),sheet_name=Sites[1],nrows=48,usecols=lambda x: 'Unnamed' not in x,keep_default_na=False)
 Configs.set_index('Name',inplace=True)
diff --git a/TestGraphs/MakeGraphs/WS2.ipynb b/TestGraphs/MakeGraphs/WS2.ipynb
index 5f5e6bd..b414486 100644
--- a/TestGraphs/MakeGraphs/WS2.ipynb
+++ b/TestGraphs/MakeGraphs/WS2.ipynb
@@ -39,8 +39,10 @@
    },
    "outputs": [],
    "source": [
-    "root = osp.split(osp.abspath('WS2.ipynb'))[0][:-22]\n",
-    "inPath = osp.join(root,\"TestComponents\", \"TestSets\", \"WS2\")\n",
+    "#root = osp.split(osp.abspath('WS2.ipynb'))[0][:-22]\n",
+    "# inPath = osp.join(root,\"TestComponents\", \"TestSets\", \"WS2\")\n",
+    "# outPath = osp.join(root,\"TestGraphs\", \"Outputs\")  \n",
+    "inPath = osp.join(\"TestComponents\", \"TestSets\", \"WS2\")\n",
     "outPath = osp.join(root,\"TestGraphs\", \"Outputs\")  "
    ]
   },
diff --git a/TestGraphs/MakeGraphs/WS2.py b/TestGraphs/MakeGraphs/WS2.py
index 90d6f74..082d337 100644
--- a/TestGraphs/MakeGraphs/WS2.py
+++ b/TestGraphs/MakeGraphs/WS2.py
@@ -35,8 +35,10 @@
 } 
 # -
 
-root = osp.split(osp.abspath('WS2.ipynb'))[0][:-22]
-inPath = osp.join(root,"TestComponents", "TestSets", "WS2")
+#root = osp.split(osp.abspath('WS2.ipynb'))[0][:-22]
+# inPath = osp.join(root,"TestComponents", "TestSets", "WS2")
+# outPath = osp.join(root,"TestGraphs", "Outputs")  
+inPath = osp.join("TestComponents", "TestSets", "WS2")
 outPath = osp.join(root,"TestGraphs", "Outputs")  
 
 Configs = pd.read_pickle(osp.join(inPath, "FieldConfigs.pkl"))