Skip to content

Fixed exception thrown when no SW is specified when displaying a graph. #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ric394 merged 1 commit into from
Oct 26, 2025
Merged

Fixed exception thrown when no SW is specified when displaying a graph. #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion API/Services/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public static Graph ToGraph(this Models.Soil soil, double[] thickness = null,
.Multiply(soil.Water.Thickness).Sum();

// To stop the sw line crossing over ll, constrain it to ll.
var swConstainedToLL = sw.LowerConstraint(ll);
var swConstainedToLL = sw?.LowerConstraint(ll);
return SoilGraph.Create(soil.Name, soil.Water.Thickness.ToMidPoints(), soil.Water.AirDry, soil.Water.LL15,
soil.Water.DUL, soil.Water.SAT, ll, cropName, pawc, paw, thickness?.ToMidPoints(), swConstainedToLL);
}
Expand Down
13 changes: 13 additions & 0 deletions Tests/UnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,17 @@ public void ToAPSIMSoil_ShouldPopulateAllMembers()
var apsimSoilXml = soil.ToAPSIMSoil().ToXML();
Assert.That(apsimSoilXml, Is.EqualTo(ResourceFile.Get("Tests.testsoil1.apsim.xml")));
}

[Test]
public void ToGraph_ShouldWorkWithoutSWSpecified()
{
var soil = ResourceFile.FromResourceXML<API.Models.Soil>("Tests.testsoil1.xml");

var graph = soil.ToGraph();
Assert.That(graph, Is.Not.Null);

// should be 5 graph series:
// shaded bucket, ll, airdry, dul, sat
Assert.That(graph.Series.Count, Is.EqualTo(5));
}
}