From ee01615de575a4fa2fd325759360858eae8bd016 Mon Sep 17 00:00:00 2001 From: Meyers-Im Date: Tue, 26 Mar 2024 20:39:49 -0400 Subject: [PATCH 1/2] ignore vim files --- .gitignore | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.gitignore b/.gitignore index b10316f2..c231e006 100644 --- a/.gitignore +++ b/.gitignore @@ -295,3 +295,29 @@ bh_unicode_properties.cache GitHub.sublime-settings # End of https://www.gitignore.io/api/data,macos,python,pycharm,database,sublimetext,jupyternotebook + +# Created by https://www.toptal.com/developers/gitignore/api/vim +# Edit at https://www.toptal.com/developers/gitignore?templates=vim + +### Vim ### +# Swap +[._]*.s[a-v][a-z] +!*.svg # comment out if you don't need vector files +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +# End of https://www.toptal.com/developers/gitignore/api/vim From b255b9996393ccbb0968f2434807529062e856d6 Mon Sep 17 00:00:00 2001 From: Meyers-Im Date: Tue, 26 Mar 2024 20:40:23 -0400 Subject: [PATCH 2/2] reverting to prior behavior, using QSS --- solardatatools/data_handler.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/solardatatools/data_handler.py b/solardatatools/data_handler.py index a50cc997..f7cf2cb2 100644 --- a/solardatatools/data_handler.py +++ b/solardatatools/data_handler.py @@ -1141,11 +1141,6 @@ def rescale_signal(signal, minimum, maximum): use_ixs = self.daily_flags.clear else: use_ixs = self.daily_flags.no_errors - ### NEW 3/20/24: overwrite use of qss on this function. Forcing CLARABEL here uses the old-style - # iteratively reweighted model, rather than the nonconvex piecewise constant model. In testing, - # the older model (which is not technically covered by the monograph) seems to work better. - if solver != "MOSEK": - solver = "CLARABEL" ########## Updates to timeshift algorithm, 6/2023 ########## # If running with any solver other than QSS: solve convex problem # If running with QSS without a set w1: run w1 meta-opt with convex problem,