From e15c26a6eae2c697be097f6becc313491e449cd5 Mon Sep 17 00:00:00 2001 From: brmiranda Date: Fri, 19 Apr 2019 08:08:52 -0500 Subject: [PATCH 1/5] Add reproduction type to AddNewCohort. Allows reporting of establishment by each type. --- src/FormOfReproduction.cs | 2 +- src/Reproduction.cs | 6 +++--- src/Seeding.cs | 2 +- src/library-succession.csproj | 10 ++++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/FormOfReproduction.cs b/src/FormOfReproduction.cs index dcbaced..63e828f 100644 --- a/src/FormOfReproduction.cs +++ b/src/FormOfReproduction.cs @@ -80,7 +80,7 @@ bool IFormOfReproduction.TryAt(ActiveSite site) if (selectedSpeciesAtSite.Get(index)) { ISpecies species = speciesDataset[index]; if (PreconditionsSatisfied(species, site)) { - Reproduction.AddNewCohort(species, site); + Reproduction.AddNewCohort(species, site, "plant"); success = true; } } diff --git a/src/Reproduction.cs b/src/Reproduction.cs index c2343af..efd6244 100644 --- a/src/Reproduction.cs +++ b/src/Reproduction.cs @@ -21,7 +21,7 @@ public static class Delegates /// A method to add new young cohort for a particular species at a /// site. /// - public delegate void AddNewCohort(ISpecies species, ActiveSite site); + public delegate void AddNewCohort(ISpecies species, ActiveSite site, string reproductionType); //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -298,7 +298,7 @@ public static void Reproduce(ActiveSite site) ISpecies species = speciesDataset[index]; sufficientLight = SufficientResources(species, site); if (sufficientLight && Establish(species, site)) { - AddNewCohort(species, site); + AddNewCohort(species, site, "serotiny"); serotinyOccurred = true; if (isDebugEnabled) log.DebugFormat("site {0}: {1} post-fire regenerated", @@ -324,7 +324,7 @@ public static void Reproduce(ActiveSite site) sufficientLight = SufficientResources(species, site); if (sufficientLight && (Model.Core.GenerateUniform() < species.VegReprodProb)) { - AddNewCohort(species, site); + AddNewCohort(species, site, "resprout"); speciesResprouted = true; if (isDebugEnabled) log.DebugFormat("site {0}: {1} resprouted", diff --git a/src/Seeding.cs b/src/Seeding.cs index cb2de2d..3323611 100644 --- a/src/Seeding.cs +++ b/src/Seeding.cs @@ -30,7 +30,7 @@ public void Do(ActiveSite site) for (int i = 0; i < Model.Core.Species.Count; i++) { ISpecies species = Model.Core.Species[i]; if (seedingAlgorithm(species, site)) { - Reproduction.AddNewCohort(species, site); + Reproduction.AddNewCohort(species, site, "seed"); if (isDebugEnabled) log.DebugFormat("site {0}: seeded {1}", site.Location, species.Name); diff --git a/src/library-succession.csproj b/src/library-succession.csproj index 32116bd..80056a3 100644 --- a/src/library-succession.csproj +++ b/src/library-succession.csproj @@ -23,6 +23,12 @@ Succession Library for LANDIS-II .NET Standard 2.0 update. 7.0 + false + + + + C:\BRM\LANDIS_II\GitCode\brmiranda\Core-Model-v7\Tool-Console\src\bin\extensions + @@ -31,10 +37,10 @@ - lib\Landis.Library.AgeOnlyCohorts-v3.dll + ..\..\Support-Library-Dlls-v7\Landis.Library.AgeOnlyCohorts-v3.dll - lib\Landis.Library.Cohorts-v2.dll + ..\..\Support-Library-Dlls-v7\Landis.Library.Cohorts-v2.dll From 8324ef3658564cd0fea93e41cfb2250b8a5681f2 Mon Sep 17 00:00:00 2001 From: brmiranda Date: Fri, 19 Apr 2019 09:08:59 -0500 Subject: [PATCH 2/5] Update version number. --- src/library-succession.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/library-succession.csproj b/src/library-succession.csproj index 80056a3..7a10a99 100644 --- a/src/library-succession.csproj +++ b/src/library-succession.csproj @@ -18,11 +18,11 @@ LANDIS-II Foundation Succession Library LANDIS-II Foundation - 6.0 + 6.0.1 LANDIS-II;Landis;Library;Succession Succession Library for LANDIS-II .NET Standard 2.0 update. - 7.0 + 6.0.1 false From bc41e131651837ae7f5b385f7e3b06ac8a8d6b16 Mon Sep 17 00:00:00 2001 From: brmiranda Date: Fri, 31 May 2019 16:10:21 -0500 Subject: [PATCH 3/5] Update refs --- src/library-succession.csproj | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/library-succession.csproj b/src/library-succession.csproj index 4f68642..c84fc7a 100644 --- a/src/library-succession.csproj +++ b/src/library-succession.csproj @@ -24,18 +24,23 @@ .NET Standard 2.0 update. 7.0 + + + C:\BRM\LANDIS_II\GitCode\brmiranda\Core-Model-v7\Tool-Console\src\bin\extensions + + - + - lib\Landis.Library.AgeOnlyCohorts-v3.dll + ..\..\Support-Library-Dlls-v7\Landis.Library.AgeOnlyCohorts-v3.dll - lib\Landis.Library.Cohorts-v2.dll + ..\..\Support-Library-Dlls-v7\Landis.Library.Cohorts-v2.dll - + \ No newline at end of file From 269c33597dd832447418168cb3aa5c813079b719 Mon Sep 17 00:00:00 2001 From: brmiranda Date: Fri, 28 Jun 2019 07:51:10 -0500 Subject: [PATCH 4/5] Update version to v8 --- src/library-succession.csproj | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/library-succession.csproj b/src/library-succession.csproj index d7ad9d8..f39cc88 100644 --- a/src/library-succession.csproj +++ b/src/library-succession.csproj @@ -1,12 +1,12 @@  Landis.Library.Succession - Landis.Library.Succession-v7 - Landis.Library.Succession-v7 + Landis.Library.Succession-v8 + Landis.Library.Succession-v8 LANDIS-II Foundation - Landis.Library.Succession-v6 + Landis.Library.Succession-v8 LANDIS-II Foundation - 7.0 + 8.0 Input Parameters Library for LANDIS-II netstandard2.0 false @@ -18,11 +18,11 @@ LANDIS-II Foundation Succession Library LANDIS-II Foundation - 6.0.1 + 8.0 LANDIS-II;Landis;Library;Succession Succession Library for LANDIS-II .NET Standard 2.0 update. - 6.0.1 + 8.0 false @@ -31,11 +31,10 @@ - - C:\BRM\LANDIS_II\GitCode\brmiranda\Core-Model-v7\Tool-Console\src\bin\extensions - + + ..\Deploy\ - + From 2ec0a826a255cb9905406e1969a3ec25f31ea60c Mon Sep 17 00:00:00 2001 From: brmiranda Date: Tue, 27 Aug 2019 13:07:41 -0500 Subject: [PATCH 5/5] Update version to v8. --- src/library-succession.csproj | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/library-succession.csproj b/src/library-succession.csproj index d7ad9d8..1fab343 100644 --- a/src/library-succession.csproj +++ b/src/library-succession.csproj @@ -1,12 +1,12 @@  Landis.Library.Succession - Landis.Library.Succession-v7 - Landis.Library.Succession-v7 + Landis.Library.Succession-v8 + Landis.Library.Succession-v8 LANDIS-II Foundation - Landis.Library.Succession-v6 + Landis.Library.Succession-v8 LANDIS-II Foundation - 7.0 + 8.0 Input Parameters Library for LANDIS-II netstandard2.0 false @@ -18,22 +18,17 @@ LANDIS-II Foundation Succession Library LANDIS-II Foundation - 6.0.1 + 8.0 LANDIS-II;Landis;Library;Succession Succession Library for LANDIS-II .NET Standard 2.0 update. - 6.0.1 + 8.0 false - C:\BRM\LANDIS_II\GitCode\brmiranda\Core-Model-v7\Tool-Console\src\bin\extensions - - - - - C:\BRM\LANDIS_II\GitCode\brmiranda\Core-Model-v7\Tool-Console\src\bin\extensions - + + bin\Debug\