Ws1 tests

SVSModel/Data/CropCoefficientTableFull.csv

@@ -84,3 +84,6 @@ TestResidue10,24,Grain,Cereal,Wheat,Feed,Poaceae ,Triticum,astevium,,Triticum as
 TestResidue15,24,Grain,Cereal,Wheat,Feed,Poaceae ,Triticum,astevium,,Triticum astevium ,astevium ,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,50000,Total,0,0,0.5,0,15,0.1,1.5,1,1,1.5,1.5,1.5
 TestResidue30,24,Grain,Cereal,Wheat,Feed,Poaceae ,Triticum,astevium,,Triticum astevium ,astevium ,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,50000,Total,0,0,0.5,0,15,0.1,1.5,1,1,3,3,3
 TestResidue45,24,Grain,Cereal,Wheat,Feed,Poaceae ,Triticum,astevium,,Triticum astevium ,astevium ,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,50000,Total,0,0,0.5,0,15,0.1,1.5,1,1,4.5,4.5,4.5
+Parsley Vegetable General,76,Vegetable,Green,Parsley,General,Apiaceae,Petroselinum,crispum,,Petroselinum crispum,crispum,Seed,May,Vegetative,Sep,10,t/ha,Saleable product ,50000,Total,0,0,0.7,0,92,0.1,1.5,0.8,1,0.8,4,4.5
+Pumpkin Seed General,77,Seed,Fruit,Pumpkin,General,Cucurbitaceae,Cucurbita,pepo,,Cucurbita pepo ,pepo ,Seed,Oct,LateReproductive,Mar,40,t/ha,Saleable product ,50000,Total,0,0,0.8,0,88,0.1,0.8,1,1,1,1.4,2
+Tall fescue Seed Turf,78,Seed,Forage,Tall fescue,Turf,Tall fescue Seed Turf,Poaceae,Festuca,arundinacea,x,Festuca arundinacea,Seed,May,LateReproductive,Jan,1.8,t/ha,Saleable seed,1000000,Total,15,5,0.15,0.04,15,0.1,0.6,1,0.7,0.9,1.2,2

TestComponents/Test.cs

@@ -17,7 +17,17 @@
     {
         public static void RunAllTests()
         {
-            string path = Path.Join(Directory.GetCurrentDirectory(), "TestComponents", "TestSets");
+            string fullroot = AppDomain.CurrentDomain.BaseDirectory;
+            List<string> rootFrags = fullroot.Split('\\').ToList();
+            string root = "";
+            foreach (string d in rootFrags) 
+            {
+                if (d == "FieldNBalance")
+                    break;
+                else
+                    root += d + "\\";
+            }
+            string path = Path.Join(root, "FieldNBalance", "TestComponents", "TestSets");
             List<string> sets = new List<string> { "WS2", "Residues", "Location", "Moisture" };
 
             //Delete graphs from previous test run
@@ -31,15 +41,14 @@
             foreach (string graphPath in graphPaths)
                 File.Delete(graphPath);
 
-            string basePath = Directory.GetCurrentDirectory();
             foreach (string s in sets)
             {
                 //Make config file in format that .NET DataTable is able to import
-                runPythonScript(basePath, Path.Join("TestGraphs", "MakeConfigs", $"{s}.py"));
+                runPythonScript(root, Path.Join("FieldNBalance","TestGraphs", "MakeConfigs", $"{s}.py"));
                 //Run each test
                 runTestSet(path, s);
                 //Make graphs associated with each test
-                runPythonScript(basePath, Path.Join("TestGraphs", "MakeGraphs", $"{s}.py"));
+                runPythonScript(root, Path.Join("FieldNBalance", "TestGraphs", "MakeGraphs", $"{s}.py"));
             }
         }
 
@@ -57,11 +66,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)
             {
@@ -72,7 +81,7 @@
 
             foreach (DataFrameRow row in allTests.Rows)
             {
                 Tests.Add(row[0].ToString());
             }
 
             foreach (string test in Tests)
@@ -84,7 +93,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);
 
@@ -94,7 +103,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());
@@ -132,10 +141,10 @@
 
         private static void runPythonScript(string path, string pyProg)
         {
-            string newPath = Path.GetFullPath(Path.Combine(path, @"..\..\"));
-            string progToRun = pyProg;
+            string progToRun = Path.Join(path,pyProg);
 
             Process proc = new Process();
+            //proc.StartInfo.FileName = "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\Python39_64\\python.exe";
             proc.StartInfo.FileName = "python";
             proc.StartInfo.RedirectStandardOutput = true;
             proc.StartInfo.UseShellExecute = false;
@@ -232,9 +241,11 @@
             {
                 if (row[0].ToString() == site) //if this date row holds data for current site
                 {
-                    DateTime date = DateTime.ParseExact(
-                        row[1].ToString(), "d/M/yyyy", CultureInfo.InvariantCulture
-                    );
+
+                    //DateTime date = DateTime.ParseExact(
+                    //    row[1].ToString(), "d/M/yyyy", CultureInfo.InvariantCulture);
+                    DateTime date = (DateTime)row[1];
+
                     DateTime last = new DateTime();
                     if (fert.Keys.Count > 0)
                     {
@@ -242,11 +253,11 @@
                     }
                     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()));
                     }
                 }
             }