From 4071c9d83fe0a1556c2e77db509683378d324d46 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Mon, 21 Oct 2024 14:57:38 -0700 Subject: [PATCH] update boost --- NAMESPACE | 4 ++++ R/utils.R | 4 ++-- src/Makevars | 2 +- src/Makevars.win | 2 +- src/RcppExports.cpp | 5 +++++ src/boost-develop | 2 +- src/libgeoda | 2 +- src/rcpp_lisa.cpp | 2 +- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 878a1987..5058f683 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -59,6 +59,10 @@ export(min_distthreshold) export(min_neighbors) export(natural_breaks) export(neighbor_match_test) +export(p_GeoDa) +export(p_GeoDaTable) +export(p_GeoDaWeight) +export(p_LISA) export(percentile_breaks) export(quantile_breaks) export(queen_weights) diff --git a/R/utils.R b/R/utils.R index 96fa4ab9..2b8977d7 100644 --- a/R/utils.R +++ b/R/utils.R @@ -125,8 +125,8 @@ stddev_breaks <- function(df) { #' @title Empirical Bayes(EB) Rate #' @description The function to compute EB Rate from an event variable and a #' base variable. -#' @param df A data frame with two selected variable: one is "event", anothor is -#' "base" variable. E.g. guerry[c("hr60", "po60")] +#' @param df A data frame with two selected variable: one is "event" variable, another is +#' "base" variable like population. E.g. guerry[c("hr60", "po60")] #' @return A data.frame with two columns "EB Rate" and "IsNull". #' @examples #' \dontrun{ diff --git a/src/Makevars b/src/Makevars index e55dc526..f6cb2a9f 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,5 +1,5 @@ RGEODALIB = ./libgeoda -BOOST_PATH = ./boost_develop/boost_1_86_0 +BOOST_PATH = ./boost-develop/boost_1_86_0 PKG_CPPFLAGS=\ -I$(RGEODALIB) \ diff --git a/src/Makevars.win b/src/Makevars.win index 3beb39b6..ef2b8e0a 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,7 +1,7 @@ TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) RGEODALIB = ./libgeoda -BOOST_PATH = ./boost_develop/boost_1_86_0 +BOOST_PATH = ./boost-develop/boost_1_86_0 PKG_CPPFLAGS=\ -I$(RGEODALIB) \ diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index 8a2d257b..acaebdaf 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -5,6 +5,11 @@ using namespace Rcpp; +#ifdef RCPP_USE_GLOBAL_ROSTREAM +Rcpp::Rostream& Rcpp::Rcout = Rcpp::Rcpp_cout_get(); +Rcpp::Rostream& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get(); +#endif + // p_skater Rcpp::List p_skater(int k, SEXP xp_w, Rcpp::List& data, int n_vars, std::string scale_method, std::string distance_method, NumericVector& bound_vals, double min_bound, int seed, int cpu_threads, NumericVector& rdist); RcppExport SEXP _rgeoda_p_skater(SEXP kSEXP, SEXP xp_wSEXP, SEXP dataSEXP, SEXP n_varsSEXP, SEXP scale_methodSEXP, SEXP distance_methodSEXP, SEXP bound_valsSEXP, SEXP min_boundSEXP, SEXP seedSEXP, SEXP cpu_threadsSEXP, SEXP rdistSEXP) { diff --git a/src/boost-develop b/src/boost-develop index b09b9a29..5aa8bb1b 160000 --- a/src/boost-develop +++ b/src/boost-develop @@ -1 +1 @@ -Subproject commit b09b9a2935b03e82b55ca648bd88465ff12c3a75 +Subproject commit 5aa8bb1b179d1b581eacedba9369516634e5f60b diff --git a/src/libgeoda b/src/libgeoda index b512f742..a2a40be4 160000 --- a/src/libgeoda +++ b/src/libgeoda @@ -1 +1 @@ -Subproject commit b512f742ff95fba89bbc9958972667c7643edba5 +Subproject commit a2a40be473dd27f7ed60b5c0e9f69e0302ab8d4e diff --git a/src/rcpp_lisa.cpp b/src/rcpp_lisa.cpp index c9f521b1..a2150d76 100644 --- a/src/rcpp_lisa.cpp +++ b/src/rcpp_lisa.cpp @@ -180,7 +180,7 @@ DataFrame p_eb_rate(NumericVector& event_data, NumericVector& base_data) std::vector results(n); std::vector undefined(n, false); - gda_rateStandardizeEB(raw_event_data, raw_base_data, results, undefined); + gda_rateSmootherEBS(raw_base_data, raw_event_data, results, undefined); Rcpp::NumericVector v1(results.begin(), results.end()); Rcpp::LogicalVector v2(undefined.begin(), undefined.end());