[Minotaur-dev] [minotaur-solver/minotaur] d886b6: Get only top n cuts and other changes

[Mustafa Vora]

  Branch: refs/heads/master
  Home:   https://github.com/minotaur-solver/minotaur
  Commit: d886b6b6870efa8613f2b9a414fa73519511fb24
      https://github.com/minotaur-solver/minotaur/commit/d886b6b6870efa8613f2b9a414fa73519511fb24
  Author: Vora Mustafa Makbul <mustafa.vora at iitb.ac.in>
  Date:   2022-06-20 (Mon, 20 Jun 2022)

  Changed paths:
    M src/base/QuadHandler.cpp
    M src/base/SimplexQuadCutGen.cpp
    M src/base/SimplexQuadCutGen.h

  Log Message:
  -----------
  Get only top n cuts and other changes


  Commit: 695da271764b570c5669f1dfaf37ab647a83ca3e
      https://github.com/minotaur-solver/minotaur/commit/695da271764b570c5669f1dfaf37ab647a83ca3e
  Author: Vora Mustafa Makbul <mustafa.vora at iitb.ac.in>
  Date:   2022-06-20 (Mon, 20 Jun 2022)

  Changed paths:
    A examples/simplex-quad-new-vars/Makefile
    A examples/simplex-quad-new-vars/simplexQuadNewVars.cpp
    M src/CMakeLists.txt
    M src/base/Environment.cpp
    M src/base/QuadHandler.cpp
    M src/base/QuadHandler.h
    M src/base/Relaxation.cpp
    M src/base/Relaxation.h
    M src/base/SimpleTransformer.cpp
    M src/base/SimplexQuadCutGen.cpp
    M src/base/SimplexQuadCutGen.h
    M src/interfaces/IpoptEngine.cpp
    M src/interfaces/IpoptEngineTnlp.h
    M src/solvers/MultiStart.cpp

  Log Message:
  -----------
  Resolved Merge Conflicts


Compare: https://github.com/minotaur-solver/minotaur/compare/fe98fda499a0...695da271764b