Skip to content

Commit

Permalink
Merge pull request #31 from HamishBrownPFR/SmallerFixes
Browse files Browse the repository at this point in the history
Smaller fixes
  • Loading branch information
HamishBrownPFR authored May 7, 2024
2 parents c7b3bf6 + 33b66f5 commit a49649c
Show file tree
Hide file tree
Showing 224 changed files with 99,888 additions and 40,765 deletions.
Binary file modified Prototype_V3.4.xlsm
Binary file not shown.
66 changes: 33 additions & 33 deletions SVSModel/Data/CropCoefficientTableFull.csv

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion TestComponents/Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static void RunAllTests()
}


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");
Expand Down Expand Up @@ -258,6 +258,8 @@ private static int getTestRow(string test, DataFrame allTests)
{
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)
{
Expand Down
4 changes: 4 additions & 0 deletions TestComponents/TestComponents.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
498 changes: 249 additions & 249 deletions TestComponents/TestSets/Location/Outputs/ashburton_Aut.csv

Large diffs are not rendered by default.

420 changes: 210 additions & 210 deletions TestComponents/TestSets/Location/Outputs/ashburton_Spr.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Location/Outputs/blenheim_Aut.csv

Large diffs are not rendered by default.

420 changes: 210 additions & 210 deletions TestComponents/TestSets/Location/Outputs/blenheim_Spr.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Location/Outputs/hastings_Aut.csv

Large diffs are not rendered by default.

420 changes: 210 additions & 210 deletions TestComponents/TestSets/Location/Outputs/hastings_Spr.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Location/Outputs/invercargill_Aut.csv

Large diffs are not rendered by default.

420 changes: 210 additions & 210 deletions TestComponents/TestSets/Location/Outputs/invercargill_Spr.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Location/Outputs/kerikeri_Aut.csv

Large diffs are not rendered by default.

420 changes: 210 additions & 210 deletions TestComponents/TestSets/Location/Outputs/kerikeri_Spr.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Location/Outputs/levin_Aut.csv

Large diffs are not rendered by default.

420 changes: 210 additions & 210 deletions TestComponents/TestSets/Location/Outputs/levin_Spr.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lauder_Base.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lauder_LowYield.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lauder_Rocks.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lauder_VeryDry.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lauder_VeryWet.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Levin_Base.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Levin_LowYield.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Levin_Rocks.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Levin_VeryDry.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Levin_VeryWet.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lincoln_Base.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lincoln_LowYield.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lincoln_Rocks.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lincoln_VeryDry.csv

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions TestComponents/TestSets/Losses/Outputs/Lincoln_VeryWet.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Dry_Full.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Dry_None.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Dry_Some.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Typical_Full.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Typical_None.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Typical_Some.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/VeryDry_Full.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/VeryDry_None.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/VeryDry_Some.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/VeryWet_Full.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/VeryWet_None.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/VeryWet_Some.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Wet_Full.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Wet_None.csv

Large diffs are not rendered by default.

824 changes: 412 additions & 412 deletions TestComponents/TestSets/Moisture/Outputs/Wet_Some.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN0.5High.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN0.5Low.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN1.0High.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN1.0Low.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN1.5High.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN1.5Low.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN3.0High.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN3.0Low.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN4.5High.csv

Large diffs are not rendered by default.

498 changes: 249 additions & 249 deletions TestComponents/TestSets/Residues/Outputs/StovN4.5Low.csv

Large diffs are not rendered by default.

429 changes: 429 additions & 0 deletions TestComponents/TestSets/WS1/CropData.csv

Large diffs are not rendered by default.

259 changes: 259 additions & 0 deletions TestComponents/TestSets/WS1/FertiliserData.csv

Large diffs are not rendered by default.

121 changes: 121 additions & 0 deletions TestComponents/TestSets/WS1/FieldConfigs.csv

Large diffs are not rendered by default.

Binary file added TestComponents/TestSets/WS1/FieldConfigs.pkl
Binary file not shown.
Binary file added TestComponents/TestSets/WS1/FieldConfigs.xlsx
Binary file not shown.
488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr1_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr1_Ryegrass.csv

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr2_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr2_Ryegrass.csv

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr1_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr1_Ryegrass.csv

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr2_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr2_Ryegrass.csv

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr1_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr1_Ryegrass.csv

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr2_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr2_Ryegrass.csv

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr1_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr1_Ryegrass.csv

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr2_Onion.csv

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr2_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr1_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr1_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr1_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr2_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr2_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr2_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N1_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr1_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr1_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr1_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr2_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr2_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr2_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N2_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr1_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr1_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr1_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr2_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr2_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr2_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N3_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr1_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr1_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr1_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr2_GreenPea.csv

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr2_Lettuce.csv

Large diffs are not rendered by default.

386 changes: 386 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr2_PakChoi.csv

Large diffs are not rendered by default.

655 changes: 655 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/HawkesBayRot4_N4_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr1_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr1_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr1_Wheat.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr2_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr2_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N1_Irr2_Wheat.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr1_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr1_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr1_Wheat.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr2_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr2_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N2_Irr2_Wheat.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr1_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr1_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr1_Wheat.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr2_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr2_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N3_Irr2_Wheat.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr1_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr1_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr1_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr1_Wheat.csv

Large diffs are not rendered by default.

407 changes: 407 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr2_Broccoli.csv

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr2_Onion.csv

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr2_Ryegrass.csv

Large diffs are not rendered by default.

476 changes: 476 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot1_N4_Irr2_Wheat.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr1_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr1_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr1_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr1_RyeGrass.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr2_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr2_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr2_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N1_Irr2_RyeGrass.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr1_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr1_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr1_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr1_RyeGrass.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr2_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr2_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr2_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N2_Irr2_RyeGrass.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr1_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr1_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr1_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr1_RyeGrass.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr2_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr2_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr2_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N3_Irr2_RyeGrass.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr1_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr1_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr1_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr1_RyeGrass.csv

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr2_Oat.csv

Large diffs are not rendered by default.

304 changes: 304 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr2_PakChoi.csv

Large diffs are not rendered by default.

528 changes: 528 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr2_Potato.csv

Large diffs are not rendered by default.

543 changes: 543 additions & 0 deletions TestComponents/TestSets/WS1/Outputs/LincolnRot2_N4_Irr2_RyeGrass.csv

Large diffs are not rendered by default.

612 changes: 612 additions & 0 deletions TestComponents/TestSets/WS1/SoilData.csv

Large diffs are not rendered by default.

830 changes: 415 additions & 415 deletions TestComponents/TestSets/WS2/Outputs/1-1Rye-A.csv

Large diffs are not rendered by default.

928 changes: 464 additions & 464 deletions TestComponents/TestSets/WS2/Outputs/1-2Rye-AB.csv

Large diffs are not rendered by default.

1,908 changes: 954 additions & 954 deletions TestComponents/TestSets/WS2/Outputs/1-3Oni-A.csv

Large diffs are not rendered by default.

1,646 changes: 823 additions & 823 deletions TestComponents/TestSets/WS2/Outputs/1-4Gra-A.csv

Large diffs are not rendered by default.

1,064 changes: 532 additions & 532 deletions TestComponents/TestSets/WS2/Outputs/2-1Bar-A.csv

Large diffs are not rendered by default.

1,148 changes: 574 additions & 574 deletions TestComponents/TestSets/WS2/Outputs/2-2Oni-A.csv

Large diffs are not rendered by default.

976 changes: 488 additions & 488 deletions TestComponents/TestSets/WS2/Outputs/2-3Cauli-A.csv

Large diffs are not rendered by default.

1,292 changes: 646 additions & 646 deletions TestComponents/TestSets/WS2/Outputs/2-4Pot-B.csv

Large diffs are not rendered by default.

1,284 changes: 642 additions & 642 deletions TestComponents/TestSets/WS2/Outputs/3-1Must-A.csv

Large diffs are not rendered by default.

1,372 changes: 686 additions & 686 deletions TestComponents/TestSets/WS2/Outputs/3-2Car-A.csv

Large diffs are not rendered by default.

1,596 changes: 798 additions & 798 deletions TestComponents/TestSets/WS2/Outputs/3-3Oni-A.csv

Large diffs are not rendered by default.

1,550 changes: 775 additions & 775 deletions TestComponents/TestSets/WS2/Outputs/3-4Oni-B.csv

Large diffs are not rendered by default.

952 changes: 476 additions & 476 deletions TestComponents/TestSets/WS2/Outputs/4-2Caul-A.csv

Large diffs are not rendered by default.

1,176 changes: 588 additions & 588 deletions TestComponents/TestSets/WS2/Outputs/4-3Maize-A.csv

Large diffs are not rendered by default.

1,020 changes: 510 additions & 510 deletions TestComponents/TestSets/WS2/Outputs/4-4Oni-A.csv

Large diffs are not rendered by default.

614 changes: 307 additions & 307 deletions TestComponents/TestSets/WS2/Outputs/4-5Pot-B.csv

Large diffs are not rendered by default.

964 changes: 482 additions & 482 deletions TestComponents/TestSets/WS2/Outputs/5-1Pot-A.csv

Large diffs are not rendered by default.

1,190 changes: 595 additions & 595 deletions TestComponents/TestSets/WS2/Outputs/5-2Oni-A.csv

Large diffs are not rendered by default.

1,218 changes: 609 additions & 609 deletions TestComponents/TestSets/WS2/Outputs/5-3Gra-A.csv

Large diffs are not rendered by default.

1,190 changes: 595 additions & 595 deletions TestComponents/TestSets/WS2/Outputs/5-4Pot-B.csv

Large diffs are not rendered by default.

792 changes: 396 additions & 396 deletions TestComponents/TestSets/WS2/Outputs/6-1Maize-A.csv

Large diffs are not rendered by default.

648 changes: 324 additions & 324 deletions TestComponents/TestSets/WS2/Outputs/6-2Gra-A.csv

Large diffs are not rendered by default.

576 changes: 288 additions & 288 deletions TestComponents/TestSets/WS2/Outputs/6-3Cab-A.csv

Large diffs are not rendered by default.

638 changes: 319 additions & 319 deletions TestComponents/TestSets/WS2/Outputs/6-4Gra-B.csv

Large diffs are not rendered by default.

792 changes: 396 additions & 396 deletions TestComponents/TestSets/WS2/Outputs/6-5Wat-A.csv

Large diffs are not rendered by default.

1,208 changes: 604 additions & 604 deletions TestComponents/TestSets/WS2/Outputs/6-6Pars-A.csv

Large diffs are not rendered by default.

464 changes: 232 additions & 232 deletions TestComponents/TestSets/WS2/Outputs/7-1BS-A.csv

Large diffs are not rendered by default.

722 changes: 361 additions & 361 deletions TestComponents/TestSets/WS2/Outputs/7-2Gra-A.csv

Large diffs are not rendered by default.

784 changes: 392 additions & 392 deletions TestComponents/TestSets/WS2/Outputs/7-3BS-B.csv

Large diffs are not rendered by default.

764 changes: 382 additions & 382 deletions TestComponents/TestSets/WS2/Outputs/7-4Gra-B.csv

Large diffs are not rendered by default.

900 changes: 450 additions & 450 deletions TestComponents/TestSets/WS2/Outputs/7-5BS-C.csv

Large diffs are not rendered by default.

880 changes: 440 additions & 440 deletions TestComponents/TestSets/WS2/Outputs/7-6Gra-C.csv

Large diffs are not rendered by default.

1,358 changes: 679 additions & 679 deletions TestComponents/TestSets/WS2/Outputs/8-1Wheat.csv

Large diffs are not rendered by default.

1,110 changes: 555 additions & 555 deletions TestComponents/TestSets/WS2/Outputs/8-2Peas.csv

Large diffs are not rendered by default.

710 changes: 355 additions & 355 deletions TestComponents/TestSets/WS2/Outputs/8-3Oat.csv

Large diffs are not rendered by default.

1,036 changes: 518 additions & 518 deletions TestComponents/TestSets/WS2/Outputs/9-1Pumpkin.csv

Large diffs are not rendered by default.

1,404 changes: 702 additions & 702 deletions TestComponents/TestSets/WS2/Outputs/9-2TurfGrass.csv

Large diffs are not rendered by default.

1,460 changes: 730 additions & 730 deletions TestComponents/TestSets/WS2/Outputs/9-3Broccoli.csv

Large diffs are not rendered by default.

129 changes: 129 additions & 0 deletions TestGraphs/MakeConfigs/WS1.ipynb
Original file line number Diff line number Diff line change
@@ -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
}
57 changes: 57 additions & 0 deletions TestGraphs/MakeConfigs/WS1.py
Original file line number Diff line number Diff line change
@@ -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"))
Loading

0 comments on commit a49649c

Please sign in to comment.