Fix(format): requested by GHA guidelines checks

libKriging · Apr 5, 2022 · adee410 · adee410
1 parent 9e530fc
commit adee410
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 27 deletions.
diff --git a/bindings/R/Rcpp/test.cpp b/bindings/R/Rcpp/test.cpp
@@ -11,19 +11,21 @@ Rcpp::List Krigingfit(const arma::vec y, const arma::mat X, const arma::vec thet
   int n = X.n_rows, m = X.n_cols;
   int nreg = 1;
   // Define regression matrix
-  arma::mat F(n,nreg); F.ones();
+  arma::mat F(n, nreg);
+  F.ones();
   // allocate the matrix we will return (Gauss or Matern 5/2)
-  arma::mat CovMatrix(n,n); CovMatrix.zeros();
+  arma::mat CovMatrix(n, n);
+  CovMatrix.zeros();
   for (int i = 0; i < n; i++) {
     for (int j = 0; j < i; j++) {
       double temp = 1;
       for (int k = 0; k < m; k++) {
         // double d = -std::sqrt(5)*std::abs(X(i,k)-X(j,k))/theta(k);
         // temp *= (1+d+std::pow(d,2)/3)*std::exp(d);
-        double d = (X(i,k)-X(j,k))/theta(k);
-        temp *= exp(-0.5*std::pow(d,2));
+        double d = (X(i, k) - X(j, k)) / theta(k);
+        temp *= exp(-0.5 * std::pow(d, 2));
       }
-      CovMatrix(i,j) = temp;
+      CovMatrix(i, j) = temp;
     }
   }
   CovMatrix = CovMatrix + trans(CovMatrix);
@@ -33,31 +35,32 @@ Rcpp::List Krigingfit(const arma::vec y, const arma::mat X, const arma::vec thet
   // Compute intermediate useful matrices
   arma::mat Ft = arma::solve(C, F);
   arma::mat Q, G;
-  qr_econ(Q,G,Ft);
+  qr_econ(Q, G, Ft);
   arma::colvec Yt = arma::solve(C, y);
-  arma::colvec beta = arma::solve(G, trans(Q)*Yt);
-  arma::colvec rho = Yt - Ft*beta;
-  double  sigma2 = arma::as_scalar(arma::sum(pow(rho,2))/n);
+  arma::colvec beta = arma::solve(G, trans(Q) * Yt);
+  arma::colvec rho = Yt - Ft * beta;
+  double sigma2 = arma::as_scalar(arma::sum(pow(rho, 2)) / n);
   arma::mat gamma = trans(arma::solve(trans(C), rho));
 
   // Second part : predict on test data
   int ntest = Xtest.n_rows;
   Rcout << "The value of ntest : " << ntest << "\n";
-  arma::mat CovMatrixTest(ntest,n);
+  arma::mat CovMatrixTest(ntest, n);
   for (int i = 0; i < ntest; i++) {
     for (int j = 0; j < n; j++) {
       double temp = 1;
       for (int k = 0; k < m; k++) {
         // double d = -std::sqrt(5)*std::abs(X(i,k)-X(j,k))/theta(k);
         // temp *= (1+d+std::pow(d,2)/3)*std::exp(d);
-        double d = (Xtest(i,k)-X(j,k))/theta(k);
-        temp *= exp(-0.5*std::pow(d,2));
+        double d = (Xtest(i, k) - X(j, k)) / theta(k);
+        temp *= exp(-0.5 * std::pow(d, 2));
       }
-      CovMatrixTest(i,j) = temp;
+      CovMatrixTest(i, j) = temp;
     }
   }
-  arma::mat Ftest(ntest,nreg); Ftest.ones();
-  arma::vec Ytest = Ftest*beta + CovMatrixTest*trans(gamma);
+  arma::mat Ftest(ntest, nreg);
+  Ftest.ones();
+  arma::vec Ytest = Ftest * beta + CovMatrixTest * trans(gamma);
   return Rcpp::List::create(Rcpp::Named("weights") = Rcpp::wrap(gamma),
                             Rcpp::Named("hyperparam") = Rcpp::wrap(theta),
                             Rcpp::Named("prediction") = Rcpp::wrap(Ytest));

diff --git a/bindings/R/rlibkriging/src/kriging_binding.cpp b/bindings/R/rlibkriging/src/kriging_binding.cpp
@@ -5,10 +5,10 @@
 #include <RcppArmadillo.h>
 // clang-format on
 
-#include "libKriging/Random.hpp"
-#include "libKriging/LinearAlgebra.hpp"
 #include "libKriging/Covariance.hpp"
 #include "libKriging/Kriging.hpp"
+#include "libKriging/LinearAlgebra.hpp"
+#include "libKriging/Random.hpp"
 
 // [[Rcpp::export]]
 Rcpp::List new_Kriging(arma::vec y,

diff --git a/bindings/R/rlibkriging/src/nuggetkriging_binding.cpp b/bindings/R/rlibkriging/src/nuggetkriging_binding.cpp
@@ -5,10 +5,10 @@
 #include <RcppArmadillo.h>
 // clang-format on
 
-#include "libKriging/Random.hpp"
-#include "libKriging/LinearAlgebra.hpp"
 #include "libKriging/Covariance.hpp"
+#include "libKriging/LinearAlgebra.hpp"
 #include "libKriging/NuggetKriging.hpp"
+#include "libKriging/Random.hpp"
 
 // [[Rcpp::export]]
 Rcpp::List new_NuggetKriging(arma::vec y,

diff --git a/cmake/ClangFormatProcess.cmake b/cmake/ClangFormatProcess.cmake
@@ -7,7 +7,7 @@ if(LIBKRIGING_SOURCE_DIR AND CLANG_FORMAT)
             ${LIBKRIGING_SOURCE_DIR}/tests/**.[hc]pp
             ${LIBKRIGING_SOURCE_DIR}/bindings/Octave/**.[hc]pp
             ${LIBKRIGING_SOURCE_DIR}/bindings/Python/**.[hc]pp
-            ${LIBKRIGING_SOURCE_DIR}/bindings/R/rlibkriging/**.[hc]pp
+            ${LIBKRIGING_SOURCE_DIR}/bindings/R/**.[hc]pp
             )
 
     # apply style to the file list

diff --git a/src/lib/Kriging.cpp b/src/lib/Kriging.cpp
@@ -7,12 +7,12 @@
 #include "libKriging/utils/lk_armadillo.hpp"
 
 #include "libKriging/CacheFunction.hpp"
-#include "libKriging/utils/custom_hash_function.hpp"
-#include "libKriging/Random.hpp"
-#include "libKriging/LinearAlgebra.hpp"
 #include "libKriging/Covariance.hpp"
-#include "libKriging/KrigingException.hpp"
 #include "libKriging/Kriging.hpp"
+#include "libKriging/KrigingException.hpp"
+#include "libKriging/LinearAlgebra.hpp"
+#include "libKriging/Random.hpp"
+#include "libKriging/utils/custom_hash_function.hpp"
 
 #include <cassert>
 #include <optim.hpp>

diff --git a/src/lib/NuggetKriging.cpp b/src/lib/NuggetKriging.cpp
@@ -7,12 +7,12 @@
 #include "libKriging/utils/lk_armadillo.hpp"
 
 #include "libKriging/CacheFunction.hpp"
-#include "libKriging/utils/custom_hash_function.hpp"
-#include "libKriging/Random.hpp"
-#include "libKriging/LinearAlgebra.hpp"
 #include "libKriging/Covariance.hpp"
 #include "libKriging/KrigingException.hpp"
+#include "libKriging/LinearAlgebra.hpp"
 #include "libKriging/NuggetKriging.hpp"
+#include "libKriging/Random.hpp"
+#include "libKriging/utils/custom_hash_function.hpp"
 
 #include <cassert>
 #include <optim.hpp>