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

Adding (parameterized) linear programming dual transformation! #3402

Open
wants to merge 53 commits into
base: main
Choose a base branch
from
Open

Adding (parameterized) linear programming dual transformation! #3402

wants to merge 53 commits into from

Commits on Mar 13, 2024

  1. Initializing dual transform

    @emma58
    emma58 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    c2b42b5 View commit details
    Browse the repository at this point in the history

  2. Whoops, adding LP dual transform and tests

    @emma58
    emma58 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    8fccf37 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'main' into lp-dual

    @emma58
    emma58 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    40925d0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. First draft of 'mixed' LP dual as well as adding option for parameter… 

    …ized dual
    @emma58
    emma58 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ab58d80 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'linear-walker-wrt' into lp-dual

    @emma58
    emma58 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    601471f View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Beginning of mixed form LP dal, no parameterized, with tests that don… 

    …'t work
    @emma58
    emma58 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    16fdff4 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Fixing a bug with the direction of constraints being transposed, also… 

    … with where the mappings are stored
    @emma58
    emma58 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    a1cb793 View commit details
    Browse the repository at this point in the history

  2. Making Constraint expressions prettier and testing them

    @emma58
    emma58 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    eb44531 View commit details
    Browse the repository at this point in the history

  3. black

    @emma58
    emma58 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    8420e05 View commit details
    Browse the repository at this point in the history

  4. Adding a test that we can recover the primal from the dual with the t… 

    …ransformation
    @emma58
    emma58 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    d702d57 View commit details
    Browse the repository at this point in the history

  5. Testing that dual values reported by solver and what we get from solv… 

    …ing transformed model match
    @emma58
    emma58 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    ad0ef8e View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Not bothering to transpose primal constraint matrix because we don't … 

    …really have to
    @emma58
    emma58 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    06c87c9 View commit details
    Browse the repository at this point in the history

  2. Centralizing the var list domain validator in pyomo/util

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

  3. Modularizing standard form a little so that I can override the parts … 

    …that assume that the data is numeric. Creating my own csr and csc classes that are almost complete
    @emma58
    emma58 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d3fdccb View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Draft of scipy-style CSR and CSC matrices that accomodate pyomo expre… 

    …ssions in the data
    @emma58
    emma58 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    73e07f0 View commit details
    Browse the repository at this point in the history

  2. Rewriting LP dual code to actually use a CSC matrix sanely

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

  3. whoops, missing file from two commits ago

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

Commits on Jun 25, 2024

  1. Implementing todense, making the data structures in CSC and CSR numpy… 

    … arrays
    @emma58
    emma58 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    ff38080 View commit details
    Browse the repository at this point in the history

  2. Start on unit tests for parameterized standard form

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

  3. Blacking

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

  4. More unit tests (and whitespace)

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

  5. Adding a test for todense and removing my hacky debugging in paramete… 

    …rized_standard_form itself.
    @emma58
    emma58 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    ced3faa View commit details
    Browse the repository at this point in the history

  6. Making _csc_to_nonnegative_vars a method on the class so that it can … 

    …use the correct converstion to a CSC matrix depending on the circumstances, testing the conversion to nonnegative vars
    @emma58
    emma58 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    0c9567a View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Testing all the config variations for parameterized standard form

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

  2. Black

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

Commits on Jul 2, 2024

  1. Renaming _get_data_list to _to_vector

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

  2. Partial fix merge of templatized-writer branch. Standard repn works b… 

    …ut parameterized standard repn doesn't
    @emma58
    emma58 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    0a5663a View commit details
    Browse the repository at this point in the history

  3. Generalizing standard form to handle parameterized standard form again

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

  4. black

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

  5. NFC: cleaning up comments

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

  6. Resolving merge conflicts with the create_csc abstraction

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

Commits on Jul 8, 2024

  1. Merge branch 'main' into lp-dual

    @emma58
    emma58 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    22a1f79 View commit details
    Browse the repository at this point in the history

  2. Adding a copy of scipy's sum duplicates code, but I think we can chea… 

    …t a little if we assume ordered, so this isn't done or tested
    @emma58
    emma58 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    470de80 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'templatized-writer' into lp-dual

    @emma58
    emma58 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    d1bf1b4 View commit details
    Browse the repository at this point in the history

  4. Removing an unused method

    @emma58
    emma58 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3edc964 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merging with templatized-writer branch

    @emma58
    emma58 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    53ea29e View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Fixing conflicts with paramaterized linear walker PR

    @emma58
    emma58 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c52a915 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Adjusting parameterized standard form to match the changes in standar… 

    …d form with attributes rather than methods, implementing eliminate_zeros
    @emma58
    emma58 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d86e00b View commit details
    Browse the repository at this point in the history

  2. black

    @emma58
    emma58 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    c569897 View commit details
    Browse the repository at this point in the history

  3. Converting the c matrix dense for now to get things working

    @emma58
    emma58 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    70d1fbe View commit details
    Browse the repository at this point in the history

  4. Adding a test of a parameterized dual

    @emma58
    emma58 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d7d3b74 View commit details
    Browse the repository at this point in the history

  5. black

    @emma58
    emma58 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    82326af View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merging main

    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    76ac53d View commit details
    Browse the repository at this point in the history

  2. Converting to var_recorder argument for parameterized standard form

    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    6f5790a View commit details
    Browse the repository at this point in the history

  3. black

    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    139d307 View commit details
    Browse the repository at this point in the history

  4. More black

    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    2f40eb9 View commit details
    Browse the repository at this point in the history

  5. NFC: fixing comment typo

    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    5a25e2a View commit details
    Browse the repository at this point in the history

  6. Adding docstrings for mapping API and clearning up some prepositional… 

    … mix-ups
    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    c2c5c0b View commit details
    Browse the repository at this point in the history

  7. Adding tests for paraemeterized dual from solving primal and dual, ad… 

    …ding tests for API error messages
    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    7238c31 View commit details
    Browse the repository at this point in the history

  8. Black

    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    d914e52 View commit details
    Browse the repository at this point in the history

  9. NFC: fixing two typos

    @emma58
    emma58 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    d92d4df View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Reverting unnecessary formatting changes in standard form

    @emma58
    emma58 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    662fbfb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into lp-dual

    @emma58
    emma58 authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    8f07edb View commit details
    Browse the repository at this point in the history