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.

Sign up for GitHub

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

Jump to bottom

4.1 Hourly Model #537

Merged
merged 145 commits into from
Jan 28, 2025
Merged

4.1 Hourly Model #537

merged 145 commits into from
Jan 28, 2025

Conversation

jason-recurve
Copy link
Contributor

@jason-recurve jason-recurve commented Jan 27, 2025 •
edited
Loading

Your checklist for this pull request

Please review the guidelines for contributing to this repository.

  • Make sure you are requesting to pull a feature/bugfix branch (right side). Don't request your master!
  • Make sure tests pass and coverage has not fallen docker-compose run --rm test.
  • Update the CHANGELOG.md to describe your changes in a bulleted list under the "Development" section at the top of the changelog. If this section does not exist, create it.
  • Make sure code style follows PEP 008 using docker-compose run --rm blacken.
  • Make sure that new functions and classes have inline docstrings valid docstrings and any public classes and methods are included members in the docs/reference files. Please use google-style docstrings.
    Sphinx docs can be built with the following command: docker-compose run --rm --entrypoint="make -C docs html" shell. Please note and fix any warnings.
  • Make sure that all git commits are have the "Signed-off-by" message for
    the Developer Certificate of Origin. When you're making a commit, just add
    the -s/--signoff flag (e.g., git commit -s).

Description

Adds new hourly dataclass and model to support solar meters and improve nonsolar results.

ArminRecurve and others added 30 commits March 13, 2024 18:05
@ArminRecurve
initial implement of new hourly model on meter level
b8a6060 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
add errors and pre population run
eadaf2c 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@travis-recurve
added hourly settings, serialization, and baseline metrics
07b3331 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@travis-recurve
added safe_divide to metrics
7edd44a 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@travis-recurve
minor changes to settings etc
7206752 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@ArminRecurve
Population run set, error on to_json
8e76252 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@travis-recurve
Added ReportingMetrics
24bb188 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@travis-recurve
Merge: adding ReportingMetrics
6874735
@travis-recurve
isolating testing changes in metrics.py
8d62b2e 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@ArminRecurve
population run before hyper-parameter optimization
8f9c81f 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
population run with saved features for hyperparameter tunning
fc169ec 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
Population optimizaiton with ghi
a65f3ad 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@travis-recurve
adding prepare_dataframe to hourly
bb399f3 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@ArminRecurve
add HourlyData class draft, add supplemental data
d226319 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@travis-recurve
bug fixing with temporary files
8421bc2 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@ArminRecurve
supplemental figures add
9b4fbec 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
plot change for ads retreat presentation
4d9a8c5 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
inital interpolation with RBFInterpolator
353ce06 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
initial Interpolation class with multiple input
bc2e6cb 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
Interpolation class searching scnearios fix
bcca425 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
interpolation in the hourly data class
9bad148 
Signed-off-by: ArminRecurve <Armin@recurve.com>
@ArminRecurve
add time series and categorical supplemetal data to hourly model, rem…
00f4a58 
…ove window and lag features

Signed-off-by: ArminRecurve <Armin@recurve.com>
@travis-recurve
Merge branch 'master' into feature/solar_hourly_model
f6c2ad0
@travis-recurve
update branch to master
a281870 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@jason-recurve @travis-recurve
Point test data to correct branch
19af22d 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve @travis-recurve
Convert datetime indexes to nanosecond resolution to prevent datafram…
84865dc 
…e merge issues

Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve @travis-recurve
Resample coverage from consistent origin
b8a090e 
Signed-off-by: Jason Chulock <jason@recurve.com>
@joydeep-recurve @travis-recurve
Created new branch for refactoring caltrack tests. Added revert for h…
fe47b34 
…ourly wrapper change.

Signed-off-by: joydeep-recurve <joydeep@recurve.com>
@travis-recurve
update branch to master
7611e22 
Signed-off-by: travis-recurve <124101151+travis-recurve@users.noreply.github.com>
@travis-recurve
Merge branch 'feature/solar_hourly_model' of github.com:openeemeter/e…
9f7f6de 
…emeter into feature/solar_hourly_model
@jason-recurve
Add CVRMSE/PNRMSE disqualification
c690296 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Update hourly percentage tests
32cba4e 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Make a few functions private inside of hourly.model
4b46e16 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Correct hourly frequency label
136d3da 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Replace deprecated pydantic config
ba20fa2 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Fix data download path
1d15d82 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Explicitly set seed datatype for windows compatibility
7bdc570 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Drop 3.8 from supported runtimes
c7eeed5 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Blacken
91cde8b 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Avoid SettingWithCopyWarning
9795321 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Suppress pywt warning with notes
6825576 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Fix y_scaler named feature warning and numpy implicit scalar cast
c539f7d 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Suppress sklearn deprecation warning with note; exclude suppressed wa…
a5f45a1 
…rnings from pytest.ini

Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Explicitly set masked values to np.nan
8b5f349 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Skip extreme value check for empty observed
bf5cd6a 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Suppress warning instead of manually setting masked values to nan
c0a3d50 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Remove default error filter from pytest for now
6096391 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve jason-recurve force-pushed the feature/solar_hourly_model branch from 34716e4 to 6096391 Compare January 28, 2025 01:42
@jason-recurve
Remove new_hourly module from initial update
43882d2 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Remove unused private attrs in hourly data
a1298dd 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve jason-recurve force-pushed the feature/solar_hourly_model branch from 2296b25 to a1298dd Compare January 28, 2025 16:05
jason-recurve and others added 5 commits January 28, 2025 11:16
@jason-recurve
Suppress warnings
ddf1060 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Allow using dict settings in HourlyModel
9212bf4 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Merge branch 'master' into feature/solar_hourly_model
5ebfdd9
@jason-recurve
Blacken
918a4cd 
Signed-off-by: Jason Chulock <jason@recurve.com>
@jason-recurve
Update changelog and bump version
0a60284 
Signed-off-by: Jason Chulock <jason@recurve.com>
travis-recurve
travis-recurve approved these changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@travis-recurve travis-recurve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's beautiful

@jason-recurve jason-recurve merged commit df821df into master Jan 28, 2025
17 checks passed
@travis-recurve travis-recurve deleted the feature/solar_hourly_model branch January 28, 2025 17:00
jason-recurve added a commit that referenced this pull request Feb 11, 2025
@jason-recurve
Merge pull request #537 from openeemeter/feature/solar_hourly_model
8047b62 
4.1 Hourly Model

Former-commit-id: df821df
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@travis-recurve travis-recurve travis-recurve approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jason-recurve @travis-recurve @ArminRecurve @joydeep-recurve