Skip to content

Commit

Permalink
Merge branch 'develop' into os-solver
Browse files Browse the repository at this point in the history
  • Loading branch information
Bill-Becker committed Mar 28, 2024
2 parents 41b6f9c + bd942b1 commit 2d3eaaf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ Classify the change according to the following categories:
##### Removed
### Patches

## v3.6.1
### Minor Updates
#### Fixed
- See updates from REopt.jl v0.43.0: https://github.com/NREL/REopt.jl/pull/364

## v3.6.0
### Minor Updates
#### Changed
Expand Down
2 changes: 1 addition & 1 deletion reoptjl/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def obj_create(self, bundle, **kwargs):
meta = {
"run_uuid": run_uuid,
"api_version": 3,
"reopt_version": "0.41.0",
"reopt_version": "0.43.0",
"status": "Validating..."
}
bundle.data.update({"APIMeta": meta})
Expand Down
2 changes: 1 addition & 1 deletion reoptjl/test/test_http_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def test_steamturbine_defaults(self):
# Check the endpoint logic with the expected selection
self.assertEqual(http_response["prime_mover"], "steam_turbine")
self.assertEqual(http_response["size_class"], 1)
self.assertGreater(http_response["chp_size_based_on_avg_heating_load_kw"], 574.419)
self.assertGreater(http_response["chp_elec_size_heuristic_kw"], 574.419)

def test_absorption_chiller_defaults(self):

Expand Down

0 comments on commit 2d3eaaf

Please sign in to comment.