Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new AutoScaler and CustomScalerBase classes #1429

Merged
merged 78 commits into from
Oct 9, 2024
Merged

Add new AutoScaler and CustomScalerBase classes #1429

merged 78 commits into from
Oct 9, 2024

Commits on Jun 14, 2024

  1. Adding infrastructure to support ipopt_v2

    @andrewlee94
    andrewlee94 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    528a4f7 View commit details
    Browse the repository at this point in the history

  2. Moving core/util to ipopt_v2

    @andrewlee94
    andrewlee94 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    0faabba View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Moving MH initializer to ipopt_v2

    @andrewlee94
    andrewlee94 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    47d9d73 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Fixing pint version issue

    @andrewlee94
    andrewlee94 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    47beac6 View commit details
    Browse the repository at this point in the history

  2. Set TSA to use old IPOPT interface

    @andrewlee94
    andrewlee94 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c39f256 View commit details
    Browse the repository at this point in the history

  3. Fixing conflict

    @andrewlee94
    andrewlee94 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    04f1463 View commit details
    Browse the repository at this point in the history

  4. Trying to resolve Windows failures

    @andrewlee94
    andrewlee94 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    3ce08dd View commit details
    Browse the repository at this point in the history

  5. Working on platofrm dependent failure

    @andrewlee94
    andrewlee94 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    4aa1405 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. BTInitializer with presolve

    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    7353472 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/IDAES/idaes-pse into presolve

    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    e88bd83 View commit details
    Browse the repository at this point in the history

  3. Moving last bits of core code to ipopt_v2

    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    d5135f4 View commit details
    Browse the repository at this point in the history

  4. Starting on idaes/models

    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    9ccc8b4 View commit details
    Browse the repository at this point in the history

  5. Removing ma57_automatic_scaling default and updating idaes/models/con… 

    …trol
    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    9423501 View commit details
    Browse the repository at this point in the history

  6. idaes/model/properties part 1

    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    6754964 View commit details
    Browse the repository at this point in the history

  7. Remaining parts of idaes/models/proeprties

    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    f6079ca View commit details
    Browse the repository at this point in the history

  8. Fixing typo

    @andrewlee94
    andrewlee94 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    ad475fd View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Switching idaes/models/unit_models to ipopt_v2

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    dda16b3 View commit details
    Browse the repository at this point in the history

  2. Attempt to work around HXLC issues for now

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    bc8e411 View commit details
    Browse the repository at this point in the history

  3. Some clean up

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    4273e24 View commit details
    Browse the repository at this point in the history

  4. Switching modular properties initializer to solver indexed blocks

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    542914a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'modular_properties_init' into presolve

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6578d01 View commit details
    Browse the repository at this point in the history

  6. Addressing comments

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    84e9d69 View commit details
    Browse the repository at this point in the history

  7. Recovering from previous branch

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c3615a1 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'presolve' into autoscaling_rebase

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6a7750c View commit details
    Browse the repository at this point in the history

  9. Some clean up

    @andrewlee94
    andrewlee94 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8be4d5a View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Adding ScalerBase class and tests

    @andrewlee94
    andrewlee94 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    dbdbdd4 View commit details
    Browse the repository at this point in the history

  2. Working on CustomScalerBase

    @andrewlee94
    andrewlee94 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    adc2809 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Nominal value constraint scaling

    @andrewlee94
    andrewlee94 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    d9f1904 View commit details
    Browse the repository at this point in the history

  2. Adding some initial integration tests for scaling

    @andrewlee94
    andrewlee94 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    5f4fe46 View commit details
    Browse the repository at this point in the history

  3. Some more nominal magnitude scaling approaches

    @andrewlee94
    andrewlee94 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    72a183d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #21 from andrewlee94/custom_scalers_proto 

    Test merging custom scalers in with autoscalers
    @andrewlee94
    andrewlee94 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    a6ef9cb View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Prototyping pseudojacobian scaler

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    a12cb95 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into autoscaling

    @andrewlee94
    andrewlee94 authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    b3aafb0 View commit details
    Browse the repository at this point in the history

  3. Trying to debug pseudojacobian

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    c51672f View commit details
    Browse the repository at this point in the history

  4. Removing unnecessary import

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    861ef58 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of https://github.com/IDAES/idaes-pse

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    3805792 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into autoscaling

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    fbedaf4 View commit details
    Browse the repository at this point in the history

  7. Addressing pylint issues

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    76bec99 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'autoscaling' into custom_scalers_proto

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    eec789e View commit details
    Browse the repository at this point in the history

  9. Cleaning up nominal jacobian

    @andrewlee94
    andrewlee94 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    d80eed6 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. More methods for CustomScalerBase

    @andrewlee94
    andrewlee94 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    c88879e View commit details
    Browse the repository at this point in the history

  2. Prototyping Gibbs reactor scaler

    @andrewlee94
    andrewlee94 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    5a29597 View commit details
    Browse the repository at this point in the history

  3. Gibbs reactor constraint scaling

    @andrewlee94
    andrewlee94 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    154a622 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Working on testing and profiling

    @andrewlee94
    andrewlee94 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a6d61fa View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. Refining Gibbs scaler

    @andrewlee94
    andrewlee94 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    86faf86 View commit details
    Browse the repository at this point in the history

  2. Refining nominal value walker

    @andrewlee94
    andrewlee94 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    ac2b639 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Fixing walker tests

    @andrewlee94
    andrewlee94 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    f3f6330 View commit details
    Browse the repository at this point in the history

  2. Testing GibbsScaler with initialization

    @andrewlee94
    andrewlee94 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    ce8c202 View commit details
    Browse the repository at this point in the history

  3. Fixing auto norm scaling on indexed blocks

    @andrewlee94
    andrewlee94 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    05537fd View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Testing scaling profiler

    @andrewlee94
    andrewlee94 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    3c302e6 View commit details
    Browse the repository at this point in the history

  2. Fixing typos

    @andrewlee94
    andrewlee94 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    937e596 View commit details
    Browse the repository at this point in the history

  3. Fixing pylint issue

    @andrewlee94
    andrewlee94 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    ef9c5e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Imrpoving some doc strings

    @andrewlee94
    andrewlee94 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    6662fc7 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge branch 'main' into autoscaling

    @andrewlee94
    andrewlee94 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    0308f1e View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Apply suggestions from code review 

    Co-authored-by: MarcusHolly <[email protected]>
    @andrewlee94 @MarcusHolly
    andrewlee94 and MarcusHolly authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ec49414 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Merge branch 'main' into autoscaling

    @andrewlee94
    andrewlee94 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f7eda46 View commit details
    Browse the repository at this point in the history

  2. Fixing issue with autoscaling vars with value None

    @andrewlee94
    andrewlee94 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e3b169d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'autoscaling' of https://github.com/andrewlee94/idaes-pse … 

    …into autoscaling
    @andrewlee94
    andrewlee94 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    1370bbe View commit details
    Browse the repository at this point in the history

  4. Adding profiler to __init__

    @andrewlee94
    andrewlee94 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    a5de0b7 View commit details
    Browse the repository at this point in the history

  5. Fixing name for RSS method

    @andrewlee94
    andrewlee94 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0964c7a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Merge branch 'main' of https://github.com/IDAES/idaes-pse into autosc… 

    …aling
    @andrewlee94
    andrewlee94 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0af66e1 View commit details
    Browse the repository at this point in the history

  2. Fixing import of pyomo.environ

    @andrewlee94
    andrewlee94 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0f6d262 View commit details
    Browse the repository at this point in the history

  3. Allowing default scaling for indexed components

    @andrewlee94
    andrewlee94 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    bd1b6aa View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Adding catch for critical solver failure in profiler

    @andrewlee94
    andrewlee94 committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    0cad4ed View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge branch 'main' into autoscaling

    @andrewlee94
    andrewlee94 authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    3b6ae69 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'autoscaling' of https://github.com/andrewlee94/idaes-pse … 

    …into autoscaling
    @andrewlee94
    andrewlee94 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f3940a1 View commit details
    Browse the repository at this point in the history

  3. Starting on docs

    @andrewlee94
    andrewlee94 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    c71fbd1 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Finishing docs and unifiying method names

    @andrewlee94
    andrewlee94 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    10fbf3d View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Profiler report methods and docs

    @andrewlee94
    andrewlee94 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    794f1ed View commit details
    Browse the repository at this point in the history

  2. Fixing typos

    @andrewlee94
    andrewlee94 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    21ef587 View commit details
    Browse the repository at this point in the history

  3. Pylint: fix unnecessary f-string

    @andrewlee94
    andrewlee94 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    2d1dd54 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Addressing comments

    @andrewlee94
    andrewlee94 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    0ba6508 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: agarciadiego <[email protected]>
    @andrewlee94 @agarciadiego
    andrewlee94 and agarciadiego authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    f446853 View commit details
    Browse the repository at this point in the history

  3. Addressing simple issues

    @andrewlee94
    andrewlee94 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    56a27a2 View commit details
    Browse the repository at this point in the history

  4. Switching to StringEnum for scheme argument

    @andrewlee94
    andrewlee94 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    75822a7 View commit details
    Browse the repository at this point in the history

  5. Switching to ComponentMap for submodel scalers

    @andrewlee94
    andrewlee94 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    35e010b View commit details
    Browse the repository at this point in the history

  6. Fixing Gibbs reactor test

    @andrewlee94
    andrewlee94 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    9f89c8c View commit details
    Browse the repository at this point in the history

  7. fixing another test

    @andrewlee94
    andrewlee94 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    9fe7e73 View commit details
    Browse the repository at this point in the history