update for 0.0.3

GeoDaCenter · Oct 10, 2019 · ce4a4b8 · ce4a4b8
1 parent 9d2e82c
commit ce4a4b8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 29 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -0,0 +1,4 @@
+^.*\.Rproj$
+^\.Rproj\.user$
+^deps$
+^\.RData$
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ rsconnect/
 
 *.so
 *.o
+
+deps/
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -0,0 +1,25 @@
+Package: rgeoda
+Title: R library for spatial data analysis
+Version: 0.0.3
+Authors@R: person("Xun","Li", email="[email protected]", role=c("aut","cre"))
+Maintainer: Xun Li <[email protected]>
+Description: A package for spatial data analysis based on libgeoda and GeoDa.
+Depends: R (>= 3.5.0)
+License: GPL-2
+Collate: 
+    rgeoda-package.R 
+    rgeoda.R 
+    sf_geoda.R 
+    read_geoda.R 
+    weights.R 
+    lisa.R
+    clustering.R
+    AAA.R
+Imports:
+    wkb
+RoxygenNote: 6.1.1
+Encoding: UTF-8
+Suggests: 
+    knitr,
+    rmarkdown
+VignetteBuilder: knitr
diff --git a/R/sf_geoda.R b/R/sf_geoda.R
@@ -83,11 +83,6 @@ sf_to_geoda = function(sf_obj, ...) {
 #' @param sp_obj  An instance of sp object
 #' @param with_table  (Optional, Default: FALSE)If create a table from sp dataframe object.
 #' @return geoda_obj An instance of GeoDa object
-#' @examples
-#' guerry_path <- system.file("extdata", "Guerry.shp", package = "rgeoda")
-#' library(rgdal)
-#' guerry_sp <- readOGR(guerry_path)
-#' guerry_gda <- sp_to_geoda(guerry_sp)
 #' @export
 sp_to_geoda = function(sp_obj, ...) {
   if (!require("sp")) {

diff --git a/R/weights.R b/R/weights.R
@@ -166,11 +166,6 @@ rook_weights <- function(geoda_obj, ...) {
 #' @param is_arc (optional) FALSE (default) or TRUE, compute arc distance between two observations
 #' @param is_mile (optional) TRUE (default) or FALSE, convert distance unit from mile to km.
 #' @return w An instance of GeoDaWeight
-#' @examples
-#' guerry_path <- system.file("extdata", "Guerry.shp", package = "rgeoda")
-#' guerry <- GeoDa(guerry_path)
-#' dist_thres <- gda_min_distthreshold(guerry)
-#' dist_w <- distance_weights(guerry, dist_thres)
 #' @export
 distance_weights <- function(geoda_obj, dist_thres, ...) {
   kwargs <- list(...)
@@ -205,11 +200,6 @@ distance_weights <- function(geoda_obj, dist_thres, ...) {
 #' @param is_arc (optional) FALSE (default) or TRUE, compute arc distance between two observations
 #' @param is_mile (optional) TRUE (default) or FALSE, convert distance unit from mile to km.
 #' @return w An instance of Weight
-#' @examples
-#' guerry_path <- system.file("extdata", "Guerry.shp", package = "rgeoda")
-#' guerry <- GeoDa(guerry_path)
-#' bandwidth <- gda_min_distthreshold(guerry)
-#' kernel_w <- kernel_weights(guerry, bandwidth, "uniform")
 #' @export
 kernel_weights <- function(geoda_obj, bandwidth, kernel_method, ...) {
   kwargs <- list(...)
@@ -247,10 +237,6 @@ kernel_weights <- function(geoda_obj, bandwidth, kernel_method, ...) {
 #' @param is_arc (optional) FALSE (default) or TRUE, compute arc distance between two observations
 #' @param is_mile (optional) TRUE (default) or FALSE, convert distance unit from mile to km.
 #' @return w An instance of Weight
-#' @examples
-#' guerry_path <- system.file("extdata", "Guerry.shp", package = "rgeoda")
-#' guerry <- GeoDa(guerry_path)
-#' knn_w <- knn_weights(guerry, 6)
 #' @export
 knn_weights <- function(geoda_obj, k, ...) {
   kwargs <- list(...)
@@ -287,11 +273,6 @@ knn_weights <- function(geoda_obj, k, ...) {
 #' @param is_arc (optional) FALSE (default) or TRUE, compute arc distance between two observations
 #' @param is_mile (optional) TRUE (default) or FALSE, convert distance unit from mile to km.
 #' @return w An instance of Weight
-#' @examples
-#' guerry_path <- system.file("extdata", "Guerry.shp", package = "rgeoda")
-#' guerry <- GeoDa(guerry_path)
-#' bandwidth <- gda_min_distthreshold(guerry)
-#' kernel_w <- kernel_knn_weights(guerry, 6, "uniform")
 #' @export
 kernel_knn_weights <- function(geoda_obj, k, kernel_method, ...) {
   kwargs <- list(...)

diff --git a/src/Makevars b/src/Makevars
@@ -3,7 +3,7 @@ UNAME_S := $(shell uname -s)
 OS_NAME := linux
 
 RGDALLIB = ../deps/gdal_static-master
-RGEODALIB = ../deps/libgeoda_static-master
+RGEODALIB = ../deps/libgeoda_static-0.0.3
 RWXLIB = ../deps/wx_static-master
 RANNLIB = ../deps/ANN_static-master
 RBOOSTLIB = ../deps/boost_static-master

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,7 +1,7 @@
 VERSION = 2.2.3
 COMPILED_BY ?= gcc-4.6.3
 RWINLIB = ../windows/gdal2-$(VERSION)
-RGEODALIB = ../windows/libgeoda_static-0.0.1
+RGEODALIB = ../windows/libgeoda_static-0.0.3
 RWXLIB = ../windows/wx_static-3.0.4
 RANNLIB = ../windows/ANN_static-1.1.2
 RBOOSTLIB = ../windows/boost_static-1.57.0
@@ -49,4 +49,4 @@ winlibs:
 clean:
 	rm -f $(SHLIB) $(OBJECTS)
 
-.PHONY: all winlibs clean
+.PHONY: all winlibs clean
diff --git a/tools/libs.R b/tools/libs.R
@@ -10,7 +10,7 @@ if(!file.exists("../deps/gdal_static-master/include/gdal.h")){
   download.file("https://codeload.github.com/libgeoda/gdal_static/zip/master", "lib.zip", quiet = TRUE)
   unzip("lib.zip", exdir = "../deps")
   unlink("lib.zip")
-  download.file("https://codeload.github.com/rgeoda/libgeoda_static/zip/master", "geodalib.zip", quiet = TRUE)
+  download.file("https://github.com/rgeoda/libgeoda_static/archive/0.0.3.zip", "geodalib.zip", quiet = TRUE)
   unzip("geodalib.zip", exdir = "../deps")
   unlink("geodalib.zip")
   download.file("https://codeload.github.com/rgeoda/wx_static/zip/master", "wxlib.zip", quiet = TRUE)
@@ -22,4 +22,4 @@ if(!file.exists("../deps/gdal_static-master/include/gdal.h")){
   download.file("https://codeload.github.com/rgeoda/boost_static/zip/master", "boostlib.zip", quiet = TRUE)
   unzip("boostlib.zip", exdir = "../deps")
   unlink("boostlib.zip")
-}
+}