Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
288 commits
Select commit Hold shift + click to select a range
af00b51
Added argument for considering charge rate uncertainty
Jul 10, 2024
db0c7cd
draft region selection
jbadsdata Jul 10, 2024
dcb9fd3
changed file name
jbadsdata Jul 10, 2024
12dfafe
Merge pull request #13 from tsdataclinic/region_selection
jbadsdata Jul 10, 2024
660ecc6
added random date sampler function
jbadsdata Jul 10, 2024
0539dc5
Merge pull request #11 from tsdataclinic/robin_initial_eda
jbadsdata Jul 10, 2024
b6d5fbe
Merge pull request #12 from tsdataclinic/yhlim_connect_branch
jbadsdata Jul 10, 2024
ec8b9e2
Merge pull request #10 from tsdataclinic/s3_utils
jbadsdata Jul 10, 2024
ebd4b8e
optc notebook added
jbadsdata Jul 12, 2024
aeabba8
comments
jbadsdata Jul 12, 2024
c4405c8
added timezone adjustment
marleneguraieb Jul 12, 2024
03680be
new tests added
jbadsdata Jul 12, 2024
9edd607
example for marlene
jbadsdata Jul 12, 2024
e4dab9e
bug noted re: unplug time func
jbadsdata Jul 12, 2024
d4f3e73
Refactored API to use different modes of optCharger
Jul 12, 2024
7695189
functionality to generate years worth of random dates
jbadsdata Jul 12, 2024
c9451bc
notebook to compute timezones for each US region
robinelliott-ts Jul 13, 2024
733d89f
ensure time delta is positive
jbadsdata Jul 13, 2024
4a6fe3f
ensure time delta is positive
jbadsdata Jul 13, 2024
280bfc4
Merge pull request #16 from tsdataclinic/mg
jbadsdata Jul 13, 2024
60cf1b7
year of dates dedup
jbadsdata Jul 13, 2024
d05bf83
Merge pull request #14 from tsdataclinic/yhlim_connect_branch
jbadsdata Jul 13, 2024
9381fb2
reset changes
jbadsdata Jul 13, 2024
961cc60
Merge pull request #15 from tsdataclinic/robin_initial_eda
jbadsdata Jul 15, 2024
106f3a6
Merge pull request #17 from tsdataclinic/new_synth_data_connect
jbadsdata Jul 15, 2024
cd88a11
adding tzs as dict
jbadsdata Jul 15, 2024
6c676bb
two year distinct date gen added to synth data notebook
jbadsdata Jul 16, 2024
4ad9162
imports, formatting
jbadsdata Jul 16, 2024
a03618e
get evaluation_test.py to run
robinelliott-ts Jul 19, 2024
96f1c86
compute emissions against actual MOER as well as forecast
robinelliott-ts Jul 19, 2024
6f6a77b
random dates func simplified
marleneguraieb Jul 19, 2024
b8f9bdb
Merge pull request #19 from tsdataclinic/tz_integration_mg
jbadsdata Jul 19, 2024
50deed8
fixed datetime import
jbadsdata Jul 19, 2024
7ffe277
Merge pull request #18 from tsdataclinic/tz_integration
jbadsdata Jul 23, 2024
130e501
Henry review notebook
jbadsdata Jul 23, 2024
d699ab4
alg update: emission multiplier and contiguous interval only
Jul 24, 2024
ef245cd
fix typo
Jul 24, 2024
7bb8b15
actual emissions calc
jbadsdata Jul 24, 2024
de3d7d9
success rate to data tests
jbadsdata Jul 24, 2024
fee0720
Merge pull request #20 from tsdataclinic/anniez-optCharger
jbadsdata Jul 26, 2024
eb11295
Partial edit to API
Jul 26, 2024
6219256
Updated API to consider power of device. Now outputs a lbs value of CO2e
Jul 26, 2024
ee8d4f3
add cached version of get data to run tests faster. currently only ra…
robinelliott-ts Jul 26, 2024
ad42c96
precache MOER data by querying WattTime API with multithreading. Run …
robinelliott-ts Jul 27, 2024
bcfc04e
CAISO simple results analysis
jbadsdata Jul 30, 2024
c017df3
Merge branch 'develop' into moer_metric_development
jbadsdata Jul 30, 2024
7dab558
Merge pull request #22 from tsdataclinic/moer_metric_development
jbadsdata Jul 30, 2024
956c80d
Fix typos
Jul 31, 2024
f1a322f
Add emissions to output of API
Jul 31, 2024
42c01fe
Added comments and warnings
Jul 31, 2024
fbe9401
example analyis nb
jbadsdata Aug 1, 2024
3ee67ed
example explore nb ready
jbadsdata Aug 1, 2024
bf8dee1
added LA
jbadsdata Aug 1, 2024
735df1b
added last two regions of the 9 important regions, extended results p…
robinelliott-ts Aug 5, 2024
157bb44
Add energy usage column to API output
Aug 7, 2024
974e86f
Merge pull request #21 from tsdataclinic/yhlim_connect_branch
jbadsdata Aug 9, 2024
2171645
Merge pull request #23 from tsdataclinic/results_robin_20240802
jbadsdata Aug 9, 2024
4da3916
Integratesynthetic data with API
Aug 12, 2024
50eb044
region pickle file
jbadsdata Aug 16, 2024
3fe4dc1
Merge pull request #24 from tsdataclinic/results_jen_20240816
jbadsdata Aug 16, 2024
38a191a
notebook to see if shifting synthetic users to charging during the da…
robinelliott-ts Aug 19, 2024
a4a52ac
Add integrated synth data tests
Aug 19, 2024
5eb40cd
Merge pull request #25 from tsdataclinic/yhlim_connect_branch
jbadsdata Aug 19, 2024
6c08648
rename notebook
robinelliott-ts Aug 21, 2024
c97ee42
remove old notebook
robinelliott-ts Aug 21, 2024
33e782a
error example notebook
jbadsdata Aug 28, 2024
fa566fd
error example notebook
jbadsdata Aug 28, 2024
600b5ea
fix time window bug; add functionality to specify optCharger algorithm
Aug 29, 2024
5a8870e
updated tests and added doc strings
jbadsdata Aug 29, 2024
3bc3330
added docstrings to eval_framework; black formatted
jbadsdata Aug 29, 2024
1c0899e
api_test.py functional
jbadsdata Aug 29, 2024
4f84bf1
Merge pull request #28 from tsdataclinic/single_synth_example
jbadsdata Aug 29, 2024
1282382
funcs + dirs renamed in prep for checkin
jbadsdata Aug 29, 2024
6033c17
added caiso north day results
jbadsdata Aug 29, 2024
c403863
Merge pull request #29 from tsdataclinic/dir_reorg
jbadsdata Aug 29, 2024
6152efe
Merge pull request #26 from tsdataclinic/robin_20240816
jbadsdata Aug 29, 2024
f0951ca
final changes to formatting
jbadsdata Aug 29, 2024
33420b3
First round of optimizer functionality (#30)
jbadsdata Aug 29, 2024
4d7b3dd
edits to plots in midway checkin results
robinelliott-ts Sep 3, 2024
e739514
Updated docstrings
Sep 2, 2024
5a2cbf9
edits to plots in midway checkin results (#32)
robinelliott-ts Sep 4, 2024
bd5f94a
Merge pull request #33 from tsdataclinic/yh_docstring
jbadsdata Sep 4, 2024
8f2c3be
Merge branch 'main' into develop
jbadsdata Sep 4, 2024
18b461d
Merge pull request #35 from tsdataclinic/robin_20240903
jbadsdata Sep 4, 2024
b3c4805
Merge pull request #34 from tsdataclinic/develop
jbadsdata Sep 4, 2024
5316fce
formatting + example nb
jbadsdata Sep 6, 2024
abfa6e8
midway notebook fixed + print statements to algo test
jbadsdata Sep 6, 2024
fc0fe21
midway nb
jbadsdata Sep 6, 2024
fb021f5
Merge pull request #36 from tsdataclinic/synthetic_data_example_notebook
jbadsdata Sep 6, 2024
113c577
synthetic data example nb (#37)
jbadsdata Sep 6, 2024
37023de
WIP Add Requerying Optimizer
CGe0516 Sep 11, 2024
a93fc82
add battery class to encode variable power curve and return this data…
robinelliott-ts Sep 13, 2024
a86373e
Added total_intervals argument to API
Sep 17, 2024
760c4ca
Added conversion utility
Sep 17, 2024
a05a892
Add testing for recaulcating optimizier
CGe0516 Sep 20, 2024
999ee45
Merge pull request #39 from tsdataclinic/yh_new_branch
jbadsdata Sep 23, 2024
ed93c74
battery class file
marleneguraieb Sep 26, 2024
ab0f495
function to generate device name
marleneguraieb Sep 26, 2024
47bd657
test notebook up
jbadsdata Sep 29, 2024
1f7ca44
metrics added
jbadsdata Sep 29, 2024
9d6729e
Merge pull request #40 from tsdataclinic/develop
jbadsdata Sep 29, 2024
efdf249
contiguity
jbadsdata Sep 30, 2024
5e5aa94
cumsum plot
jbadsdata Sep 30, 2024
37fa362
Update test_recalculating_optimizer.py
jbadsdata Sep 30, 2024
71e3621
requerying eval
CanyonFoot Oct 1, 2024
6a16a2f
requery notebook
CanyonFoot Oct 1, 2024
1f899b6
regional forecast accuracy
CanyonFoot Oct 1, 2024
e27e444
date repro
CanyonFoot Oct 3, 2024
12aef3e
Merge pull request #41 from tsdataclinic/vcsd
jbadsdata Oct 4, 2024
58be6fc
requerying eval
CanyonFoot Oct 1, 2024
efe5f74
requery notebook
CanyonFoot Oct 1, 2024
b251460
regional forecast accuracy
CanyonFoot Oct 1, 2024
9ff7f22
date repro
CanyonFoot Oct 3, 2024
d31ead7
variable contiguous with tests
Oct 16, 2024
85b0903
Merge branch 'develop' into anniez-contiguous
Oct 16, 2024
5d49642
variable contiguous fit
Oct 16, 2024
3aa8d4b
test expansion
Oct 16, 2024
79d143a
moer.py updated
jbadsdata Oct 17, 2024
4bde3e5
optC and test updated
jbadsdata Oct 18, 2024
dd2c501
api.py update
jbadsdata Oct 18, 2024
3d72a76
Merge pull request #44 from tsdataclinic/annie_contiguous_check
jbadsdata Oct 18, 2024
cac6136
extend eval to take multiple forecasts
CanyonFoot Oct 18, 2024
bbc2bca
notebooks for requery
CanyonFoot Oct 18, 2024
de0600d
Merge branch 'canyon_requery' of github.com:tsdataclinic/watttime-pyt…
CanyonFoot Oct 18, 2024
e53f233
code merge bug fix -- test_new.py should run now
Oct 18, 2024
955be34
full api integration and bug fix
Oct 18, 2024
772a29d
fix rounding
Oct 19, 2024
35fb509
Added contiguous algorithm with fixed intervals
Oct 23, 2024
809adce
requerying notebook
CanyonFoot Oct 24, 2024
151f4ad
generate data for requery analysis
CanyonFoot Oct 25, 2024
bf6de8f
analysis figures
CanyonFoot Oct 25, 2024
f19daa8
add historical actuals
CanyonFoot Oct 25, 2024
f536d18
speed up get_usage_power_kw_df(). When I tested this is now 100x fast…
robinelliott-ts Oct 28, 2024
c836e33
requery repro
CanyonFoot Oct 29, 2024
10c5fab
review and test of variable charging curve optimizer behavior
robinelliott-ts Oct 9, 2024
a951ec0
add get_time_needed
robinelliott-ts Oct 22, 2024
f818773
commit of test variable charge notebook before rebase onto robin_2024…
robinelliott-ts Oct 30, 2024
f16e10c
test to ensure variable charging curve behaviour is working
robinelliott-ts Oct 30, 2024
4a4b300
Add test description to docstring
robinelliott-ts Oct 30, 2024
88273c6
Update descriptions
robinelliott-ts Oct 30, 2024
2b23818
minor text changes
robinelliott-ts Oct 30, 2024
c09de9c
minor text changes
robinelliott-ts Oct 30, 2024
e918252
Merge pull request #43 from tsdataclinic/anniez-contiguous
jbadsdata Oct 30, 2024
7fc0b1c
Update api.py
jbadsdata Oct 30, 2024
d758f76
Merge branch 'develop' into robin_speed_up_get_usage_power_kw_df
jbadsdata Oct 30, 2024
22e0416
Merge pull request #46 from tsdataclinic/robin_speed_up_get_usage_pow…
jbadsdata Oct 30, 2024
1c4becb
rename algorithms and allow not using all contiguous intervals
Nov 3, 2024
3e29e91
docstring update for use_all_intervals
Nov 3, 2024
ba4cd39
docstring; todo on constraints?
Nov 4, 2024
648bc92
add missing attributes
jbadsdata Nov 4, 2024
07e09d3
prepping synth data example
jbadsdata Nov 6, 2024
14d98de
metrics class testing
jbadsdata Nov 6, 2024
19a0304
requery
CanyonFoot Nov 6, 2024
88a8e13
Merge branch 'develop' into anniez_contiguous_20241103
jbadsdata Nov 7, 2024
a557547
Merge pull request #47 from tsdataclinic/anniez_contiguous_20241103
jbadsdata Nov 7, 2024
af5f86f
Merge pull request #48 from tsdataclinic/develop
jbadsdata Nov 7, 2024
895e43c
enable contiguous
jbadsdata Nov 7, 2024
808f869
ready for review
jbadsdata Nov 7, 2024
20ea9eb
shuffled notebook location
jbadsdata Nov 7, 2024
f5c145c
Merge pull request #49 from tsdataclinic/user_test_prep
jbadsdata Nov 7, 2024
c458cbb
bug fix: remove constraints on api level
Nov 8, 2024
c1ecfec
Merge branch 'anniez_contiguous_20241103' of https://github.com/tsdat…
Nov 8, 2024
7e1d49a
Merge pull request #50 from tsdataclinic/anniez_contiguous_20241103
jbadsdata Nov 8, 2024
c14c397
byod continues
jbadsdata Nov 8, 2024
a64bf6d
Clean up the interpolated SoE code, and add conversion between SoC an…
Oct 8, 2024
b686d78
Added new file api_test, along with some framework for allowing 2 of …
Oct 28, 2024
30bb94b
Resolve merge conflicts and improve tests
Nov 1, 2024
1a24b9c
Remove redundant lines
Nov 7, 2024
043a0ab
jb
jbadsdata Nov 8, 2024
04d2acc
Add API feature for constraints
Nov 8, 2024
69ab380
docstrings
jbadsdata Nov 8, 2024
a78e376
Merge pull request #51 from tsdataclinic/develop
jbadsdata Nov 8, 2024
22b08c8
BYOD running
jbadsdata Nov 8, 2024
ddb89c1
Merge pull request #42 from tsdataclinic/yh_conversion_branch_1
jbadsdata Nov 8, 2024
bda20c7
Merge pull request #52 from tsdataclinic/user_test_prep
jbadsdata Nov 8, 2024
6f3c21f
small fixes applied
jbadsdata Nov 8, 2024
690e0c7
Merge branch 'main' into develop
jbadsdata Nov 8, 2024
a7daa0d
Merge pull request #53 from tsdataclinic/develop
jbadsdata Nov 8, 2024
f445159
fix spaces
CanyonFoot Nov 11, 2024
fb78088
Merge branch 'canyon_requery' into develop
CanyonFoot Nov 12, 2024
54c8c21
Add more rigorous testing
Nov 18, 2024
73140e8
Fix bug with non-round charging constraints
Nov 18, 2024
845a813
Refactor optCharger.py to use snake case
Nov 18, 2024
182a1a7
Minor refactor
Nov 19, 2024
14865d7
applied refactor to optimizer test.py
jbadsdata Nov 20, 2024
2dc930f
replace defunct tests
jbadsdata Nov 20, 2024
5893fc3
Add rounding logic for handling unround minutes with interval constra…
Nov 24, 2024
7f009ce
Merge pull request #58 from tsdataclinic/yh_conversion_branch_1
jbadsdata Nov 25, 2024
9e6a482
Resolve edge cases by using interval ids
Nov 26, 2024
40871ae
Algorithmic simplifications and minor rename
Nov 26, 2024
fad32bd
modified reqs
jbadsdata Nov 29, 2024
21a6078
requirements set to python 3.9
jbadsdata Nov 29, 2024
58e90e6
yml added
jbadsdata Nov 29, 2024
f1af3e8
removed unused packages
jbadsdata Nov 29, 2024
00c7a98
Merge pull request #60 from tsdataclinic/main_mods_testing
jbadsdata Nov 29, 2024
ff90987
Merge pull request #59 from tsdataclinic/yh_conversion_branch_1
jbadsdata Nov 30, 2024
41f1f73
Merge pull request #62 from tsdataclinic/main
jbadsdata Nov 30, 2024
bd5ce05
changes from WattTime SDK main
jbadsdata Dec 2, 2024
6bcb0ff
Merge pull request #63 from tsdataclinic/main_sdk_changes
jbadsdata Dec 2, 2024
5650b3b
Resolve some TODOs and clean up code
Dec 19, 2024
d1b278c
Moved unittests for optimizer to tests folder
Dec 20, 2024
dc47d0f
Clean up API, TODOs and test cases
Dec 20, 2024
a7cba94
Merge pull request #64 from tsdataclinic/yh_conversion_branch_1
jbadsdata Dec 23, 2024
6bd9faa
WIP requerying with contiguity
CGe0516 Nov 12, 2024
d3ff471
vscode gitignore
CanyonFoot Nov 18, 2024
b1978a2
notebooks for requery
CanyonFoot Nov 18, 2024
e617400
adjust recalculating optimizer with contiguity to stitch together rem…
CGe0516 Nov 15, 2024
50d8d15
Fixing bugs in RecalculatingWattTimeOptimizerWithContiguity
CGe0516 Nov 16, 2024
bcef2c2
requery updates
CanyonFoot Nov 20, 2024
6433092
fixes
CanyonFoot Nov 20, 2024
3663f0d
conflict res
jbadsdata Nov 30, 2024
6fbfa0c
conflict res p2
jbadsdata Nov 30, 2024
063b9c8
cs 3
jbadsdata Nov 30, 2024
6db994f
cs4
jbadsdata Nov 30, 2024
945c0ef
reformatting
jbadsdata Dec 3, 2024
1e6029a
prep work requery analysis
jbadsdata Dec 3, 2024
0d2b6da
errors
jbadsdata Dec 5, 2024
f6de5a5
testing requery framework
jbadsdata Dec 5, 2024
263b1ab
requery tests
jbadsdata Dec 5, 2024
88e9091
bug
jbadsdata Dec 5, 2024
06fde88
issues re: optimizer selection
jbadsdata Dec 6, 2024
ade920e
requery results
jbadsdata Dec 9, 2024
8e2946d
bad dat df stored
jbadsdata Dec 10, 2024
5e741f4
removed while statement
jbadsdata Dec 11, 2024
16b5cfe
loop errors
jbadsdata Dec 12, 2024
b081f0b
analysis loop WIP
jbadsdata Dec 18, 2024
b40d17f
Fix recalculating with contiguity tests
CGe0516 Dec 27, 2024
77cdfcf
restored cleanups from yh commit
jbadsdata Dec 30, 2024
b3de37f
added main call to unit test
jbadsdata Jan 2, 2025
10c233c
autoflake to remove unusaged vars + imports
jbadsdata Jan 2, 2025
45a6797
black formatted
jbadsdata Jan 2, 2025
5d6f100
Merge pull request #69 from tsdataclinic/merge_requery_func
jbadsdata Jan 2, 2025
dd9be49
small updates from main
jbadsdata Jan 2, 2025
1049f4d
Merge pull request #71 from tsdataclinic/changes_from_main
jbadsdata Jan 2, 2025
906d11c
optimizer works, issues with recalc
jbadsdata Jan 2, 2025
acc8d5d
Fix recalculating optimizer tests
CGe0516 Jan 6, 2025
80fc8a6
Move recalculating optimizer tests
CGe0516 Jan 6, 2025
7ccf83b
readme
jbadsdata Jan 6, 2025
d78e18a
Merge pull request #72 from tsdataclinic/sdk_only
jbadsdata Jan 6, 2025
cc5920b
main mods
jbadsdata Jan 6, 2025
44d861a
remove venv
jbadsdata Jan 6, 2025
61b836c
Merge pull request #73 from tsdataclinic/dev
jbadsdata Jan 6, 2025
a4883ff
Delete watttime/__pycache__ directory
jbadsdata Jan 6, 2025
d580ba0
Merge pull request #74 from tsdataclinic/jbadsdata-patch-1
jbadsdata Jan 6, 2025
a81765d
Delete watttime/optimizer/alg/__pycache__ directory
jbadsdata Jan 6, 2025
8c6c293
Merge pull request #75 from tsdataclinic/jbadsdata-patch-2
jbadsdata Jan 6, 2025
cf715f4
main::optimizer conflicts
jbadsdata Jan 9, 2025
1fcf827
Merge branch 'main' into main_rebase
jbadsdata Jan 9, 2025
a1f2dad
Update README.md
jbadsdata Jan 9, 2025
fd9ede5
Merge pull request #78 from tsdataclinic/main_rebase
jbadsdata Jan 9, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,5 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

.DS_Store
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ We provide two methods to access location data:
```python
from watttime import WattTimeMaps

wt = WattTimeMaps(username, password)
wt = WattTimeMaps()

# get BA region for a given location
wt.region_from_loc(
Expand Down
Empty file added tests/__init__.py
Empty file.
Loading