[Minotaur-dev] [minotaur-solver/minotaur] 569f3c: bug fix and clean up

[Ashutosh Mahajan]

  Branch: refs/heads/master
  Home:   https://github.com/minotaur-solver/minotaur
  Commit: 569f3ccbff9a3bbd534ca39075793f23ca803772
      https://github.com/minotaur-solver/minotaur/commit/569f3ccbff9a3bbd534ca39075793f23ca803772
  Author: Ashutosh Mahajan <amahajan at iitb.ac.in>
  Date:   2019-07-23 (Tue, 23 Jul 2019)

  Changed paths:
    M src/base/Function.cpp

  Log Message:
  -----------
  bug fix and clean up


  Commit: 08fe9626fcc5a68415552f3257d29ecf8d6bdddc
      https://github.com/minotaur-solver/minotaur/commit/08fe9626fcc5a68415552f3257d29ecf8d6bdddc
  Author: Ashutosh Mahajan <amahajan at iitb.ac.in>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M Makefile.manual
    M src/algorithms/McBnb.cpp
    M src/algorithms/OA.cpp
    M src/base/Node.cpp
    M src/base/ParBranchAndBound.cpp
    M src/base/ParBranchAndBound.h
    M src/base/ParTreeManager.cpp
    M src/base/ParTreeManager.h
    M src/base/QGHandler.cpp
    M src/base/QGHandler.h
    M src/base/TreeManager.cpp
    M src/engines/Cplex/CplexMILPEngine.cpp

  Log Message:
  -----------
  Merge branch 'master' of github:minotaur-solver/minotaur


Compare: https://github.com/minotaur-solver/minotaur/compare/a0cc41279f6c...08fe9626fcc5