Merge branch 'main' of github.com:scicloj/metamorph.ml into linearReg…

…ression
scicloj · May 22, 2024 · 6523421 · 6523421
2 parents 69af33d + 778eff6
commit 6523421
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/resources/columms-glance.edn b/resources/columms-glance.edn
@@ -21,10 +21,10 @@
 ;; :crit "Minimized criterion",
 ;; :cv.crit "Cross-validation score",
 ;; :den.df "Degrees of freedom of the denominator",
-;; :deviance "Deviance of the model.",
+ :deviance "Deviance of the model.",
  :df "Degrees of freedom used by the model."
 ;; :df.null "Degrees of freedom used by the null model.",
-;; :df.residual "Residual degrees of freedom.",
+ :df.residual "Residual degrees of freedom.",
 ;; :dw.original "Durbin-Watson statistic of original fit.",
 ;; :dw.transformed "Durbin-Watson statistic of transformed fit.",
 ;; :edf "The effective degrees of freedom.",
@@ -68,7 +68,11 @@
 ;; :missing-method "Method for eliminating missing data.",
 ;; :model "A character string denoting the model at which the optimal BIC occurs.",
  :mse "Mean Squared Deviation"
+<<<<<<< HEAD
 ;; :n "The total number of observations.",
+=======
+:n "The total number of observations.",
+>>>>>>> 778eff62acb97776cd1e3f783ce8dee9566230b9
 ;; :n.clusters "Number of clusters.",
 ;; :n.factors "The number of fitted factors.",
 ;; :n.max "Maximum number of subjects at risk.",
@@ -116,7 +120,11 @@
 ;; :sigma-2-j "The square root of the estimated residual variance for the j-th longitudinal process.",
 ;; :spar "Smoothing parameter.",
 ;; :srmr "Standardised root mean residual.",
+<<<<<<< HEAD
 ;; :statistic "Test statistic.",
+=======
+:statistic "Test statistic.",
+>>>>>>> 778eff62acb97776cd1e3f783ce8dee9566230b9
 ;; :statistic.-sargan "Statistic for Sargan test.",
 ;; :statistic.weak.instr "Statistic for weak instrument F-test.",
 ;; :statistic.-wu.-hausman "Statistic for Wu-Hausman test.",

diff --git a/resources/columms-tidy.edn b/resources/columms-tidy.edn
@@ -88,7 +88,7 @@
  ;; :statistic.-sargan "Statistic for Sargan test of overidentifying restrictions.",
  ;; :statistic.weakinst "Statistic for Wu-Hausman test.",
  ;; :statistic.-wu.-hausman "Statistic for Wu-Hausman weak instruments test for endogeneity.",
- ;; :std-estimate "The standardized regression coefficients.",
+ :std-estimate "The standardized regression coefficients.",
  ;; :std.all "Standardized estimates based on both the variances of both (continuous) observed and latent variables.",
  ;; :std.dev "Standard deviation explained by this PC.",
   :std.error "The standard error of the regression term."