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

Linear Tree Implementation #108

Merged
merged 105 commits into from
Sep 18, 2023
Merged

Linear Tree Implementation #108

merged 105 commits into from
Sep 18, 2023

Commits on Jan 25, 2023

  1. added initial linear-tree files. Created linear-tree model class

    @bammari
    bammari committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    d118f31 View commit details
    Browse the repository at this point in the history

  2. initial commit

    @bammari
    bammari committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    6aeb86a View commit details
    Browse the repository at this point in the history

  3. LinearTreeModel

    @bammari
    bammari committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    64c04d8 View commit details
    Browse the repository at this point in the history

  4. public vs private test

    @bammari
    bammari committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    a5f9e07 View commit details
    Browse the repository at this point in the history

  5. private vs public testing

    @bammari
    bammari committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    68f8a80 View commit details
    Browse the repository at this point in the history

  6. public vs private testing

    @bammari
    bammari committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    79fbd8e View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Initial Linear Tree Commit

    @bammari
    bammari committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    0e5167e View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. ltmodel testing

    @bammari
    bammari committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    110e2db View commit details
    Browse the repository at this point in the history

  2. ltmodel testing

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

  3. ltmodel testing

    @bammari
    bammari committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    4c33ad7 View commit details
    Browse the repository at this point in the history

  4. ltmodel testing

    @bammari
    bammari committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    753b7fc View commit details
    Browse the repository at this point in the history

  5. recursion test find children splits

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

  6. testing

    @bammari
    bammari committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    8cf1bef View commit details
    Browse the repository at this point in the history

  7. recursion test find all children splits

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

  8. recursion test number find all children splits

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

  9. Recursion test 1

    @bammari
    bammari committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    9d4e53a View commit details
    Browse the repository at this point in the history

  10. Globalizing Function Test

    @bammari
    bammari committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0ab0041 View commit details
    Browse the repository at this point in the history

  11. Globalizing Function Test

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

  12. Determine if parent information is even needed

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

  13. LinearModel Testing

    @bammari
    bammari committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    8c4b6b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Lt Model Testing and commit

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

  2. Cleaning Up LinearTreeModel Class code

    @bammari
    bammari committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    8ee0eae View commit details
    Browse the repository at this point in the history

  3. Linear Tree Init Commiit

    @bammari
    bammari committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    186162c View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2023

  1. Raise exceptions for missing bounds/wrong transformation

    @bammari
    bammari committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    49cadd1 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. changed parse_tree_data name

    @bammari
    bammari committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    bc9fa2c View commit details
    Browse the repository at this point in the history

  2. raise errors on unsupported GDP transformations

    @bammari
    bammari committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    7d142e6 View commit details
    Browse the repository at this point in the history

  3. Bounds changes

    @bammari
    bammari committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    08506e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Implemented output variable bound calculation function

    @bammari
    bammari committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    af57b63 View commit details
    Browse the repository at this point in the history

  2. adding comments to output variable bound function

    @bammari
    bammari committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    925611a View commit details
    Browse the repository at this point in the history

  3. Initial Linear Tree Documentation

    @bammari
    bammari committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    853d8a6 View commit details
    Browse the repository at this point in the history

  4. linear tree documentation

    @bammari
    bammari committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    d1e66d2 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. Added Notebook for Linear Tree in Docs

    @bammari
    bammari committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    c962e59 View commit details
    Browse the repository at this point in the history

  2. Documentation

    @bammari
    bammari committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    7351cc8 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Added more documentation on comments

    @bammari
    bammari committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    bd96b50 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Updated docstrings

    @bammari
    bammari committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    239ef2d View commit details
    Browse the repository at this point in the history

  2. docstring updates

    @bammari
    bammari committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    fb330bb View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2023

  1. Docstring Updates

    @bammari
    bammari committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    a73a288 View commit details
    Browse the repository at this point in the history

  2. Docstring Updates

    @bammari
    bammari committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    e556301 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. Upload the script for testing

    @linshumeng
    linshumeng committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    f128efc View commit details
    Browse the repository at this point in the history

  2. Upload script for testing LinearTreeModel 

    Test dictionary
    @linshumeng
    linshumeng committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    54fe575 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. Upload the test for bigm transformation

    @linshumeng
    linshumeng committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    9ece812 View commit details
    Browse the repository at this point in the history

  2. Pass pytest: 

    fix some bus, e.g. len
    @linshumeng
    linshumeng committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    00cf951 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Test hull formulation

    @linshumeng
    linshumeng committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    f53f54b View commit details
    Browse the repository at this point in the history

  2. Test the slope and bounds: 

    Note that bounds may be None for other dataset
    @linshumeng
    linshumeng committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    a8ad6dd View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Added Hybrid Big-M Formulations

    @bammari
    bammari committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    ef15aae View commit details
    Browse the repository at this point in the history

  2. Added Multiple BigM Test

    @bammari
    bammari committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    148258a View commit details
    Browse the repository at this point in the history

  3. Add more comments

    @linshumeng
    linshumeng committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    efa682e View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Added multivariate input testing for linear model decision trees

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    2b361b2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from bammari/bashar_lt_hybrid_bigm_implementation 

    Added Hybrid Big-M Formulations
    @bammari
    bammari authored Apr 6, 2023
    Configuration menu
    Copy the full SHA
    62ddaf6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from bammari/shumeng_test 

    Adding tests to linear model decision trees in OMLT
    @bammari
    bammari authored Apr 6, 2023
    Configuration menu
    Copy the full SHA
    4143a13 View commit details
    Browse the repository at this point in the history

  4. Added Hybrid Big M Formulation Tests

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    6f3593f View commit details
    Browse the repository at this point in the history

  5. Docstring Updates

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    1ae1062 View commit details
    Browse the repository at this point in the history

  6. Added option to pass in summary rather than linear-tree instance

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    9dfa9a4 View commit details
    Browse the repository at this point in the history

  7. Added test to ensure model summary argument functions

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    d7d7c85 View commit details
    Browse the repository at this point in the history

  8. Added Hybrid Big-M Tests

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    8a8939a View commit details
    Browse the repository at this point in the history

  9. docstring updates

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    480d3aa View commit details
    Browse the repository at this point in the history

  10. Docstring updates

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    5f5dda2 View commit details
    Browse the repository at this point in the history

  11. Docstring updates

    @bammari
    bammari committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    644ae32 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. Added code to ensure input dict is correct

    @bammari
    bammari committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    2781b38 View commit details
    Browse the repository at this point in the history

  2. Added hybrid big-m representation to docs

    @bammari
    bammari committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    810bcaa View commit details
    Browse the repository at this point in the history

  3. Added testing for raised exceptions

    @bammari
    bammari committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    6ade394 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Reassigned none bounds in lt model. Added unscaled_input_bounds karg

    @bammari
    bammari committed May 11, 2023
    Configuration menu
    Copy the full SHA
    b51a0db View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Initial formulation consolidation code commit

    @bammari
    bammari committed May 16, 2023
    Configuration menu
    Copy the full SHA
    a72e791 View commit details
    Browse the repository at this point in the history

  2. docstring updates

    @bammari
    bammari committed May 16, 2023
    Configuration menu
    Copy the full SHA
    1d129c3 View commit details
    Browse the repository at this point in the history

  3. Docstring updates

    @bammari
    bammari committed May 16, 2023
    Configuration menu
    Copy the full SHA
    6bdc77f View commit details
    Browse the repository at this point in the history

  4. Docstring update

    @bammari
    bammari committed May 16, 2023
    Configuration menu
    Copy the full SHA
    11105ce View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. Update Variable Names

    @bammari
    bammari committed May 18, 2023
    Configuration menu
    Copy the full SHA
    a165daf View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Updated LinearTreeModel to LinearTreeDefinition, made helper function… 

    …s internal, and added cbc as solver for MILP tests
    @bammari
    bammari committed May 19, 2023
    Configuration menu
    Copy the full SHA
    a0d688a View commit details
    Browse the repository at this point in the history

  2. Updated Notebook to use LinearTree Definition

    @bammari
    bammari committed May 19, 2023
    Configuration menu
    Copy the full SHA
    a335726 View commit details
    Browse the repository at this point in the history

  3. Code Cleanup

    @bammari
    bammari committed May 19, 2023
    Configuration menu
    Copy the full SHA
    ee32323 View commit details
    Browse the repository at this point in the history

  4. Updated lineartree to linear_tree, changed _setup_scaled_inputs due t… 

    …o maxpool int/float issue
    @bammari
    bammari committed May 19, 2023
    Configuration menu
    Copy the full SHA
    33d2ef3 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Install pyscipopt in main.yml

    @bammari
    bammari authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    69f775f View commit details
    Browse the repository at this point in the history

  2. Update linear_tree notebook to use SCIP rather than gurobi

    @bammari
    bammari authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    e40bdb3 View commit details
    Browse the repository at this point in the history

  3. Changed quadratic formulation solver from gurobi to scip

    @bammari
    bammari authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    bcfbcc8 View commit details
    Browse the repository at this point in the history

  4. Skip if solvers unavailable

    @bammari
    bammari authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    4d030d5 View commit details
    Browse the repository at this point in the history

  5. omlt.lineartree to omlt.linear_tree

    @bammari
    bammari authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    3e65e2d View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Added 'custom' transformation option to LinearTreeGDPFormulation

    @bammari
    bammari committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    dd4f7b6 View commit details
    Browse the repository at this point in the history

  2. Ran through pylint and black

    @bammari
    bammari committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    4d3ffe4 View commit details
    Browse the repository at this point in the history

  3. Cleaning up for linting

    @bammari
    bammari committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    467d451 View commit details
    Browse the repository at this point in the history

  4. Fixing pylint issues

    @bammari
    bammari committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    18a409e View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Linting

    @bammari
    bammari committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    91edac2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into bashar_formulation_consolidation

    @bammari
    bammari authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    1a2413e View commit details
    Browse the repository at this point in the history

  3. Linting

    @bammari
    bammari authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    8926fac View commit details
    Browse the repository at this point in the history

  4. Added test for scaling LinearTreeDefinition

    @bammari
    bammari committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    e89d820 View commit details
    Browse the repository at this point in the history

  5. Linting

    @bammari
    bammari authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    aa44abc View commit details
    Browse the repository at this point in the history

  6. Edit docstring

    @bammari
    bammari authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    d46f047 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Added properties to definition. Docstring Updates.

    @bammari
    bammari committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    d086e4f View commit details
    Browse the repository at this point in the history

  2. Removing unused properties

    @bammari
    bammari committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    d9db1ed View commit details
    Browse the repository at this point in the history

  3. Docstring Updates

    @bammari
    bammari committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    dcf2e96 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Linear Tree Notebook Updates

    @bammari
    bammari committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    1d94aeb View commit details
    Browse the repository at this point in the history

  2. Linting

    @bammari
    bammari committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    4f00016 View commit details
    Browse the repository at this point in the history

  3. docstring update

    @bammari
    bammari authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    acb33ea View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. For code coverage

    @bammari
    bammari committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    a02e221 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bashar_formulation_consolidation' of https://github.com… 

    …/bammari/OMLT into bashar_formulation_consolidation
    @bammari
    bammari committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    8195430 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Addressing requested changes

    @bammari
    bammari committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    10bdd77 View commit details
    Browse the repository at this point in the history

  2. Addressing changes

    @bammari
    bammari committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    aa7712b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Addressing ruth comments

    @bammari
    bammari committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    48d475e View commit details
    Browse the repository at this point in the history

  2. Notebook Update

    @bammari
    bammari committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    5f05bf3 View commit details
    Browse the repository at this point in the history

  3. Updating README.rst. Also updated OMLT paper citation.

    @bammari
    bammari committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    b24508d View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. Modifying citation

    @bammari
    bammari committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    0bc86f9 View commit details
    Browse the repository at this point in the history

  2. Notebook modification

    @bammari
    bammari committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    e19d970 View commit details
    Browse the repository at this point in the history

  3. Notebook modification

    @bammari
    bammari committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    79b3025 View commit details
    Browse the repository at this point in the history

  4. Notebook docstring

    @bammari
    bammari committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    dd51552 View commit details
    Browse the repository at this point in the history

  5. Attempt tests on Python 3.10

    @bammari
    bammari committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    9321e39 View commit details
    Browse the repository at this point in the history

  6. Testing on Python 3.10

    @bammari
    bammari committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    349dfa0 View commit details
    Browse the repository at this point in the history