[Minotaur-dev] [minotaur-solver/minotaur] 113d1d: added status in OA handler, addConstraint in Cplex...

[Prashant Palkar]

  Branch: refs/heads/master
  Home:   https://github.com/minotaur-solver/minotaur
  Commit: 113d1d5d2a708af8f6cf05ffb230a560796f916f
      https://github.com/minotaur-solver/minotaur/commit/113d1d5d2a708af8f6cf05ffb230a560796f916f
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M src/base/OAHandler.cpp
    M src/engines/Cplex/CplexLPEngine.cpp

  Log Message:
  -----------
  added status in OA handler, addConstraint in CplexLPEngine


  Commit: 6612c4083bc2e8dc167c6b1f9bc12feb8bb61e6e
      https://github.com/minotaur-solver/minotaur/commit/6612c4083bc2e8dc167c6b1f9bc12feb8bb61e6e
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M src/base/Constraint.cpp
    M src/base/LinearHandler.cpp
    M src/base/OAHandler.cpp
    M src/base/OAHandler.h
    M src/base/Option.cpp
    M src/base/Option.h
    M src/engines/Cbc/CbcEngine.cpp

  Log Message:
  -----------
  Merge branch 'master' of ssh://github.com/ashutoshmahajan/minotaur


  Commit: acd5180ade56d674de3ac0e99c85815ae085bf01
      https://github.com/minotaur-solver/minotaur/commit/acd5180ade56d674de3ac0e99c85815ae085bf01
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M src/base/Environment.cpp
    M src/base/QGHandler.cpp
    M src/base/QGHandler.h

  Log Message:
  -----------
  Merge branch 'master' of ssh://github.com/ashutoshmahajan/minotaur


  Commit: eb7774a5d48b7abd8ac9e9e46d165a8efca68641
      https://github.com/minotaur-solver/minotaur/commit/eb7774a5d48b7abd8ac9e9e46d165a8efca68641
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M src/engines/Cplex/CplexLPEngine.cpp
    M src/engines/Cplex/CplexLPEngine.h

  Log Message:
  -----------
  more changes in Cplex LP engine


Compare: https://github.com/minotaur-solver/minotaur/compare/23cca6006e99...eb7774a5d48b