version 1.0.5

liyunfei5126 · Dec 19, 2019 · 942bdec · 942bdec
1 parent f3d1988
commit 942bdec
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 18 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,16 +1,16 @@
 Package: osc
 Type: Package
 Title: Orthodromic Spatial Clustering
-Version: 1.0.4
-Date: 2019-03-22
-Depends: raster, R (>= 2.14)
+Version: 1.0.5
+Date: 2019-12-19
+Depends: methods, raster, R (>= 2.14)
 Suggests: testthat, maps
 Author: Steffen Kriewald, Till Fluschnik, Dominik Reusser, Diego Rybski
 Maintainer: Steffen Kriewald <[email protected]>
-Description: Allows distance based spatial clustering of georeferenced data by implementing the City Clustering Algorithm - CCA. Multiple versions allow clustering for matrix, raster and single coordinates on a plain (euclidean distance) or on a sphere (great-circle or orthodromic distance).
+Description: Allows distance based spatial clustering of georeferenced data by implementing the City Clustering Algorithm - CCA. Multiple versions allow clustering for a matrix, raster and single coordinates on a plain (Euclidean distance) or on a sphere (great-circle or orthodromic distance).
 License: GPL
 URL: https://www.pik-potsdam.de/~kriewald/osc/
 NeedsCompilation: yes
-Packaged: 2019-03-22 10:34:45 UTC; kriewald
+Packaged: 2019-12-19 09:40:30 UTC; kriewald
 Repository: CRAN
-Date/Publication: 2019-03-22 13:30:02 UTC
+Date/Publication: 2019-12-19 11:10:02 UTC
diff --git a/MD5 b/MD5
@@ -1,17 +1,17 @@
-ef6b29ceb44f4c545f1c9ae0f7eb5d45 *DESCRIPTION
-6c76923a8c2910ee5d06d5f1cecd0228 *NAMESPACE
-3b7548d94355d3aac0d7a20f96f8bf3f *R/cca.R
+46ad559e0b5d7b20f4e98fb6ca170e03 *DESCRIPTION
+e99ec8b96fbb3b4b3c63a4ba599354d0 *NAMESPACE
+bcb69a03df3feee85d499a98ed56cf66 *R/cca.R
 456b71ba9225142206fdc6d41077d4f2 *R/cca.single.R
 a820b5cfb7628cc8041ade63275d950b *R/code_revised_cca.R
 ebd670ecc096df9ce8e3f53dcc0419cb *R/getPart.R
 fc5899e593250fad044d9db5808fb1c9 *README.md
-6183df66858900ef5caf5b69906f7942 *build/vignette.rds
+f4f2b7cd1639af43f8d168a9740f6d07 *build/vignette.rds
 6d7bc5a2d4e9a0646afa0c7e770a26bb *data/datalist
 faf8a645e7dedb1f0350588d42ace4ff *data/exampledata.rda
 4a3eeb6d9e208622e6eb7b1e715b5a0a *data/landcover.rda
 39758932230e99ea550c14d3e7bfc0b5 *data/population.rda
 1123c4ff94fe73d63a0ba479cd61f5cb *inst/doc/paper.R
-b303be4d1ef7439cced53bb5ed3f5a39 *inst/doc/paper.pdf
+f14c0c1614350fa684192734240c298a *inst/doc/paper.pdf
 8119f6039bdfd5342556eb8f51a8141d *inst/doc/paper.rnw
 71ed23ec67d3a47015db2b0b8dc06b07 *man/assign.data.Rd
 6f635bd0482bd3436984d92eaf6c8d17 *man/cca.Rd
@@ -29,9 +29,9 @@ cee2d2f0410b6c393f7c93dd5486886f *src/ccaRevolution.c
 d8266d70da0e7737622bb663ea664944 *tests/testthat/test_coordinate_list.R
 716806c191b146997b4f6aaa4bd3be08 *vignettes/compare.pdf
 8119f6039bdfd5342556eb8f51a8141d *vignettes/paper.rnw
-d8d5c1be654100f7a714505e8431c493 *vignettes/pics/exdat1.pdf
-249bbc80805b329a9f1677bd35b8a440 *vignettes/pics/exdat2.pdf
+a47b773bfc0fcb1ebcfb6da45a60c8df *vignettes/pics/exdat1.pdf
+26bba6355dab924e3ccac0da150fae45 *vignettes/pics/exdat2.pdf
 c8c5232df87deeb59f8f53bd479f45be *vignettes/pics/fig-concordance.tex
-4c5bf29c6181217bd3b701138ebc34f3 *vignettes/pics/landcover.pdf
-3812352fa9f9a0faf087a27284493af2 *vignettes/pics/point_data.pdf
-00657ccce1c7e2eab99949d3f9d8cbef *vignettes/pics/raster.pdf
+c30e090cf8304defc409b83f4dd63a8f *vignettes/pics/landcover.pdf
+32a69dbbfae734fe204f0c5353f25509 *vignettes/pics/point_data.pdf
+4da856b2a702d780af4e3fd98654e1b6 *vignettes/pics/raster.pdf
diff --git a/NAMESPACE b/NAMESPACE
@@ -2,4 +2,5 @@ useDynLib(osc, .registration = TRUE)
 
 export(cca, cca.single, assign.data, osc.buffer, coordinate.list)
 import(raster)
+importFrom("methods", "is")
 importFrom("utils", "setTxtProgressBar", "txtProgressBar")
diff --git a/R/cca.R b/R/cca.R
@@ -1,5 +1,5 @@
 cca <- function(data, s=1, mode=3, count.cells=FALSE, count.max=ncol(data)*3, res.x=NULL, res.y=NULL, cell.class=1, unit="", compare=""){
-	if(class(data) %in% c("data.frame", "RasterLayer")){
+	if(is(data, "RasterLayer") | is(data, "data.frame")){
     if(unit=="m"){
       ccaRm(data=data, d=s,res.x=res.x, res.y=res.y, cell.class=cell.class, compare)
     } else {
@@ -13,7 +13,7 @@ cca <- function(data, s=1, mode=3, count.cells=FALSE, count.max=ncol(data)*3, re
 ccaM <- function(data, s=1, mode=3, count.cells=FALSE, count.max=ncol(data)*3){
 	#do checks
 	stopifnot(is.numeric(data))
-	stopifnot(is.matrix(data))
+	stopifnot(is(data, "matrix"))
 	stopifnot(is.numeric(s))
 	stopifnot(mode==1 | mode==2 | mode==3)
 	the.data <- as.integer(t(data))

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/inst/doc/paper.pdf b/inst/doc/paper.pdf
diff --git a/vignettes/pics/exdat1.pdf b/vignettes/pics/exdat1.pdf
diff --git a/vignettes/pics/exdat2.pdf b/vignettes/pics/exdat2.pdf
diff --git a/vignettes/pics/landcover.pdf b/vignettes/pics/landcover.pdf
diff --git a/vignettes/pics/point_data.pdf b/vignettes/pics/point_data.pdf
diff --git a/vignettes/pics/raster.pdf b/vignettes/pics/raster.pdf