Merge pull request #40 from kuadrat/autocut

Autocut
kuadrat · Jun 26, 2024 · efb1deb · efb1deb
2 parents 79d3efe + 2252629
commit efb1deb
Show file tree

Hide file tree

Showing 20 changed files with 1,049 additions and 592 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: growR
 Type: Package
-Version: 1.3.0
+Version: 1.3.0.9001
 Date: 2024-05-23
 Authors@R: person(
     given = "Kevin",

diff --git a/NAMESPACE b/NAMESPACE
@@ -3,6 +3,7 @@
 S3method("*",FunctionalGroup)
 S3method("+",FunctionalGroup)
 S3method(plot,ModvegeSite)
+export(Autocut)
 export(FG_A)
 export(FG_B)
 export(FG_C)
@@ -12,6 +13,8 @@ export(ManagementData)
 export(ModvegeEnvironment)
 export(ModvegeParameters)
 export(ModvegeSite)
+export(PetersenAutocut)
+export(PhenologicalAutocut)
 export(PscanPlotter)
 export(SEA)
 export(WeatherData)
@@ -30,11 +33,7 @@ export(fCO2_transpiration_mod)
 export(fPAR)
 export(fT)
 export(fW)
-export(get_annual_gross_yield)
 export(get_bias)
-export(get_end_of_cutting_season)
-export(get_expected_n_cuts)
-export(get_relative_cut_contribution)
 export(growR_package_options)
 export(growR_run_loop)
 export(load_data_for_sites)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,14 @@
+# growR 1.3.0.9000
+
+## Added
+
+* site_name and run_name are printed to console in `growR_run_loop`.
+* PhenologicalAutocut
+
+## Changed
+
+* autocut algorithm is now outsourced to its own R6class.
+
 # growR 1.3.0
 
 ## Added