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

54 multiplier models #66

Open
wants to merge 61 commits into
base: 54-multiplier-models
Choose a base branch
from
Open

54 multiplier models #66

wants to merge 61 commits into from

Commits on Nov 5, 2022

  1. Create multiplier_model.py

    @IsitaRex
    IsitaRex committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    bba4cb1 View commit details
    Browse the repository at this point in the history

  2. Update multiplier_model.py

    @IsitaRex
    IsitaRex committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    e134386 View commit details
    Browse the repository at this point in the history

  3. Update logistic_regression.ipynb 

    Black reformatted
    @IsitaRex
    IsitaRex committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    88fdb5f View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Create test_multiplier_model.py 

    - Create MultiplierModel as instance of multipliers instead of multiplier_model class

- Implement MultiplierModel tests
    @IsitaRex
    IsitaRex committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    d3cb8d0 View commit details
    Browse the repository at this point in the history

  2. Update Multiplier Model to inherit from multipliers

    @IsitaRex
    IsitaRex committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    da5de4a View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2022

  1. Update multipliers.py

    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    4c8ec04 View commit details
    Browse the repository at this point in the history

  2. Update __init__.py 

    Added MultiplierModel
    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    c26ce46 View commit details
    Browse the repository at this point in the history

  3. Update __init__.py 

    Added LagrangianModelFormulation
    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    0d3fa08 View commit details
    Browse the repository at this point in the history

  4. Update lagrangian_model.py 

    Fix imports
    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    eef8eb6 View commit details
    Browse the repository at this point in the history

  5. Update multiplier_model.py 

    Change meta to metaclass
    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    d1868ce View commit details
    Browse the repository at this point in the history

  6. Update multipliers.py

    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    cc92995 View commit details
    Browse the repository at this point in the history

  7. Create test_lagrangian_model.py

    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    812f54b View commit details
    Browse the repository at this point in the history

  8. Update test_multiplier_model.py

    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    c4431f5 View commit details
    Browse the repository at this point in the history

  9. Update test_lagrangian_model.py

    @IsitaRex
    IsitaRex committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    1faa097 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. MM and Lagrangian Model work and pass tests

    @daoterog
    daoterog committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    6ddb61a View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. Correction - Add again proxy constraints to model formulation

    @daoterog
    daoterog committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    fd84696 View commit details
    Browse the repository at this point in the history

  2. Add proxy constraints to toy problem

    @daoterog
    daoterog committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    af39b27 View commit details
    Browse the repository at this point in the history

  3. Fix test_lagrangian_model test and tol from convergence test

    @daoterog
    daoterog committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    4eb714d View commit details
    Browse the repository at this point in the history

  4. Fixed convergence tolerance

    @daoterog
    daoterog committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    fcbda77 View commit details
    Browse the repository at this point in the history

  5. Refactor to integrate large toy problem in buil tests

    @daoterog
    daoterog committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    90eed1d View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Add flip gradients to formulations

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    883c5c9 View commit details
    Browse the repository at this point in the history

  2. Add missing argument

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    b3075fe View commit details
    Browse the repository at this point in the history

  3. Optimizer pending changes

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    ad79921 View commit details
    Browse the repository at this point in the history

  4. Pending todo

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    6de574d View commit details
    Browse the repository at this point in the history

  5. Experiment to compare model form with regular form

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    36abc70 View commit details
    Browse the repository at this point in the history

  6. Ignore wandb logs

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    1fe0fc3 View commit details
    Browse the repository at this point in the history

  7. Extend build_test_problem to encompass model form

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    97c9e88 View commit details
    Browse the repository at this point in the history

  8. Rewrite tests for current multiplier model object

    @daoterog
    daoterog committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    183b955 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. New experiment setting

    @daoterog
    daoterog committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    38f3841 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2022

  1. Change in third constraint and constraint features

    @daoterog
    daoterog committed Nov 12, 2022
    Configuration menu
    Copy the full SHA
    943c46e View commit details
    Browse the repository at this point in the history

  2. Black formatting

    @daoterog
    daoterog committed Nov 12, 2022
    Configuration menu
    Copy the full SHA
    c129db4 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2022

  1. Update model_form_vs_lag_form.py 

    Train with one constraint and then add the second one
    @IsitaRex
    IsitaRex committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    af1811e View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. Add mock model fomulation

    @daoterog
    daoterog committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    ff3d9e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2022

  1. Fix by black and isort

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    c4093bf View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into dev

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    a7426ae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into 54-multiplier-models

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    cc894bf View commit details
    Browse the repository at this point in the history

  4. Remove MockLagrangianModelFormulation

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    26b327e View commit details
    Browse the repository at this point in the history

  5. Black

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    9e58b63 View commit details
    Browse the repository at this point in the history

  6. Remove wandb from gitignore

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    6248b6b View commit details
    Browse the repository at this point in the history

  7. Add comment about accessing gradients of module

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    4a80910 View commit details
    Browse the repository at this point in the history

  8. Comment to change grad function name.

    @IsitaRex
    IsitaRex committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    3de5a3e View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. Add missing documentation

    @daoterog
    daoterog committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    d2b3a35 View commit details
    Browse the repository at this point in the history

  2. Correct documentation

    @daoterog
    daoterog committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    695ed73 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Modify flip gradients, add flag to multiplier projection

    @daoterog
    daoterog committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    cceee8c View commit details
    Browse the repository at this point in the history

  2. Fix circular import and add typehint to grad func

    @daoterog
    daoterog committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    de01f2e View commit details
    Browse the repository at this point in the history

  3. Removed unnecessary TODO

    @daoterog
    daoterog committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    3304242 View commit details
    Browse the repository at this point in the history

  4. Simplify object for test

    @daoterog
    daoterog committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    92143ab View commit details
    Browse the repository at this point in the history

  5. Remove comments on alterntive implementation

    @daoterog
    daoterog committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    a8bc041 View commit details
    Browse the repository at this point in the history

  6. Make test more simple

    @daoterog
    daoterog committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    a643e1a View commit details
    Browse the repository at this point in the history

  7. Formatting

    @daoterog
    daoterog committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    cc76eb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. Change todo to git username

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    a7b07b4 View commit details
    Browse the repository at this point in the history

  2. Add CMPModelState, fix state, state_dict, load_state_dict, and flip_d… 

    …ual_gradients
    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    1a61dd5 View commit details
    Browse the repository at this point in the history

  3. Fix and add TODOs

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    6ef151f View commit details
    Browse the repository at this point in the history

  4. Add RuntimeError to unused methods

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    1bb3bc3 View commit details
    Browse the repository at this point in the history

  5. Add git username to TODO

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    fdaff32 View commit details
    Browse the repository at this point in the history

  6. Add git username to TODO

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    5cd667a View commit details
    Browse the repository at this point in the history

  7. Add CMPModelState to convergence test

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    fcbff54 View commit details
    Browse the repository at this point in the history

  8. Black fromatting

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    2d47807 View commit details
    Browse the repository at this point in the history

  9. Pending fix on circular import and correct type hint

    @daoterog
    daoterog committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    96705a5 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2023

  1. Properly implement exhaustive tests with fixtures and parameters

    @daoterog
    daoterog committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    e8a2b32 View commit details
    Browse the repository at this point in the history

  2. Updated type hints with CMPModelState

    @daoterog
    daoterog committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    4f8b6ed View commit details
    Browse the repository at this point in the history