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.

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

Embed highs #3

Merged
merged 16 commits into from
Apr 12, 2020
Merged

Embed highs #3

merged 16 commits into from
Apr 12, 2020

Commits on Apr 10, 2020

  1. Remove old examples, tests

    mckib2 committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    0e98811 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3b6148 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4fb2030 View commit details
    Browse the repository at this point in the history
  4. Squashed 'scipy/optimize/_highs/' changes from 8e649f10f..b89f825df

    b89f825df Merge pull request #18 from ERGO-Code/master
    2bbf7830f Fix for VS 2014 scoped enum bug
    50ec5cd96 Remove old examples, tests
    30de0e3c2 Merge pull request scipy#303 from ERGO-Code/remove-malloc
    95756ea2a one more case of elapsed time removed
    8478292d6 Fix -std=c++14 typo; add cython generated sources to version control
    c7e03311a removed lu_timer
    83f18e4ec Commented out clock_gettime call in lu_timer.c and HiGHS builds on Lucie's MacBook Pro :-)
    f501edc7d old posix
    59c31a2e8 malloc removed and added macro def check in lu_timer
    
    git-subtree-dir: scipy/optimize/_highs
    git-subtree-split: b89f825df78c4d1122cd4a84d76e6e42c151d0ad
    mckib2 committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    5573f66 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1a09a72 View commit details
    Browse the repository at this point in the history
  6. Remove gitignore

    mckib2 committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    0af9b1b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6640568 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'linprog_highs' of https://github.com/mdhaber/scipy into…

    … mdhaber-linprog_highs
    mckib2 committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    5b80c9c View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    175d54f View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. Squashed 'scipy/optimize/_highs/' changes from b89f825df..fbdda9438

    fbdda9438 Merge pull request #19 from ERGO-Code/master
    5261899ac Merge pull request scipy#313 from ERGO-Code/removeTicks
    e29faad48 Formatted
    b122583a5 Now with useful_analysis = false; in HSimplex.cpp
    ee4e9696e Now with the redundant <intrin.h> and <x86intrin.h> deleted, too! :D
    9aab2e2f9 Removed printf(load_mpsLine: fgets_rt = %s, fgets_rt); - Line 414 of HMPSIO.cpp
    261d77dd3 Formatted
    83e31bbf9 Removed specialist code from when RunHighsClock was the only clock to make timing calls
    f950ebe81 Eliminated getTime from HighsTimer.h
    de03621c8 Replaced HighsTimer.h with jajhall/Timer/HighsTimer.h
    dfad70adb Remove unneed directories and files
    
    git-subtree-dir: scipy/optimize/_highs
    git-subtree-split: fbdda94386ec2f46abd15e3df56f4754c69108a6
    mckib2 committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    dc7fece View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6340b78 View commit details
    Browse the repository at this point in the history
  3. Squashed 'scipy/optimize/_highs/' changes from fbdda9438..075b95922

    075b95922 Merge pull request #21 from ERGO-Code/presolveCleanBounds
    862131490 Added cleanBounds to resolve minor inconsistencies in bounds after presolve and return error if large
    
    git-subtree-dir: scipy/optimize/_highs
    git-subtree-split: 075b959220fa00469455f4b19dc0a677ddf9737c
    mckib2 committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    a15ff5a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2081e91 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    de68d94 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8b5f056 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a318db1 View commit details
    Browse the repository at this point in the history