update boost

GeoDaCenter · Oct 21, 2024 · 4071c9d · 4071c9d
1 parent 2c5fc3a
commit 4071c9d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -5,6 +5,11 @@
 
 using namespace Rcpp;
 
+#ifdef RCPP_USE_GLOBAL_ROSTREAM
+Rcpp::Rostream<true>&  Rcpp::Rcout = Rcpp::Rcpp_cout_get();
+Rcpp::Rostream<false>& 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
diff --git a/src/libgeoda b/src/libgeoda
diff --git 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<double> results(n);
   std::vector<bool> 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());