change rcpp_points_to_edges IntVec -> NumericVec for #103

UrbanAnalyst · Sep 2, 2022 · 1b5f16f · 1b5f16f
1 parent 1a30d67
commit 1b5f16f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dodgr
 Title: Distances on Directed Graphs
-Version: 0.2.15.006
+Version: 0.2.15.007
 Authors@R: c(
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre")),
     person("Andreas", "Petutschnig", role = "aut"),

diff --git a/codemeta.json b/codemeta.json
@@ -7,7 +7,7 @@
   "codeRepository": "https://github.com/ATFutures/dodgr",
   "issueTracker": "https://github.com/ATFutures/dodgr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.2.15.006",
+  "version": "0.2.15.007",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -179,7 +179,7 @@ BEGIN_RCPP
 END_RCPP
 }
 // rcpp_points_to_edges_par
-Rcpp::IntegerVector rcpp_points_to_edges_par(const Rcpp::DataFrame& graph, Rcpp::DataFrame& pts);
+Rcpp::NumericVector rcpp_points_to_edges_par(const Rcpp::DataFrame& graph, Rcpp::DataFrame& pts);
 RcppExport SEXP _dodgr_rcpp_points_to_edges_par(SEXP graphSEXP, SEXP ptsSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;

diff --git a/src/match-points.cpp b/src/match-points.cpp
@@ -68,7 +68,7 @@ struct OneEdgeIndex : public RcppParallel::Worker
     const RcppParallel::RVector <double> pt_x, pt_y,
           xfr, yfr, xto, yto;
     const size_t nxy;
-    RcppParallel::RVector <int> index;
+    RcppParallel::RVector <double> index;
 
     // constructor
     OneEdgeIndex (
@@ -79,7 +79,7 @@ struct OneEdgeIndex : public RcppParallel::Worker
             const RcppParallel::RVector <double> xto_in,
             const RcppParallel::RVector <double> yto_in,
             const size_t nxy_in,
-            Rcpp::IntegerVector index_in) :
+            Rcpp::NumericVector index_in) :
         pt_x (pt_x_in), pt_y (pt_y_in),
         xfr (xfr_in), yfr (yfr_in), xto (xto_in), yto (yto_in),
         nxy (nxy_in), index (index_in)
@@ -138,7 +138,7 @@ struct OneEdgeIndex : public RcppParallel::Worker
                     jmin = static_cast <long int> (j);
                 }
             }
-            index [i] = static_cast <int> (jmin);
+            index [i] = static_cast <double> (jmin);
         }
     }
 
@@ -191,7 +191,7 @@ Rcpp::IntegerVector rcpp_points_index_par (const Rcpp::DataFrame &xy,
 //'
 //' @noRd
 // [[Rcpp::export]]
-Rcpp::IntegerVector rcpp_points_to_edges_par (const Rcpp::DataFrame &graph,
+Rcpp::NumericVector rcpp_points_to_edges_par (const Rcpp::DataFrame &graph,
         Rcpp::DataFrame &pts)
 {
     Rcpp::NumericVector ptx = pts ["x"];
@@ -205,7 +205,7 @@ Rcpp::IntegerVector rcpp_points_to_edges_par (const Rcpp::DataFrame &graph,
     const size_t npts = static_cast <size_t> (pts.nrow ()),
            nxy = static_cast <size_t> (graph.nrow ());
 
-    Rcpp::IntegerVector index (npts);
+    Rcpp::NumericVector index (npts);
 
     // Create parallel worker
     OneEdgeIndex one_edge_indx (RcppParallel::RVector <double> (ptx),

diff --git a/src/match-points.h b/src/match-points.h
@@ -14,5 +14,5 @@ int which_side_of_line (const double ax, const double ay,
 
 Rcpp::IntegerVector rcpp_points_index (const Rcpp::DataFrame &xy,
         Rcpp::DataFrame &pts);
-Rcpp::IntegerVector rcpp_points_to_edges_par (const Rcpp::DataFrame &graph,
+Rcpp::NumericVector rcpp_points_to_edges_par (const Rcpp::DataFrame &graph,
         Rcpp::DataFrame &pts);