Merge pull request #235 from rafaqz/generalised_model

This PR contains al the work generalising the strategy and environment over the last few months. It should be useable as-is, as discussed it might be good to start playing with it to see if the tests are actually covering the real use-cases.
traitecoevo · Mar 10, 2020 · 88a9f5b · 88a9f5b
2 parents cdf4c3d + ee1b954
commit 88a9f5b
Show file tree

Hide file tree

Showing 116 changed files with 3,601 additions and 3,528 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -38,4 +38,4 @@ Suggests:
 VignetteBuilder: knitr
 URL: https://github.com/traitecoevo/plant
 BugReports: https://github.com/traitecoevo/plant/issues
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ RSCRIPT = Rscript --no-init-file
 
 all: compile
 
-compile: RcppR6 
+compile: 
 	Rscript -e 'pkgbuild::compile_dll()' \ 
 	make roxygen
 

diff --git a/NAMESPACE b/NAMESPACE
@@ -7,8 +7,8 @@ S3method(validate,Parameters)
 export(CohortSchedule)
 export(Control)
 export(Disturbance)
-export(Environment)
 export(FF16_Cohort)
+export(FF16_Environment)
 export(FF16_Parameters)
 export(FF16_Patch)
 export(FF16_Plant)
@@ -40,7 +40,6 @@ export(equilibrium_verbose)
 export(expand_parameters)
 export(fast_control)
 export(fitness_landscape)
-export(fixed_environment)
 export(grow_plant_to_height)
 export(grow_plant_to_size)
 export(grow_plant_to_time)

diff --git a/R/RcppExports.R b/R/RcppExports.R