Merge pull request #17 from r-spatialecology/main

v1.0.4

.Rbuildignore

@@ -15,3 +15,4 @@
 ^\.github$
 ^CODE_OF_CONDUCT\.md$
 ^CONTRIBUTING\.md$
+^CRAN-SUBMISSION$

.gitignore

@@ -3,4 +3,4 @@
 .RData
 .Ruserdata
 docs
-^CRAN-SUBMISSION$
+CRAN-SUBMISSION

DESCRIPTION

@@ -1,32 +1,32 @@
-Type: Package
-Package: onpoint
-Title: Helper Functions for Point Pattern Analysis
-Version: 1.0.3
-Authors@R: 
-  person("Maximilian H.K.", "Hesselbarth", 
-  email = "mhk.hesselbarth@gmail.com",
-  role = c("aut", "cre"), 
-  comment = c(ORCID = "0000-0003-1125-9918"))
-Maintainer: Maximilian H.K. Hesselbarth <mhk.hesselbarth@gmail.com>
-Description: 
-  Growing collection of helper functions for point pattern analysis. Most functions
-  are designed to work with the 'spatstat' (<http://spatstat.org>) package. The focus of 
-  most functions are either null models or summary functions for spatial point patterns. 
-  For a detailed description of all null models and summary functions, see 
-  Wiegand and Moloney (2014, ISBN:9781420082548).
-URL: https://r-spatialecology.github.io/onpoint/
-BugReports: https://github.com/r-spatialecology/onpoint/issues
-License: GPL (>= 3)
-Depends: R (>= 3.1)
-Imports:
-  ggplot2,
-  spatstat.explore, 
-  spatstat.geom,
-  spatstat.random,
-  stats
-Suggests: 
-    covr,
-    spatstat (>= 2.0.0),
-    testthat
-Encoding: UTF-8
-RoxygenNote: 7.2.1
+Type: Package
+Package: onpoint
+Title: Helper Functions for Point Pattern Analysis
+Version: 1.0.4
+Authors@R: 
+  person("Maximilian H.K.", "Hesselbarth", 
+  email = "mhk.hesselbarth@gmail.com",
+  role = c("aut", "cre"), 
+  comment = c(ORCID = "0000-0003-1125-9918"))
+Maintainer: Maximilian H.K. Hesselbarth <mhk.hesselbarth@gmail.com>
+Description: 
+  Growing collection of helper functions for point pattern analysis. Most functions
+  are designed to work with the 'spatstat' (<http://spatstat.org>) package. The focus of 
+  most functions are either null models or summary functions for spatial point patterns. 
+  For a detailed description of all null models and summary functions, see 
+  Wiegand and Moloney (2014, ISBN:9781420082548).
+URL: https://r-spatialecology.github.io/onpoint/
+BugReports: https://github.com/r-spatialecology/onpoint/issues
+License: GPL (>= 3)
+Depends: R (>= 3.1)
+Imports:
+  ggplot2,
+  spatstat.explore, 
+  spatstat.geom,
+  spatstat.random,
+  stats
+Suggests: 
+    covr,
+    spatstat (>= 2.0.0),
+    testthat
+Encoding: UTF-8
+RoxygenNote: 7.2.3

NEWS.md

@@ -1,46 +1,49 @@
-# onpoint 1.0.3
-* Small updates to internal code structure
-* Fix DESCRIPTION
-* Update CI actions
-* Update `spatstat` dependency
-
-# onpoint 1.0.2
-* Adapt new `spatstat` package structure
-
-# onpoint 1.0.1
-* Improve documentation for CRAN submission
-* Renamed `summarise_envelope` to `summarize_envelope`
-
-# onpoint 1.0
-* Use GPL3 license
-* Adapt to new `spatstat` structure
-* Prepare CRAN submission
-
-# onpoint 0.6.1
-* Use GitHub actions
-
-# onpoint 0.6
-* `plot_quantums()` uses `geom_linerange()`
-
-# onpoint 0.5
-* add `rlabel_local()` function
-
-# onpoint 0.4
-* Printing method for result of `summarise_envelope()`
-* Plotting method for result of `summarise_envelope()`
-
-# onpoint 0.3
-* New function `summarise_envelope()`
-
-# onpoint 0.2.1
-* Better size arguments for lines and base_size for `plot_quantums()`
-* Generic labels for `plot_quantums()`
-* Use fix_n argument in `simulate_heterogenous_patter()`
-
-# onpoint 0.2.0
-* Added `simulate_antecedent_conditions`.
-* Added `estimate_pcf_fast`
-
-# onpoint 0.1.0
-* Initialised package
-* Added a `NEWS.md` file to track changes to the package.
+# onpoint 1.0.4
+* Update some plotting functions
+
+# onpoint 1.0.3
+* Small updates to internal code structure
+* Fix DESCRIPTION
+* Update CI actions
+* Update `spatstat` dependency
+
+# onpoint 1.0.2
+* Adapt new `spatstat` package structure
+
+# onpoint 1.0.1
+* Improve documentation for CRAN submission
+* Renamed `summarise_envelope` to `summarize_envelope`
+
+# onpoint 1.0
+* Use GPL3 license
+* Adapt to new `spatstat` structure
+* Prepare CRAN submission
+
+# onpoint 0.6.1
+* Use GitHub actions
+
+# onpoint 0.6
+* `plot_quantums()` uses `geom_linerange()`
+
+# onpoint 0.5
+* add `rlabel_local()` function
+
+# onpoint 0.4
+* Printing method for result of `summarise_envelope()`
+* Plotting method for result of `summarise_envelope()`
+
+# onpoint 0.3
+* New function `summarise_envelope()`
+
+# onpoint 0.2.1
+* Better size arguments for lines and base_size for `plot_quantums()`
+* Generic labels for `plot_quantums()`
+* Use fix_n argument in `simulate_heterogenous_patter()`
+
+# onpoint 0.2.0
+* Added `simulate_antecedent_conditions`.
+* Added `estimate_pcf_fast`
+
+# onpoint 0.1.0
+* Initialised package
+* Added a `NEWS.md` file to track changes to the package.

R/onpoint-package.R

@@ -1,14 +1,23 @@
-#' @title onpoint
-#'
-#' @description
-#' Growing collection of small helper functions for point pattern analysis. Most functions
-#' are designed to work with the spatstat package.
-#'
-#' @name onpoint
-#' @docType package
-#' @keywords internal
-"_PACKAGE"
-
-# Global variables
-globalVariables(c(
-  "hi", "high", "is", "lo", "low", "marks", "obs", "observed", "r", "theo", "theoretical", "type", "y"))
+#' @title onpoint
+#'
+#' @description
+#' Growing collection of small helper functions for point pattern analysis. Most functions
+#' are designed to work with the spatstat package.
+#'
+#' @name onpoint
+#' @docType package
+#' @keywords internal
+"_PACKAGE"
+
+# Global variables
+globalVariables(c(
+  "aggregate",
+  "hi", "high",
+  "is",
+  "lo", "low",
+  "marks",
+  "obs", "observed",
+  "r",
+  "theo", "theoretical", "type",
+  "x.min", "x.max",
+  "y"))