v0.3.5. using Mat<T> consistently

pachadotdev · Mar 3, 2024 · a77f5ce · a77f5ce
1 parent 82465ab
commit a77f5ce
Show file tree

Hide file tree

Showing 34 changed files with 81 additions and 75 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: capybara
 Type: Package
 Title: Fast and Memory Efficient Fitting of Linear Models With High-Dimensional
     Fixed Effects
-Version: 0.3
+Version: 0.3.5
 Authors@R: c(
     person(
         given = "Mauricio",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# capybara 0.3.5
+
+* Uses Mat<T> consistently for all matrix operations (avoids vectors)
+
 # capybara 0.3
 
 * Reduces memory footprint ~45% by moving some computation to Armadillo's side

diff --git a/R/apes.R b/R/apes.R
@@ -296,9 +296,9 @@ apes <- function(
   rm(eta, w, z, MPsi)
 
   # Compute covariance matrix
-  # Gamma <- (MX %*% solve(object[["Hessian"]] / nt.full, J) - PPsi) * v / nt.full
   Gamma <- gamma_(MX, object[["Hessian"]], J, PPsi, v, nt.full)
   V <- crossprod_(Gamma, NA_real_, FALSE, FALSE)
+
   if (adj > 0.0) {
     # Simplify covariance if sampling assumptions are imposed
     if (sampling.fe == "independence") {

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/intro.html b/docs/articles/intro.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 2.0.7
 pkgdown_sha: ~
 articles:
   intro: intro.html
-last_built: 2024-03-03T11:14Z
+last_built: 2024-03-03T21:12Z
 
diff --git a/docs/reference/apes.html b/docs/reference/apes.html
diff --git a/docs/reference/bias_corr.html b/docs/reference/bias_corr.html
diff --git a/docs/reference/capybara-package.html b/docs/reference/capybara-package.html
diff --git a/docs/reference/feglm.html b/docs/reference/feglm.html
diff --git a/docs/reference/feglm_control.html b/docs/reference/feglm_control.html
diff --git a/docs/reference/felm.html b/docs/reference/felm.html
diff --git a/docs/reference/fenegbin.html b/docs/reference/fenegbin.html
diff --git a/docs/reference/fepoisson.html b/docs/reference/fepoisson.html
diff --git a/docs/reference/fixed_effects.html b/docs/reference/fixed_effects.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/reexports.html b/docs/reference/reexports.html
diff --git a/docs/reference/summary.apes.html b/docs/reference/summary.apes.html
diff --git a/docs/reference/summary.feglm.html b/docs/reference/summary.feglm.html
diff --git a/docs/reference/summary.felm.html b/docs/reference/summary.felm.html
diff --git a/docs/reference/trade_panel.html b/docs/reference/trade_panel.html
diff --git a/docs/reference/vcov.apes.html b/docs/reference/vcov.apes.html
diff --git a/docs/reference/vcov.feglm.html b/docs/reference/vcov.feglm.html
diff --git a/docs/reference/vcov.felm.html b/docs/reference/vcov.felm.html
diff --git a/src/01_center_variables.cpp b/src/01_center_variables.cpp
@@ -7,10 +7,10 @@ center_variables_(const doubles_matrix<> &V_r, const doubles &v_sum_r,
                   const int maxiter, bool sum_v) {
   // Types conversion
   Mat<double> V = as_Mat(V_r);
-  Col<double> w = as_Col(w_r);
+  Mat<double> w = as_Mat(w_r);
 
   if (sum_v) {
-    Col<double> v_sum = as_Col(v_sum_r);
+    Mat<double> v_sum = as_Mat(v_sum_r);
     V.each_col() += v_sum;
   }
 
@@ -24,8 +24,8 @@ center_variables_(const doubles_matrix<> &V_r, const doubles &v_sum_r,
   double delta, denom, meanj, num, wt;
   int index, iter, i, j, k, p, I, J;
   Mat<double> C(N, P);
-  Col<double> x(N);
-  Col<double> x0(N);
+  Mat<double> x(N, 1);
+  Mat<double> x0(N, 1);
 
   // Halperin projections
   for (p = 0; p < P; p++) {

diff --git a/src/02_solve_beta.cpp b/src/02_solve_beta.cpp
@@ -11,7 +11,7 @@
   // Weight the X and Y matrices
   if (weighted) {
     // Additional type conversion
-    Col<double> W = as_Col(wtilde);
+    Mat<double> W = as_Mat(wtilde);
 
     // Multiply each column of X by W pair-wise
     X = X.each_col() % W;
@@ -32,7 +32,7 @@
     stop("QR decomposition failed");
   } else {
     // backsolve
-    Col<double> beta = solve(R, Q.t() * Y);
+    Mat<double> beta = solve(R, Q.t() * Y);
     return as_doubles(beta);
   }
 }