fixing tests again. cleaning up weights removed a hidden factor of 10.

slacgismo · Jul 16, 2024 · dc296a8 · dc296a8
1 parent ba6b065
commit dc296a8
Show file tree

Hide file tree

Showing 9 changed files with 149 additions and 154 deletions.
diff --git a/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_default_long_output.json b/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_default_long_output.json
diff --git a/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_default_output.json b/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_default_output.json
diff --git a/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_idx_select_input.json b/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_idx_select_input.json
diff --git a/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_idx_select_output.json b/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_idx_select_output.json
diff --git a/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_osqp_output.json b/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_osqp_output.json
diff --git a/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_yearly_periodic_output.json b/tests/fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_yearly_periodic_output.json
diff --git a/...fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_yearly_periodic_sum_card_output.json b/...fixtures/signal_decompositions/test_l2_l1d1_l2d2p365_yearly_periodic_sum_card_output.json
diff --git a/tests/fixtures/signal_decompositions/test_signal_decompositions_data.ipynb b/tests/fixtures/signal_decompositions/test_signal_decompositions_data.ipynb
diff --git a/tests/solardatatools/test_signal_decompositions.py b/tests/solardatatools/test_signal_decompositions.py
@@ -95,7 +95,7 @@ def test_l2_l1d1_l2d2p365_default(self):
 
         # Run test
         actual_s_hat, actual_s_seas, _, actual_problem = sd.l2_l1d1_l2d2p365(
-            signal, w1=50, solver=self.solver, return_all=True
+            signal, w1=5, solver=self.solver, return_all=True
         )
 
         actual_obj_val = actual_problem.objective_value
@@ -139,7 +139,7 @@ def test_l2_l1d1_l2d2p365_default_long(self):
 
         # Run test
         actual_s_hat, actual_s_seas, _, actual_problem = sd.l2_l1d1_l2d2p365(
-            signal, w1=50, w2=1e-3, solver=self.solver, return_all=True
+            signal, w1=5, w2=1e-3, solver=self.solver, return_all=True
         )
 
         actual_obj_val = actual_problem.objective_value
@@ -184,7 +184,7 @@ def test_l2_l1d1_l2d2p365_idx_select(self):
 
         # Run test
         actual_s_hat, actual_s_seas, _, actual_problem = sd.l2_l1d1_l2d2p365(
-            signal, w1=50, w2=1e-3, solver=self.solver, use_ixs=indices, return_all=True
+            signal, w1=5, w2=1e-3, solver=self.solver, use_ixs=indices, return_all=True
         )
 
         actual_obj_val = actual_problem.objective_value
@@ -233,7 +233,7 @@ def test_l2_l1d1_l2d2p365_yearly_periodic(self):
         # Run test
         actual_s_hat, actual_s_seas, _, actual_problem = sd.l2_l1d1_l2d2p365(
             signal,
-            w1=50,
+            w1=5,
             w2=1e-3,
             solver=self.solver,
             yearly_periodic=True,
@@ -286,8 +286,7 @@ def test_l2_l1d1_l2d2p365_yearly_periodic_sum_card(self):
         # Run test
         actual_s_hat, actual_s_seas, _, actual_problem = sd.l2_l1d1_l2d2p365(
             signal,
-            w1=50,
-            w2=1e6,
+            w1=5,
             solver=self.solver,
             yearly_periodic=True,
             return_all=True,
@@ -333,7 +332,7 @@ def test_l2_l1d1_l2d2p365_osqp(self):
 
         # Run test
         actual_s_hat, actual_s_seas, _, actual_problem = sd.l2_l1d1_l2d2p365(
-            signal, w1=50, w2=1e-3, solver="OSQP", yearly_periodic=True, return_all=True
+            signal, w1=5, w2=1e-3, solver="OSQP", yearly_periodic=True, return_all=True
         )
 
         actual_obj_val = actual_problem.objective_value