clean up

jdtuck · Dec 21, 2023 · fb27749 · fb27749
1 parent 7f29384
commit fb27749
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/fdasrsf/bayesian.cpp b/src/fdasrsf/bayesian.cpp
@@ -1,5 +1,4 @@
 #include <RcppArmadillo.h>
-#include <Rcpp.h>
 // Correctly setup the build environment
 // [[Rcpp::depends(RcppArmadillo)]]
 
@@ -275,7 +274,7 @@ RcppExport SEXP simucode(SEXP R_iter, SEXP R_p, SEXP R_qt1_5, SEXP R_qt2_5,
     logpost = (p/2+alpha)*log(kappa)-kappa*(beta+dist);
     log_collect[j] = logpost;
   }
-  
+
   NumericVector pctaccept = as<NumericVector>(numaccept) / iter;
   vec Rr_best_match = best_match+1;
   mat Rr_match_collect = match_collect+1;

diff --git a/src/fdasrsf/pair_align_functions_expomap.cpp b/src/fdasrsf/pair_align_functions_expomap.cpp
@@ -1,5 +1,4 @@
 #include <RcppArmadillo.h>
-#include <Rcpp.h>
 // Correctly setup the build environment
 // [[Rcpp::depends(RcppArmadillo)]]
 
@@ -38,7 +37,7 @@ RcppExport SEXP cuL2norm2(SEXP R_x, SEXP R_y) {
 
   // get ordering of x
   // borrowed from Hadley Wickhams github.com/hadley/adv-r/blob/master/extras/cpp/order.cpp
-  
+
   vector<pair<double, int> > vals;
   vals.reserve(n);
   for(int i = 0; i < n; i++) {
@@ -93,9 +92,8 @@ RcppExport SEXP trapzCpp(SEXP R_x, SEXP R_y) {
 
 // order vectors and calculate l2 norm, for f.L2norm()
 //RcppExport double order_l2norm(NumericVector x, NumericVector y) {
-RcppExport SEXP order_l2norm(SEXP R_x, SEXP R_y) {
-  vec x = as<vec>(R_x);
-  vec y = as<vec>(R_y);
+RcppExport double order_l2norm(vec x, vec y) {
+
   int n = x.size();
   // get ordering of x
   // borrowed from Hadley Wickhams adv-r/extras/cpp/order.cpp
@@ -128,5 +126,5 @@ RcppExport SEXP order_l2norm(SEXP R_x, SEXP R_y) {
   for (int i = 0; i<(n-1); i++) {
     area2 += (xSort[i+1] - xSort[i]) * (ySortSq[i+1] + ySortSq[i]);
   }
-  return wrap(sqrt(area2 / 2.0));
+  return sqrt(area2 / 2.0);
 }