Merge pull request #405 from hut104/Agroforestry

Agroforestry
APSIMInitiative · Oct 2, 2015 · 7cb7d88 · 7cb7d88
2 parents 58bff4f + 9321b34
commit 7cb7d88
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 27 deletions.
diff --git a/Models/Agroforestry/ForestrySystem.cs → Models/Agroforestry/AgroforestrySystem.cs b/Models/Agroforestry/ForestrySystem.cs → Models/Agroforestry/AgroforestrySystem.cs
@@ -19,7 +19,7 @@ namespace Models.Agroforestry
     [ViewName("UserInterface.Views.GridView")]
     [PresenterName("UserInterface.Presenters.PropertyPresenter")]
     [ValidParent(ParentModels = new Type[] { typeof(Simulation), typeof(Zone) })]
-    public class ForestrySystem : Zone
+    public class AgroforestrySystem : Zone
     {
         /// <summary>
         /// Return the area of the zone.

diff --git a/Models/Core/Model.cs b/Models/Core/Model.cs
@@ -46,7 +46,7 @@ public Model()
         [XmlElement(typeof(ModelCollectionFromResource))]
         [XmlElement(typeof(Models.Agroforestry.LocalMicroClimate))]
         [XmlElement(typeof(Models.Agroforestry.TreeProxy))]
-        [XmlElement(typeof(Models.Agroforestry.ForestrySystem))]
+        [XmlElement(typeof(Models.Agroforestry.AgroforestrySystem))]
         [XmlElement(typeof(Models.Graph.Graph))]
         [XmlElement(typeof(Models.Graph.Series))]
         [XmlElement(typeof(Models.Graph.Regression))]

diff --git a/Models/Core/Zone.cs b/Models/Core/Zone.cs
@@ -16,7 +16,7 @@ namespace Models.Core
     [ViewName("UserInterface.Views.GridView")]
     [PresenterName("UserInterface.Presenters.PropertyPresenter")]
     [Serializable]
-    [ValidParent(ParentModels = new Type[] { typeof(Simulation), typeof(Agroforestry.ForestrySystem) })]
+    [ValidParent(ParentModels = new Type[] { typeof(Simulation), typeof(Agroforestry.AgroforestrySystem) })]
     public class Zone : Model
     {
         /// <summary>Area of the zone.</summary>

diff --git a/Models/Manager.cs b/Models/Manager.cs
@@ -16,7 +16,7 @@ namespace Models
     [Serializable]
     [ViewName("UserInterface.Views.ManagerView")]
     [PresenterName("UserInterface.Presenters.ManagerPresenter")]
-    [ValidParent(ParentModels=new Type[] { typeof(Simulation), typeof(Zone), typeof(Zones.RectangularZone), typeof(Zones.CircularZone), typeof(Agroforestry.ForestrySystem) })]
+    [ValidParent(ParentModels=new Type[] { typeof(Simulation), typeof(Zone), typeof(Zones.RectangularZone), typeof(Zones.CircularZone), typeof(Agroforestry.AgroforestrySystem) })]
     public class Manager : Model
     {
         // ----------------- Privates

diff --git a/Models/Models.csproj b/Models/Models.csproj
@@ -98,7 +98,7 @@
     <Compile Include="AgPasture.cs" />
     <Compile Include="AgPasture\AgPasture1.Sward.cs" />
     <Compile Include="AgPasture\AgPasture1.PastureSpecies.cs" />
-    <Compile Include="Agroforestry\ForestrySystem.cs" />
+    <Compile Include="Agroforestry\AgroforestrySystem.cs" />
     <Compile Include="Agroforestry\LocalMicroClimate.cs" />
     <Compile Include="Agroforestry\TreeProxy.cs" />
     <Compile Include="Aqua\FoodInPond.cs" />

diff --git a/Models/Zones/CircularZone.cs b/Models/Zones/CircularZone.cs
@@ -12,7 +12,7 @@ namespace Models.Zones
     [Serializable]
     [ViewName("UserInterface.Views.GridView")]
     [PresenterName("UserInterface.Presenters.PropertyPresenter")]
-    [ValidParent(ParentModels = new Type[] { typeof(Zone), typeof(Simulation), typeof(Agroforestry.ForestrySystem) })]
+    [ValidParent(ParentModels = new Type[] { typeof(Zone), typeof(Simulation), typeof(Agroforestry.AgroforestrySystem) })]
     public class CircularZone : Zone
     {
         /// <summary>Radius of the zone.</summary>
@@ -32,8 +32,8 @@ public double Distance
         {
             get
             {
-                if (Parent is ForestrySystem)
-                    return (Parent as ForestrySystem).GetDistanceFromTrees(this);
+                if (Parent is AgroforestrySystem)
+                    return (Parent as AgroforestrySystem).GetDistanceFromTrees(this);
                 throw new ApsimXException(this, "Not implemented for this system");
             }
         }

diff --git a/Models/Zones/RectangularZone.cs b/Models/Zones/RectangularZone.cs
@@ -12,7 +12,7 @@ namespace Models.Zones
     [Serializable]
     [ViewName("UserInterface.Views.GridView")]
     [PresenterName("UserInterface.Presenters.PropertyPresenter")]
-    [ValidParent(ParentModels = new Type[] { typeof(Zone), typeof(Simulation), typeof(Agroforestry.ForestrySystem) })]
+    [ValidParent(ParentModels = new Type[] { typeof(Zone), typeof(Simulation), typeof(Agroforestry.AgroforestrySystem) })]
     public class RectangularZone : Zone
     {
         /// <summary>Length of the zone.</summary>
@@ -32,8 +32,8 @@ public double Distance
         {
             get
             {
-                if (Parent is ForestrySystem)
-                    return (Parent as ForestrySystem).GetDistanceFromTrees(this);
+                if (Parent is AgroforestrySystem)
+                    return (Parent as AgroforestrySystem).GetDistanceFromTrees(this);
                 throw new ApsimXException(this, "Not implemented for this system");
             }
         }

diff --git a/Prototypes/Agroforestry/AgroforestryExample.apsimx b/Prototypes/Agroforestry/AgroforestryExample.apsimx
@@ -18,7 +18,7 @@
     <SoilArbitrator>
       <Name>Soil Arbitrator</Name>
     </SoilArbitrator>
-    <ForestrySystem>
+    <AgroforestrySystem>
       <Name>WindbreakSystem</Name>
       <TreeProxy>
         <Name>TreeProxy</Name>
@@ -3363,7 +3363,7 @@ namespace Models
       </Graph>
       <Area>0.25</Area>
       <Slope>0</Slope>
-    </ForestrySystem>
+    </AgroforestrySystem>
     <Area>0</Area>
     <Slope>0</Slope>
   </Simulation>
@@ -3384,7 +3384,7 @@ namespace Models
     <SoilArbitrator>
       <Name>Soil Arbitrator</Name>
     </SoilArbitrator>
-    <ForestrySystem>
+    <AgroforestrySystem>
       <Name>WindbreakSystem</Name>
       <TreeProxy>
         <Name>TreeProxy</Name>
@@ -10877,7 +10877,7 @@ namespace Models
       </Graph>
       <Area>3.05</Area>
       <Slope>0</Slope>
-    </ForestrySystem>
+    </AgroforestrySystem>
     <Area>0</Area>
     <Slope>0</Slope>
   </Simulation>
@@ -10949,7 +10949,7 @@ namespace Models
     <SoilArbitrator>
       <Name>Soil Arbitrator</Name>
     </SoilArbitrator>
-    <ForestrySystem>
+    <AgroforestrySystem>
       <Name>SingleTreeSystem</Name>
       <TreeProxy>
         <Name>TreeProxy</Name>
@@ -13909,7 +13909,7 @@ namespace Models
       </Graph>
       <Area>0.19634954084936207</Area>
       <Slope>0</Slope>
-    </ForestrySystem>
+    </AgroforestrySystem>
     <Area>0</Area>
     <Slope>0</Slope>
   </Simulation>
@@ -13932,7 +13932,7 @@ namespace Models
       <SoilArbitrator>
         <Name>Soil Arbitrator</Name>
       </SoilArbitrator>
-      <ForestrySystem>
+      <AgroforestrySystem>
         <Name>WindbreakSystem</Name>
         <TreeProxy>
           <Name>TreeProxy</Name>
@@ -18455,7 +18455,7 @@ namespace Models
         </Graph>
         <Area>0.54999999999999993</Area>
         <Slope>0</Slope>
-      </ForestrySystem>
+      </AgroforestrySystem>
       <Area>0</Area>
       <Slope>0</Slope>
     </Simulation>

diff --git a/Prototypes/Agroforestry/Agroforestry.apsimx → ...es/Agroforestry/AgroforestrySystem.apsimx b/Prototypes/Agroforestry/Agroforestry.apsimx → ...es/Agroforestry/AgroforestrySystem.apsimx
@@ -350,6 +350,12 @@
       </EventNames>
       <ResultsPerPage>0</ResultsPerPage>
     </Report>
+    <Plant15>
+      <Name>Wheat</Name>
+      <ResourceName>Wheat</ResourceName>
+      <AutoHarvest>true</AutoHarvest>
+      <CropType>Wheat</CropType>
+    </Plant15>
   </Replacements>
   <DataStore>
     <Name>DataStore</Name>
@@ -388,7 +394,7 @@
       <SoilArbitrator>
         <Name>Soil Arbitrator</Name>
       </SoilArbitrator>
-      <ForestrySystem>
+      <AgroforestrySystem>
         <Name>WindbreakSystem</Name>
         <Manager>
           <Name>SowingRule</Name>
@@ -4152,9 +4158,49 @@ namespace Models
           <DisabledSeries />
           <IncludeInDocumentation>false</IncludeInDocumentation>
         </Graph>
+        <Graph>
+          <Name>SW90cm</Name>
+          <Series>
+            <Name>Series1</Name>
+            <Type>Scatter</Type>
+            <XAxis>Bottom</XAxis>
+            <YAxis>Left</YAxis>
+            <ColourArgb>-16776961</ColourArgb>
+            <FactorIndexToVaryColours>-1</FactorIndexToVaryColours>
+            <FactorIndexToVaryMarkers>-1</FactorIndexToVaryMarkers>
+            <FactorIndexToVaryLines>-1</FactorIndexToVaryLines>
+            <Marker>FilledCircle</Marker>
+            <Line>None</Line>
+            <TableName>PredictedObserved</TableName>
+            <XFieldName>Observed.SW90cm</XFieldName>
+            <YFieldName>Predicted.SW90cm</YFieldName>
+            <ShowInLegend>true</ShowInLegend>
+            <Cumulative>false</Cumulative>
+            <CumulativeX>false</CumulativeX>
+          </Series>
+          <Axis>
+            <Type>Bottom</Type>
+            <Title />
+            <Inverted>false</Inverted>
+            <Minimum>NaN</Minimum>
+            <Maximum>NaN</Maximum>
+            <Interval>NaN</Interval>
+          </Axis>
+          <Axis>
+            <Type>Left</Type>
+            <Title />
+            <Inverted>false</Inverted>
+            <Minimum>NaN</Minimum>
+            <Maximum>NaN</Maximum>
+            <Interval>NaN</Interval>
+          </Axis>
+          <LegendPosition>BottomRight</LegendPosition>
+          <DisabledSeries />
+          <IncludeInDocumentation>true</IncludeInDocumentation>
+        </Graph>
         <Area>0.55</Area>
         <Slope>0</Slope>
-      </ForestrySystem>
+      </AgroforestrySystem>
       <Graph>
         <Name>YieldTransect</Name>
         <Series>
@@ -4454,7 +4500,7 @@ namespace Models
       <SoilArbitrator>
         <Name>Soil Arbitrator</Name>
       </SoilArbitrator>
-      <ForestrySystem>
+      <AgroforestrySystem>
         <Name>WindbreakSystem</Name>
         <Manager>
           <Name>SowingRule</Name>
@@ -9444,7 +9490,7 @@ namespace Models
         </RectangularZone>
         <Area>2.05</Area>
         <Slope>0</Slope>
-      </ForestrySystem>
+      </AgroforestrySystem>
       <Graph>
         <Name>YieldTransect</Name>
         <Series>

diff --git a/UserInterface/Presenters/TreeProxyPresenter.cs b/UserInterface/Presenters/TreeProxyPresenter.cs
@@ -74,7 +74,7 @@ private void OnCellEndEdit(object sender, EventArgs e)
 
         public void AttachData()
         {
-            if (!(ForestryModel.Parent is ForestrySystem))
+            if (!(ForestryModel.Parent is AgroforestrySystem))
                 throw new ApsimXException(ForestryModel, "Error: TreeProxy must be a child of ForestrySystem.");
 
             Soil Soil;

diff --git a/...sources/TreeViewImages/ForestrySystem.png → ...ces/TreeViewImages/AgroforestrySystem.png b/...sources/TreeViewImages/ForestrySystem.png → ...ces/TreeViewImages/AgroforestrySystem.png
diff --git a/UserInterface/UserInterface.csproj b/UserInterface/UserInterface.csproj
@@ -169,8 +169,12 @@
     </Compile>
     <Compile Include="Settings.cs" />
     <Compile Include="Utility\ColumnXYSeries.cs" />
-    <Compile Include="Utility\DateTimeCellType.cs" />
-    <Compile Include="Utility\FindAndReplaceForm.cs" />
+    <Compile Include="Utility\DateTimeCellType.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Utility\FindAndReplaceForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Utility\FindAndReplaceForm.designer.cs">
       <DependentUpon>FindAndReplaceForm.cs</DependentUpon>
     </Compile>
@@ -712,7 +716,7 @@
     <EmbeddedResource Include="Resources\TreeViewImages\Regression.png" />
     <EmbeddedResource Include="Resources\TreeViewImages\CircularZone.png" />
     <EmbeddedResource Include="Resources\TreeViewImages\RectangularZone.png" />
-    <EmbeddedResource Include="Resources\TreeViewImages\ForestrySystem.png" />
+    <EmbeddedResource Include="Resources\TreeViewImages\AgroforestrySystem.png" />
     <EmbeddedResource Include="Resources\TreeViewImages\FieldPea.png" />
     <EmbeddedResource Include="Resources\TreeViewImages\NodeNumberPhase.png" />
     <EmbeddedResource Include="Resources\TreeViewImages\SoilArbitrator.png" />