Skip to content
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.

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

Changed main package documentation from .Rd file to .R file #87

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ workspace/
.Rproj.user
PhylGeo.Rcheck/00_pkg_src
00check.log
phylosim.Rproj
RcppExports.cpp

.Rhistory
Expand Down
5 changes: 3 additions & 2 deletions PhyloSim/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ Imports:
Suggests:
knitr
LinkingTo: Rcpp
RoxygenNote: 7.2.3
Roxygen: list(old_usage = TRUE, markdown = TRUE)
LazyData: true
VignetteBuilder: knitr
LinkingTo: Rcpp
RoxygenNote: 6.0.1
Encoding: UTF-8
1 change: 1 addition & 0 deletions PhyloSim/NAMESPACE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Warum ist das doppelt?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.registration = TRUE hat gefehlt; habs gefixt und commited

Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ export(specRich)
import(Rcpp)
import(ape)
importFrom(adephylo,distTips)
useDynLib(PhyloSim)
useDynLib(PhyloSim, .registration = TRUE)
29 changes: 29 additions & 0 deletions PhyloSim/R/PhyloSim-package.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#' @keywords internal
#' @title Analysing phylogenetic and biogeographic patterns and inferring species community assembly
#' @name PhyloSim
#' @docType package
#' @useDynLib PhyloSim
#' @description
#' This package is designed to simulate and analyse species community assembly processes. It allows the user to implement different mechanisms of community assembly such as environmental filtering, competitive exclusion or dispersal limitation. These mechanisms can be combined or activated seprately, which allows the user to identify biogeographic or phylogenetic patterns exclusively correlated with a certain mechanism or combination of mechanisms.
#' @details
#' The core of this package is basically a community assembly model, which can be run with \code{\link{runSimulation}} or \code{\link{runSimulationBatch}}. All other functions help analize and visualize the model outcome. For visualization the following functions can be useful:
#'\tabular{ll}{
#' \code{\link{plotSpatialPhylo}} \tab Plots the phylogeny tree ,the spatially abundance of the evolved species and their traits.\cr
#' \code{\link{rac}} \tab Plots the Rank Abundance Curve for a given community\cr
#' \code{\link{sac}} \tab Plots the species area curve for a given community\cr
#' \code{\link{plotclades}} \tab Visualises the phylogenetic clades of a local community within a metacommunity.\cr
#' \code{\link{plotTraitDistribution}} \tab Plots trait-histograms, trait ~ Environment relationship and the spatial distribution of the different traits\cr
#'}
#'
#'
#'The function \code{\link{phyloReconstruct}} creates a phylogeny from given neutral traits of a community in order to compare them with the existing phylogeny. The observed patterns in the simulation output can be tested against null models using the function \code{\link{nullModel}}.
#'
#'
#' @author Paul Bauche, Florian Hartig
#'
#' @example /inst/examples/forMainHelp.R
#'
"_PACKAGE"
## usethis namespace: start
## usethis namespace: end
NULL
6 changes: 6 additions & 0 deletions PhyloSim/inst/examples/forMainHelp.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
data(simu.envcom.local)
plotSpatialPhylo(simu.envcom.local)

par <- createCompletePar(x = 50, y = 50, dispersal = "global" , runs = c(500,1000),density = 1, environment =0.5, specRate = 1)
new.simulation <- runSimulation(par)
plotSpatialPhylo(new.simulation)
48 changes: 14 additions & 34 deletions PhyloSim/man/PhyloSim-package.Rd → PhyloSim/man/PhyloSim.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion PhyloSim/man/calculatePhylogeneticDispersion.Rd
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code muss in backtick `

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ist überall gemacht. Hab außerdem, während ich jedes Script nochmal überprüft habe die examples gleich outsourced

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions PhyloSim/man/createCompletePar.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion PhyloSim/man/plotSpatialPhylo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions PhyloSim/man/simu.envcom.local.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions PhyloSim/man/simu.neutral.global.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions PhyloSim/man/simu.neutral.local.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions phylosim.Rproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Version: 1.0

RestoreWorkspace: Default
SaveWorkspace: Default
AlwaysSaveHistory: Default

EnableCodeIndexing: Yes
UseSpacesForTab: Yes
NumSpacesForTab: 2
Encoding: UTF-8

RnwWeave: Sweave
LaTeX: pdfLaTeX

BuildType: Package
PackageUseDevtools: Yes
PackagePath: /Users/florian/Dropbox/Home/Projekte/Papers_in_Progress/17-PhylogeneticRpackage/phylosim/PhyloSim
PackageInstallArgs: --no-multiarch --with-keep.source
PackageRoxygenize: rd,collate,namespace