Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Time shift #134

Merged
merged 2 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions solardatatools/data_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading