Smaller fixes

TestComponents/Test.cs

@@ -41,12 +41,12 @@
             }
             else
             {
                 root = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE");
                 path = Path.Join(root, "TestComponents", "TestSets");
             }
 
 
-            List<string> sets = new List<string> { "WS2", "Residues", "Location", "Moisture", "Losses" };
+            List<string> sets = new List<string> {"WS1", "WS2", "Residues", "Location", "Moisture", "Losses" };
 
             //Delete graphs from previous test run
             string graphFolder = Path.Join(Directory.GetCurrentDirectory(), "TestGraphs", "Outputs");
@@ -62,7 +62,7 @@
             foreach (string s in sets)
             {
                 //Make config file in format that .NET DataTable is able to import
                 runPythonScript(root, Path.Join("TestGraphs", "MakeConfigs", $"{s}.py"));
                 //Run each test
                 runTestSet(path, s);
                 //Make graphs associated with each test
@@ -84,11 +84,11 @@
 
             var assembly = Assembly.GetExecutingAssembly();
             string testConfig = "TestComponents.TestSets." + set + ".FieldConfigs.csv";
             Stream configcsv = assembly.GetManifestResourceStream(testConfig);
             DataFrame allTests = DataFrame.LoadCsv(configcsv);
 
             string fertData = "TestComponents.TestSets." + set + ".FertiliserData.csv";
             Stream fertcsv = assembly.GetManifestResourceStream(fertData);
             DataFrame allFert = new DataFrame();
             if (fertcsv != null)
             {
@@ -99,7 +99,7 @@
 
             foreach (DataFrameRow row in allTests.Rows)
             {
                 Tests.Add(row[0].ToString());
             }
 
             foreach (string test in Tests)
@@ -111,7 +111,7 @@
                 Dictionary<System.DateTime, double> testResults = new Dictionary<System.DateTime, double>();
                 Dictionary<System.DateTime, double> nApplied = fertDict(test, allFert);
 
                 string weatherStation = allTests["WeatherStation"][testRow].ToString();
 
                 MetDataDictionaries metData = ModelInterface.BuildMetDataDictionaries(_config.Prior.EstablishDate, _config.Following.HarvestDate.AddDays(1), weatherStation);
 
@@ -121,7 +121,7 @@
                 List<string> OutPutHeaders = new List<string>();
                 for (int i = 0; i < output.GetLength(1); i += 1)
                 {
                     OutPutHeaders.Add(output[0, i].ToString());
                     if (i == 0)
                     {
                         columns[i] = new PrimitiveDataFrameColumn<System.DateTime>(output[0, i].ToString());
@@ -258,6 +258,8 @@
         {
             Dictionary<System.DateTime, double> fert = new Dictionary<System.DateTime, double>();
             string site = Regex.Replace(test, "[^0-9]", "");
+            if (site.Length > 1)
+                site = test;
 
             foreach (DataFrameRow row in allFert.Rows)
             {
@@ -273,13 +275,13 @@
                     {
                         last = fert.Keys.Last();
                     }
                     if (date == last) //If alread fertiliser added for that date add it to existing total
                     {
                         fert[last] += Double.Parse(row[2].ToString());
                     }
                     else //add it to a new date
                     {
                         fert.Add(date, Double.Parse(row[2].ToString()));
                     }
                 }
             }

TestComponents/TestComponents.csproj

@@ -17,6 +17,8 @@
     <None Remove="TestSets\Moisture\FieldConfigs.csv" />
     <None Remove="TestSets\Residues\FieldConfigs.csv" />
     <None Remove="TestSets\SensibilityResidueCompConfig.csv" />
+    <None Remove="TestSets\WS1\FertiliserData.csv" />
+    <None Remove="TestSets\WS1\FieldConfigs.csv" />
     <None Remove="TestSets\WS2\CropData.csv" />
     <None Remove="TestSets\WS2\FertiliserData.csv" />
     <None Remove="TestSets\WS2\FieldConfigs.csv" />
@@ -30,6 +32,8 @@
     <EmbeddedResource Include="TestSets\Losses\FieldConfigs.csv" />
     <EmbeddedResource Include="TestSets\Moisture\FieldConfigs.csv" />
     <EmbeddedResource Include="TestSets\Residues\FieldConfigs.csv" />
+    <EmbeddedResource Include="TestSets\WS1\FertiliserData.csv" />
+    <EmbeddedResource Include="TestSets\WS1\FieldConfigs.csv" />
     <EmbeddedResource Include="TestSets\WS2\CropData.csv" />
     <EmbeddedResource Include="TestSets\WS2\FertiliserData.csv" />
     <EmbeddedResource Include="TestSets\WS2\FieldConfigs.csv" />

TestGraphs/MakeConfigs/WS1.ipynb

@@ -0,0 +1,129 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "5d0cd442-4d73-4aaa-90f0-63dd7945be5f",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "import pandas as pd"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "9f1dfee6-ad9f-4a0e-8324-31498e929c91",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "Sites = {\n",
+    " 1: 'LincolnRot1',\n",
+    " 2: 'LincolnRot2',\n",
+    " 3: 'HawksBayRot3',\n",
+    " 4: 'HawksBayRot4'\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "id": "83ad032a-d4db-4bb3-b289-c9c5679888dc",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "try: \n",
+    "    if os.environ[\"GITHUB_WORKSPACE\"] != None:\n",
+    "        root = os.environ[\"GITHUB_WORKSPACE\"]\n",
+    "        path = os.path.join(root,\"TestComponents\", \"TestSets\", \"WS1\")\n",
+    "except:\n",
+    "    rootfrags = os.path.abspath('WS1.py').split(\"\\\\\")\n",
+    "    root = \"\"\n",
+    "    for d in rootfrags:\n",
+    "        if d == \"FieldNBalance\":\n",
+    "            break\n",
+    "        else:\n",
+    "            root += d + \"\\\\\"\n",
+    "    path = os.path.join(root,\"FieldNBalance\",\"TestComponents\", \"TestSets\", \"WS1\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "cb5c353f",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "Configs = pd.read_excel(os.path.join(path, \"FieldConfigs.xlsx\"),sheet_name=Sites[1],nrows=45,usecols=lambda x: 'Unnamed' not in x,keep_default_na=False)\n",
+    "Configs.set_index('Name',inplace=True)\n",
+    "for s in range(1,5):\n",
+    "    sites = pd.read_excel(os.path.join(path, \"FieldConfigs.xlsx\"),sheet_name=Sites[s],nrows=45,usecols=lambda x: 'Unnamed' not in x,keep_default_na=False)\n",
+    "    sites.set_index('Name',inplace=True)\n",
+    "    if s != 1:\n",
+    "        Configs = pd.concat([Configs,sites],axis=1)\n",
+    "    #set the other N treatments\n",
+    "    nlast = \"_N1_\"\n",
+    "    for n in [\"_N2_\",\"_N3_\",\"_N4_\"]:\n",
+    "        sites.columns = [sites.columns[x].replace(nlast,n) for x in range(sites.columns.size)]\n",
+    "        Configs = pd.concat([Configs,sites],axis=1)\n",
+    "        nlast = n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "id": "f1eb965a-7faa-4228-8052-754213d42587",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "CSConfigs = Configs.transpose()\n",
+    "CSConfigs.to_csv(os.path.join(path, \"FieldConfigs.csv\"),header=True)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "id": "acea3a05-e847-42d0-afa6-82245a56da6a",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "Configs.to_pickle(os.path.join(path, \"FieldConfigs.pkl\"))"
+   ]
+  }
+ ],
+ "metadata": {
+  "jupytext": {
+   "formats": "ipynb,py:light"
+  },
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.10.13"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

TestGraphs/MakeConfigs/WS1.py

@@ -0,0 +1,57 @@
+# ---
+# jupyter:
+#   jupytext:
+#     formats: ipynb,py:light
+#     text_representation:
+#       extension: .py
+#       format_name: light
+#       format_version: '1.5'
+#       jupytext_version: 1.15.0
+#   kernelspec:
+#     display_name: Python 3 (ipykernel)
+#     language: python
+#     name: python3
+# ---
+
+import os
+import pandas as pd
+
+Sites = {
+ 1: 'LincolnRot1',
+ 2: 'LincolnRot2',
+ 3: 'HawksBayRot3',
+ 4: 'HawksBayRot4'
+}
+
+try: 
+    if os.environ["GITHUB_WORKSPACE"] != None:
+        root = os.environ["GITHUB_WORKSPACE"]
+        path = os.path.join(root,"TestComponents", "TestSets", "WS1")
+except:
+    rootfrags = os.path.abspath('WS1.py').split("\\")
+    root = ""
+    for d in rootfrags:
+        if d == "FieldNBalance":
+            break
+        else:
+            root += d + "\\"
+    path = os.path.join(root,"FieldNBalance","TestComponents", "TestSets", "WS1")
+
+Configs = pd.read_excel(os.path.join(path, "FieldConfigs.xlsx"),sheet_name=Sites[1],nrows=45,usecols=lambda x: 'Unnamed' not in x,keep_default_na=False)
+Configs.set_index('Name',inplace=True)
+for s in range(1,5):
+    sites = pd.read_excel(os.path.join(path, "FieldConfigs.xlsx"),sheet_name=Sites[s],nrows=45,usecols=lambda x: 'Unnamed' not in x,keep_default_na=False)
+    sites.set_index('Name',inplace=True)
+    if s != 1:
+        Configs = pd.concat([Configs,sites],axis=1)
+    #set the other N treatments
+    nlast = "_N1_"
+    for n in ["_N2_","_N3_","_N4_"]:
+        sites.columns = [sites.columns[x].replace(nlast,n) for x in range(sites.columns.size)]
+        Configs = pd.concat([Configs,sites],axis=1)
+        nlast = n
+
+CSConfigs = Configs.transpose()
+CSConfigs.to_csv(os.path.join(path, "FieldConfigs.csv"),header=True)
+
+Configs.to_pickle(os.path.join(path, "FieldConfigs.pkl"))