Fixing matplotlib issue with points

Plant-Food-Research-Open · Feb 8, 2024 · 85f9936 · 85f9936
1 parent 4691b79
commit 85f9936
Show file tree

Hide file tree

Showing 60 changed files with 13,052 additions and 13,005 deletions.
diff --git a/SVSModel.Tests/GlobalUsings.cs b/SVSModel.Tests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Xunit;
diff --git a/SVSModel.Tests/SVSModel.Tests.csproj b/SVSModel.Tests/SVSModel.Tests.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SVSModel.Excel\SVSModel.Excel.csproj" />
+    <ProjectReference Include="..\SVSModel\SVSModel.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/SVSModel.Tests/UnitTest1.cs b/SVSModel.Tests/UnitTest1.cs
@@ -0,0 +1,10 @@
+namespace SVSModel.Tests;
+
+public class UnitTest1
+{
+    [Fact]
+    public void Test1()
+    {
+
+    }
+}
diff --git a/SVSModel.sln b/SVSModel.sln
@@ -16,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestsConsole", "TestConsole
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestComponents", "TestComponents\TestComponents.csproj", "{B3488A79-46B6-4AE0-A327-1EFA5F850075}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SVSModel.Tests", "SVSModel.Tests\SVSModel.Tests.csproj", "{0D91C706-BC06-483E-993D-EAB30C0D62D6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,6 +42,10 @@ Global
 		{B3488A79-46B6-4AE0-A327-1EFA5F850075}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3488A79-46B6-4AE0-A327-1EFA5F850075}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3488A79-46B6-4AE0-A327-1EFA5F850075}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D91C706-BC06-483E-993D-EAB30C0D62D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D91C706-BC06-483E-993D-EAB30C0D62D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D91C706-BC06-483E-993D-EAB30C0D62D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D91C706-BC06-483E-993D-EAB30C0D62D6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TestComponents/TestSets/Location/Outputs/ashburton_Aut.csv b/TestComponents/TestSets/Location/Outputs/ashburton_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/ashburton_Spr.csv b/TestComponents/TestSets/Location/Outputs/ashburton_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/blenheim_Aut.csv b/TestComponents/TestSets/Location/Outputs/blenheim_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/blenheim_Spr.csv b/TestComponents/TestSets/Location/Outputs/blenheim_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/hastings_Aut.csv b/TestComponents/TestSets/Location/Outputs/hastings_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/hastings_Spr.csv b/TestComponents/TestSets/Location/Outputs/hastings_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/invercargill_Aut.csv b/TestComponents/TestSets/Location/Outputs/invercargill_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/invercargill_Spr.csv b/TestComponents/TestSets/Location/Outputs/invercargill_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/kerikeri_Aut.csv b/TestComponents/TestSets/Location/Outputs/kerikeri_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/kerikeri_Spr.csv b/TestComponents/TestSets/Location/Outputs/kerikeri_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/levin_Aut.csv b/TestComponents/TestSets/Location/Outputs/levin_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/levin_Spr.csv b/TestComponents/TestSets/Location/Outputs/levin_Spr.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Dry_Full.csv b/TestComponents/TestSets/Moisture/OutPuts/Dry_Full.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Dry_None.csv b/TestComponents/TestSets/Moisture/OutPuts/Dry_None.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Dry_Some.csv b/TestComponents/TestSets/Moisture/OutPuts/Dry_Some.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Typical_Full.csv b/TestComponents/TestSets/Moisture/OutPuts/Typical_Full.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Typical_None.csv b/TestComponents/TestSets/Moisture/OutPuts/Typical_None.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Typical_Some.csv b/TestComponents/TestSets/Moisture/OutPuts/Typical_Some.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/VeryDry_Full.csv b/TestComponents/TestSets/Moisture/OutPuts/VeryDry_Full.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/VeryDry_None.csv b/TestComponents/TestSets/Moisture/OutPuts/VeryDry_None.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/VeryDry_Some.csv b/TestComponents/TestSets/Moisture/OutPuts/VeryDry_Some.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/VeryWet_Full.csv b/TestComponents/TestSets/Moisture/OutPuts/VeryWet_Full.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/VeryWet_None.csv b/TestComponents/TestSets/Moisture/OutPuts/VeryWet_None.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/VeryWet_Some.csv b/TestComponents/TestSets/Moisture/OutPuts/VeryWet_Some.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Wet_Full.csv b/TestComponents/TestSets/Moisture/OutPuts/Wet_Full.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Wet_None.csv b/TestComponents/TestSets/Moisture/OutPuts/Wet_None.csv
diff --git a/TestComponents/TestSets/Moisture/OutPuts/Wet_Some.csv b/TestComponents/TestSets/Moisture/OutPuts/Wet_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Dry_Full.csv b/TestComponents/TestSets/Moisture/Outputs/Dry_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Dry_None.csv b/TestComponents/TestSets/Moisture/Outputs/Dry_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Dry_Some.csv b/TestComponents/TestSets/Moisture/Outputs/Dry_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Typical_Full.csv b/TestComponents/TestSets/Moisture/Outputs/Typical_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Typical_None.csv b/TestComponents/TestSets/Moisture/Outputs/Typical_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Typical_Some.csv b/TestComponents/TestSets/Moisture/Outputs/Typical_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryDry_Full.csv b/TestComponents/TestSets/Moisture/Outputs/VeryDry_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryDry_None.csv b/TestComponents/TestSets/Moisture/Outputs/VeryDry_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryDry_Some.csv b/TestComponents/TestSets/Moisture/Outputs/VeryDry_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryWet_Full.csv b/TestComponents/TestSets/Moisture/Outputs/VeryWet_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryWet_None.csv b/TestComponents/TestSets/Moisture/Outputs/VeryWet_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryWet_Some.csv b/TestComponents/TestSets/Moisture/Outputs/VeryWet_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Wet_Full.csv b/TestComponents/TestSets/Moisture/Outputs/Wet_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Wet_None.csv b/TestComponents/TestSets/Moisture/Outputs/Wet_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Wet_Some.csv b/TestComponents/TestSets/Moisture/Outputs/Wet_Some.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN0.5High.csv b/TestComponents/TestSets/Residues/Outputs/StovN0.5High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN0.5Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN0.5Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.0High.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.0High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.0Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.0Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.5High.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.5High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.5Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.5Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN3.0High.csv b/TestComponents/TestSets/Residues/Outputs/StovN3.0High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN3.0Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN3.0Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN4.5High.csv b/TestComponents/TestSets/Residues/Outputs/StovN4.5High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN4.5Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN4.5Low.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/8Oat.csv b/TestComponents/TestSets/WS2/Outputs/8Oat.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/8Peas.csv b/TestComponents/TestSets/WS2/Outputs/8Peas.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/8Wheat.csv b/TestComponents/TestSets/WS2/Outputs/8Wheat.csv
diff --git a/TestGraphs/MakeGraphs/Moisture.py b/TestGraphs/MakeGraphs/Moisture.py
@@ -37,7 +37,7 @@
 
 # Path for current Tests
 
-inPath = join("TestComponents", "TestSets", "Moisture", "OutPuts")
+inPath = join("TestComponents", "TestSets", "Moisture", "Outputs")
 outPath = join("TestGraphs", "Outputs")  
 
 # Get names and results from each test
@@ -54,12 +54,12 @@
 # +
 Alltests =[]
 for t in testFiles[:]:  
-    testframe = pd.read_csv(join(inPath, t),index_col=0,dayfirst=True,date_format='%d/%m/%Y %H:%M:%S %p')  
+    testframe = pd.read_csv(join(inPath, t),index_col=0,dayfirst=False,date_format='%m/%d/%Y %H:%M:%S')  
     Alltests.append(testframe)   
 
 AllData = pd.concat(Alltests,axis=1,keys=tests)
 AllData.sort_index(axis=0,inplace=True)
-AllData.index = pd.to_datetime(AllData.index)
+AllData.index = pd.to_datetime(AllData.index, dayfirst=False)
 # -
 
 AllData.columns