v3.12.1 After Tax Savings and Results Table Spreadsheet Updates #635
Conversation
…ng the GHX residual value
After Tax Savings and Updates to Results Table Spreadsheet
There was a problem hiding this comment.
Pull Request Overview
This pull request implements updates to the REopt results table workbook and underlying financial output models to better support after-tax savings calculations and streamline the spreadsheet formatting and documentation. Key changes include:
- Reordering and adjusting worksheet creation and formatting in reoptjl/views.py to improve the display of both results and instructions.
- Renaming and adding several financial metric fields in reoptjl/models.py with corresponding migrations.
- Updating ancillary files (e.g. docker-compose.yml and Manifest.toml) to support new runtime configurations and dependency versions.
Reviewed Changes
Copilot reviewed 12 out of 14 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| reoptjl/views.py | Adjusted worksheet creation order, updated formats (e.g. percent and payback formats), and modified row spacing and instructions content. |
| reoptjl/models.py | Renamed model field names and updated help texts for clarity along with additional financial and operational cost fields. |
| migrations/* | Auto-generated migration scripts for renaming fields and adding new financial outputs. |
| julia_src/Manifest.toml | Updated dependency version and git-tree-sha1 for REopt. |
| docker-compose.yml | Modified the startup command to ensure proper dependency instantiation via Julia. |
Files not reviewed (2)
- julia_src/http.jl: Language not supported
- reoptjl/test/posts/central_plant_ghp.json: Language not supported
| - XPRESS_INSTALLED=False | ||
| command: julia --project=/opt/julia_src http.jl | ||
| # command: julia --project=/opt/julia_src http.jl | ||
| command: julia --project=. -e 'using Pkg; Pkg.instantiate(); include("http.jl")' |
There was a problem hiding this comment.
The command string uses double quotes inside single quotes, which may cause YAML parsing issues. Consider escaping the inner double quotes or using a consistent quoting strategy (for example, use single quotes around the file name) to ensure proper command execution.
| command: julia --project=. -e 'using Pkg; Pkg.instantiate(); include("http.jl")' | |
| command: "julia --project=. -e \"using Pkg; Pkg.instantiate(); include('http.jl')\"" |
Update CHANGELOG.md
Bill-Becker
changed the title
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull Request Overview
This PR updates the REopt results table spreadsheet and financial outputs to incorporate enhanced after-tax savings calculations while also updating documentation and dependency versions. Key changes include:
- Improvements to Excel workbook formatting and instruction text in reoptjl/views.py.
- Renaming and addition of multiple output fields in reoptjl/models.py along with corresponding migration files.
- Updates to the REopt.jl dependency version and docker-compose command configuration.
Reviewed Changes
Copilot reviewed 13 out of 15 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| reoptjl/views.py | Adjustments to worksheet order, formatting (e.g., percentage and payback formats), and column widths. |
| reoptjl/models.py | Renaming and addition of financial output fields for after-tax savings and cost calculations. |
| reoptjl/migrations/*.py | Multiple migration files updating field names and adding new output fields. |
| julia_src/Manifest.toml | Updated REopt.jl version from 0.51.0 to 0.51.1 and corresponding git-tree-sha1 change. |
| docker-compose.yml | Modified the command to run the Julia project with package instantiation. |
| CHANGELOG.md | Documented the changes made in this PR. |
Files not reviewed (2)
- julia_src/http.jl: Language not supported
- reoptjl/test/posts/central_plant_ghp.json: Language not supported
docker-compose.yml
Outdated
| - XPRESS_INSTALLED=False | ||
| command: julia --project=/opt/julia_src http.jl | ||
| # command: julia --project=/opt/julia_src http.jl | ||
| command: julia --project=. -e 'using Pkg; Pkg.instantiate(); include('http.jl')' |
There was a problem hiding this comment.
The command string contains unescaped inner single quotes around 'http.jl', which will break the shell command. Consider using double quotes inside the command (e.g., include("http.jl")) or appropriately escaping the inner quotes.
| command: julia --project=. -e 'using Pkg; Pkg.instantiate(); include('http.jl')' | |
| command: julia --project=. -e "using Pkg; Pkg.instantiate(); include('http.jl')" |
…n compose command" This reverts commit d314ec2.
See PR: