Skip to content

Addresses SAM issue 486 - remove wex JSON and replace with RapidJSON#1821

Merged
sjanzou merged 15 commits into
patchfrom
SAM_486
Jul 28, 2024
Merged

Addresses SAM issue 486 - remove wex JSON and replace with RapidJSON#1821
sjanzou merged 15 commits into
patchfrom
SAM_486

Conversation

@sjanzou

@sjanzou sjanzou commented Jul 25, 2024 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Goes with NatLabRockies/wex#173

Please test utility rate retrieval and downloading and applying rates.

sjanzou added 14 commits July 21, 2024 05:21
@sjanzou
rapidjson failing to parse geocode return json #486
1731a7a
@sjanzou
Convert GeocodeDeveloper to rapidjson #486
171db0d
@sjanzou
Finish geocode.cpp conversion to rapidjson #486
d69aed6
@sjanzou
nsrdb.cpp converted to rapidjson #486
d1155dd
@sjanzou
Update uiobjects.cpp to use rapidjson #486
217ed0e
@sjanzou
Update windtoolkit.cpp to rapidjson and fix GitHub Actions build errors
7bfe035 
#486
@sjanzou
Merge branch 'patch' into SAM_486
aec9ee2
@sjanzou
Finish removing all wex/json dependencies and replaced with RapidJSON #…
aacc3df 
…486
@sjanzou
Update all OpenEI class for RapidJSON except RetrieveUtilityRateData #…
8c604ed 
…486
@sjanzou
Merge branch 'patch' into SAM_486
cf2ae56
@sjanzou
Missing api updates from patch and update urdb.cpp to address failing GA
c9910d7
@sjanzou
GitHub Actions issue with const lvalue #486
97ee149
@sjanzou
OpenEI::RetrieveUtilityRateData working with RapidJSON #486
4f85bc9
@sjanzou
Update and test several rates - ready for pull request #486
9cdbc35
@sjanzou sjanzou self-assigned this Jul 25, 2024
@sjanzou sjanzou linked an issue Jul 25, 2024 that may be closed by this pull request
Use RapidJSON through SAM code #486
Closed
brtietz
brtietz requested changes Jul 25, 2024
View reviewed changes

@brtietz brtietz left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Unfortunately utility rate retrieval is only retrieving adjustments, not the full rate.

For rate RE-TOU for Xcel Energy of Colorado (https://apps.openei.org/IURDB/rate/view/66105af1efc5816003025d2a), Patch correctly pulls the following rate:

image

This branch pulls:

image

I think this is related to line 846 in urdb.cpp, see comment on that line for details.

Comment thread src/urdb.cpp Outdated
if (ers_tier[tier]["max"].IsDouble())
max = ers_tier[tier]["max"].GetDouble();
double buy = 0.0;
if (ers_tier[tier].HasMember("buy"))

@brtietz brtietz Jul 25, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think this should be "rate" instead of "buy" see error in main comment:

image

@sjanzou

sjanzou commented Jul 26, 2024

Copy link
Copy Markdown
Collaborator Author

Unfortunately utility rate retrieval is only retrieving adjustments, not the full rate.

For rate RE-TOU for Xcel Energy of Colorado (https://apps.openei.org/IURDB/rate/view/66105af1efc5816003025d2a), Patch correctly pulls the following rate:

image

This branch pulls:

image

I think this is related to line 846 in urdb.cpp, see comment on that line for details.

@brtietz , thanks for catching the "buy" versus "rate" mistake for energy charges - updated and test in 4a6ba0d

image

@sjanzou sjanzou requested a review from brtietz July 26, 2024 05:20
brtietz
brtietz approved these changes Jul 26, 2024
View reviewed changes

@brtietz brtietz left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks for updating! Everything tests well with the fix.

@sjanzou sjanzou merged commit 720a227 into patch Jul 28, 2024
@sjanzou sjanzou deleted the SAM_486 branch July 28, 2024 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brtietz brtietz brtietz approved these changes

@cpaulgilman cpaulgilman Awaiting requested review from cpaulgilman

@mjprilliman mjprilliman Awaiting requested review from mjprilliman

Assignees

@sjanzou sjanzou

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Use RapidJSON through SAM code

2 participants

@sjanzou @brtietz