remove const #43

bsvars · Aug 9, 2024 · 5a0d30f · 5a0d30f
1 parent 0e5ec95
commit 5a0d30f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/inst/include/bsvarSIGNs_RcppExports.h b/inst/include/bsvarSIGNs_RcppExports.h
@@ -277,11 +277,11 @@ namespace bsvarSIGNs {
         return Rcpp::as<arma::field<arma::mat> >(rcpp_result_gen);
     }
 
-    inline arma::colvec zero_restrictions(const arma::field<arma::mat>& Z, const arma::colvec vec_structural) {
+    inline arma::colvec zero_restrictions(const arma::field<arma::mat>& Z, arma::vec vec_structural) {
         typedef SEXP(*Ptr_zero_restrictions)(SEXP,SEXP);
         static Ptr_zero_restrictions p_zero_restrictions = NULL;
         if (p_zero_restrictions == NULL) {
-            validateSignature("arma::colvec(*zero_restrictions)(const arma::field<arma::mat>&,const arma::colvec)");
+            validateSignature("arma::colvec(*zero_restrictions)(const arma::field<arma::mat>&,arma::vec)");
             p_zero_restrictions = (Ptr_zero_restrictions)R_GetCCallable("bsvarSIGNs", "_bsvarSIGNs_zero_restrictions");
         }
         RObject rcpp_result_gen;

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -463,12 +463,12 @@ RcppExport SEXP _bsvarSIGNs_ZIRF(SEXP ZSEXP, SEXP irf_0SEXP) {
     return rcpp_result_gen;
 }
 // zero_restrictions
-arma::colvec zero_restrictions(const arma::field<arma::mat>& Z, const arma::colvec vec_structural);
+arma::colvec zero_restrictions(const arma::field<arma::mat>& Z, arma::vec vec_structural);
 static SEXP _bsvarSIGNs_zero_restrictions_try(SEXP ZSEXP, SEXP vec_structuralSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::traits::input_parameter< const arma::field<arma::mat>& >::type Z(ZSEXP);
-    Rcpp::traits::input_parameter< const arma::colvec >::type vec_structural(vec_structuralSEXP);
+    Rcpp::traits::input_parameter< arma::vec >::type vec_structural(vec_structuralSEXP);
     rcpp_result_gen = Rcpp::wrap(zero_restrictions(Z, vec_structural));
     return rcpp_result_gen;
 END_RCPP_RETURN_ERROR
@@ -1058,7 +1058,7 @@ static int _bsvarSIGNs_RcppExport_validate(const char* sig) {
         signatures.insert("bool(*match_sign_narrative)(const arma::mat&,const arma::mat&,const arma::cube&)");
         signatures.insert("double(*weight_narrative)(const int&,arma::mat,const arma::cube&)");
         signatures.insert("arma::field<arma::mat>(*ZIRF)(const arma::field<arma::mat>&,const arma::mat&)");
-        signatures.insert("arma::colvec(*zero_restrictions)(const arma::field<arma::mat>&,const arma::colvec)");
+        signatures.insert("arma::colvec(*zero_restrictions)(const arma::field<arma::mat>&,arma::vec)");
         signatures.insert("arma::colvec(*g_fh)(const arma::field<arma::mat>&,const arma::mat&,const arma::mat&)");
         signatures.insert("arma::colvec(*g_fh_vec)(const arma::field<arma::mat>&,const arma::colvec)");
         signatures.insert("double(*log_volume_element)(const arma::field<arma::mat>&,const arma::mat&,const arma::mat&)");

diff --git a/src/restrictions_zero.cpp b/src/restrictions_zero.cpp
@@ -18,7 +18,7 @@ arma::field<arma::mat> ZIRF(
 
   arma::field<arma::mat> ZIRF(Z.n_elem);
 
-  for (int j=0; j<Z.n_elem; j++) {
+  for (int j = 0; j < Z.n_elem; j++) {
     ZIRF(j) = Z(j) * irf_0;
   }
 
@@ -31,15 +31,17 @@ arma::field<arma::mat> ZIRF(
 // [[Rcpp::export]]
 arma::colvec zero_restrictions(
     const arma::field<arma::mat>& Z,
-    const arma::colvec            vec_structural
+    arma::vec vec_structural
 ) {
   int N  = Z(0).n_cols;
-  mat A0 = reshape(vec_structural.rows(0, N*N-1), N, N);
+
+  mat A0 = vec_structural.rows(0, N * N - 1);
+  A0     = reshape(A0, N, N);
 
   arma::field<arma::mat> ZF = ZIRF(Z, inv(A0.t()));
 
   colvec z;
-  for (int j=0; j<ZF.n_elem; j++) {
+  for (int j = 0; j < ZF.n_elem; j++) {
     z = join_vert(z, ZF(j).col(j));
   }
 

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -50,10 +50,12 @@ bool match_sign(
 // [[Rcpp:interface(cpp)]]
 arma::mat Df(
     const std::function<arma::vec(const arma::vec&)>& f,
-    const arma::vec& x,
-    const double     h = 1e-10
+    const arma::vec& x
 )
 {
+
+  double h   = 1e-10;
+
   colvec f_x = f(x);
 
   int n  = x.n_elem;

diff --git a/src/utils.h b/src/utils.h
@@ -14,9 +14,8 @@ bool match_sign(
 );
 
 arma::mat Df(
-    const  std::function<arma::colvec(const arma::colvec&)>& f,
-    const  arma::colvec& x,
-    double               h = 1e-10
+    const std::function<arma::vec(const arma::vec&)>& f,
+    const arma::vec& x
 );
 
 arma::mat metropolis(