Skip to content

Comments

Fix PySMO tests#903

Merged
lbianchi-lbl merged 6 commits intoIDAES:mainfrom
OOAmusat:fix_test_errors
Jul 5, 2022
Merged

Fix PySMO tests#903
lbianchi-lbl merged 6 commits intoIDAES:mainfrom
OOAmusat:fix_test_errors

Conversation

@OOAmusat
Copy link
Contributor

@OOAmusat OOAmusat commented Jul 1, 2022

Fixes

Fixes #897

Summary/Motivation:

Fixes broken PySMO tests

Changes proposed in this PR:

  • Relax pytest tolerance on regression test by one order of magnitude
  • Change krigind training data around to remove variable dependence

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.txt file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@codecov
Copy link

codecov bot commented Jul 1, 2022

Codecov Report

Merging #903 (050da9a) into main (d217129) will increase coverage by 0.22%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #903      +/-   ##
==========================================
+ Coverage   69.27%   69.49%   +0.22%     
==========================================
  Files         498      578      +80     
  Lines       64322    64861     +539     
  Branches    12038    12064      +26     
==========================================
+ Hits        44559    45078     +519     
- Misses      17502    17513      +11     
- Partials     2261     2270       +9     
Impacted Files Coverage Δ
idaes/core/surrogate/pysmo_surrogate.py 91.63% <100.00%> (+0.02%) ⬆️
idaes/ver.py 61.53% <0.00%> (-4.62%) ⬇️
...es/power_generation/costing/power_plant_costing.py 100.00% <0.00%> (ø)
idaes/surrogate/alamopy.py 100.00% <0.00%> (ø)
...eets/subcritical_power_plant/subcritical_boiler.py 100.00% <0.00%> (ø)
...ties/methane_iron_OC_reduction/gas_phase_thermo.py 100.00% <0.00%> (ø)
.../subcritical_power_plant/generic_surrogate_dict.py 100.00% <0.00%> (ø)
.../power_generation/unit_models/waterwall_section.py 100.00% <0.00%> (ø)
idaes/power_generation/unit_models/__init__.py 100.00% <0.00%> (ø)
...rcritical_power_plant/boiler_subflowsheet_build.py 100.00% <0.00%> (ø)
... and 77 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d217129...050da9a. Read the comment docs.

@OOAmusat OOAmusat requested review from bpaul4, dangunter and lbianchi-lbl and removed request for dangunter July 1, 2022 22:28
Copy link
Contributor

@bpaul4 bpaul4 left a comment

Choose a reason for hiding this comment

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

I'm trusting that the results changes make sense for the new input vector, thanks for looking into this @OOAmusat.

Copy link
Contributor

@lbianchi-lbl lbianchi-lbl left a comment

Choose a reason for hiding this comment

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

I don't understand the specifics, but the tests pass and the coverage went up.

@bpaul4
Copy link
Contributor

bpaul4 commented Jul 5, 2022

@dangunter committed a minor change to the DMF notebooks an hour ago that is failing the examples runs, I'm not sure if this was intentional: IDAES/examples-pse@eb4d22d

@lbianchi-lbl
Copy link
Contributor

The "Run examples" failures are most likely not related with the changes in this PR, see IDAES/examples-pse#122.

@lbianchi-lbl lbianchi-lbl added the CI:run-integration triggers_workflow: Integration label Jul 5, 2022
@idaes-build idaes-build removed the CI:run-integration triggers_workflow: Integration label Jul 5, 2022
@lbianchi-lbl lbianchi-lbl merged commit d1a2add into IDAES:main Jul 5, 2022
@ksbeattie ksbeattie added the Priority:High High Priority Issue or PR label Jul 14, 2022
bpaul4 added a commit to MAZamarripa/idaes-pse that referenced this pull request Jul 18, 2022
* Sphinx Documentation Build Issue (IDAES#890)

* switch lang flag to 'en'

* Flag formatting

* Update path reference

* updating power plant capcost and QGESS tests to run as expected

* bring over MEA_CCS updates and tests

* running black on costing/ directory

* move custom dicts to new file

* fix some spacing causing doc build errors

* Replace method calls with UnitModelCostingBlocks

* Running black on the entire repo (IDAES#894)

* Running black on the entire repo

* Add pinned requirement for Black stable version

* Add CI check to ensure code is Black-formatted

Co-authored-by: Ludovico Bianchi <[email protected]>

* Fix PySMO tests (IDAES#903)

* Minor change to trigger tests

* Added abs to tolerance check

* Run black

* Remove string comparison

* Tighten tolerance

* Fixed kriging test by removing variable dependence

* bring in report method updates

* bring in more MEA CCS updates

* Add check on total TPC

* final formatting fixes

* Update report method

Adding cost of electricity and cost of capture to report method

* Black reformatting

* Update report method

Fixing units of cost of electricity

Co-authored-by: Keith Beattie <[email protected]>
Co-authored-by: Ludovico Bianchi <[email protected]>
Co-authored-by: OOAmusat <[email protected]>
Co-authored-by: Daison2102 <[email protected]>
andrewlee94 pushed a commit that referenced this pull request Oct 14, 2022
* updating power plant costing to new costing framework

* updating power plant capcost and QGESS tests to run as expected

* bring over MEA_CCS updates and tests

* running black on costing/ directory

* move custom dicts to new file

* fix some spacing causing doc build errors

* Replace method calls with UnitModelCostingBlocks

* bring in report method updates

* bring in more MEA CCS updates

* Add check on total TPC

* final formatting fixes

* Update report method

Adding cost of electricity and cost of capture to report method

* Black reformatting

* Update report method

Fixing units of cost of electricity

* Fixing test issues, bringing in MEA_CCS code (#1)

* Sphinx Documentation Build Issue (#890)

* switch lang flag to 'en'

* Flag formatting

* Update path reference

* updating power plant capcost and QGESS tests to run as expected

* bring over MEA_CCS updates and tests

* running black on costing/ directory

* move custom dicts to new file

* fix some spacing causing doc build errors

* Replace method calls with UnitModelCostingBlocks

* Running black on the entire repo (#894)

* Running black on the entire repo

* Add pinned requirement for Black stable version

* Add CI check to ensure code is Black-formatted

Co-authored-by: Ludovico Bianchi <[email protected]>

* Fix PySMO tests (#903)

* Minor change to trigger tests

* Added abs to tolerance check

* Run black

* Remove string comparison

* Tighten tolerance

* Fixed kriging test by removing variable dependence

* bring in report method updates

* bring in more MEA CCS updates

* Add check on total TPC

* final formatting fixes

* Update report method

Adding cost of electricity and cost of capture to report method

* Black reformatting

* Update report method

Fixing units of cost of electricity

Co-authored-by: Keith Beattie <[email protected]>
Co-authored-by: Ludovico Bianchi <[email protected]>
Co-authored-by: OOAmusat <[email protected]>
Co-authored-by: Daison2102 <[email protected]>

* costing updates

* costing updates

* improving generic variable O&M costs calculation

* Updating currency and basis unit handling, other minor fixes

* Zipping together costing dictionaries

* Improvements from review comments

* Updating tests for new changes

* Updating author tags

* Removing QGESS tests, updating NGCC tests, adding capcost tests, param unit fixes

* Sort author list

* General improvements and cost variable unit corrections

* Removing deprecated default arguments

* Addressing most review comments

* Addressing more review comments

* Testing and coverage improvements

* Resolving pylint and directory reference issues

* Separating power plant currency units

* cleaning up comments

* Final fixes from review comments

* Add some checks to json regeneration test

Co-authored-by: Miguel Zamarripa-Perez <[email protected]>
Co-authored-by: Daison2102 <[email protected]>
Co-authored-by: Keith Beattie <[email protected]>
Co-authored-by: Ludovico Bianchi <[email protected]>
Co-authored-by: OOAmusat <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Priority:High High Priority Issue or PR

Projects

No open projects

Development

Successfully merging this pull request may close these issues.

PySMO Surrogate Tests Failing on Linux Due To Latest Numpy Release

5 participants