Merge remote-tracking branch 'origin/main' into BMTI_and_deltaFs_errors

charliematteo · charliematteo · commit 28d87d49e3f0 · 2024-07-16T15:29:32.000-04:00
diff --git a/dadapy/feature_weighting.py b/dadapy/feature_weighting.py
@@ -738,7 +738,7 @@ def return_lasso_optimization_dii_search(
         self.history = {
             "l1_penalties": l1_penalties,
             "weights_per_l1_per_epoch": weights,
-            "dii_per_l1_per_epoch": l1_penalties,
+            "dii_per_l1_per_epoch": diis,
             "l1_term_per_l1_per_epoch": l1_loss_contributions,
         }
 

Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,7 @@ def return_lasso_optimization_dii_search(`
`738`	`738`	`self.history = {`
`739`	`739`	`"l1_penalties": l1_penalties,`
`740`	`740`	`"weights_per_l1_per_epoch": weights,`
`741`		`- "dii_per_l1_per_epoch": l1_penalties,`
	`741`	`+ "dii_per_l1_per_epoch": diis,`
`742`	`742`	`"l1_term_per_l1_per_epoch": l1_loss_contributions,`
`743`	`743`	`}`
`744`	`744`