[Minotaur-dev] [minotaur-solver/minotaur] beb446: minor edit

[Prashant Palkar]

  Branch: refs/heads/master
  Home:   https://github.com/minotaur-solver/minotaur
  Commit: beb446b7c6c4d5e5dabbf8d0e11263e69d24a364
      https://github.com/minotaur-solver/minotaur/commit/beb446b7c6c4d5e5dabbf8d0e11263e69d24a364
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M src/algorithms/OA.cpp

  Log Message:
  -----------
  minor edit


  Commit: a484ea31b8276226423a11c68732bdcdbb990bd2
      https://github.com/minotaur-solver/minotaur/commit/a484ea31b8276226423a11c68732bdcdbb990bd2
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-09 (Tue, 09 Jul 2019)

  Changed paths:
    M src/base/BranchAndBound.cpp
    R src/base/Interrupt.cpp
    R src/base/Interrupt.h
    M src/base/LinearFunction.cpp
    M src/base/PolynomialFunction.cpp
    M src/base/PolynomialFunction.h
    M src/base/Problem.cpp
    M src/base/QuadraticFunction.cpp
    M src/engines/OsiLP/OsiLPEngine.cpp
    M src/interfaces/ampl/AMPLInterface.cpp
    M src/testing/AMPLCGraphUT.cpp
    M src/testing/AMPLCGraphUT.h
    M src/testing/QuadraticFunctionUT.cpp

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


  Commit: c213b612eb9755d30d67061c79bd91dd000ec009
      https://github.com/minotaur-solver/minotaur/commit/c213b612eb9755d30d67061c79bd91dd000ec009
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-10 (Wed, 10 Jul 2019)

  Changed paths:
    M src/base/Problem.cpp
    M src/interfaces/ampl/AMPLInterface.cpp
    M src/testing/AMPLBqpdUT.cpp
    M src/testing/AMPLCGraphUT.cpp
    M src/testing/AMPLFilterSQPUT.cpp
    M src/testing/AMPLInstanceUT.cpp
    M src/testing/AMPLInstanceUT.h
    M src/testing/AMPLIpoptUT.cpp
    M src/testing/AMPLOsiUT.cpp
    M src/testing/LinearFunctionUT.cpp
    M src/testing/NLPBnbUT.cpp
    M src/testing/QuadraticFunctionUT.cpp
    M src/testing/TransformerUT.cpp

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


  Commit: 3295443700a99e75869be3c208bda9a5fc11b8f4
      https://github.com/minotaur-solver/minotaur/commit/3295443700a99e75869be3c208bda9a5fc11b8f4
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-10 (Wed, 10 Jul 2019)

  Changed paths:
    M src/base/Constraint.cpp
    M src/base/Function.cpp
    M src/base/Function.h
    M src/base/Objective.cpp
    M src/base/Objective.h
    M src/base/Problem.cpp
    M src/engines/Bqpd/BqpdEngine.cpp
    M src/interfaces/ampl/AMPLInterface.cpp
    M src/testing/AMPLBqpdUT.cpp
    M src/testing/AMPLIpoptUT.cpp
    M src/testing/AMPLOsiUT.cpp
    M src/testing/AMPLOsiUT.h

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


  Commit: 46be1a1ab701ae74e404228194d953fd7a343c54
      https://github.com/minotaur-solver/minotaur/commit/46be1a1ab701ae74e404228194d953fd7a343c54
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-11 (Thu, 11 Jul 2019)

  Changed paths:
    M src/base/SolutionPool.cpp
    M src/base/SolutionPool.h
    M src/engines/Ipopt/IpoptEngine.cpp
    M src/engines/OsiLP/OsiLPEngine.cpp
    M src/interfaces/ampl/AMPLInterface.cpp
    M src/testing/AMPLCbcUT.cpp
    M src/testing/AMPLCbcUT.h
    M src/testing/AMPLFilterSQPUT.cpp
    M src/testing/AMPLFilterSQPUT.h
    M src/testing/AMPLOsiUT.cpp
    M src/testing/CGraphUT.cpp
    M src/testing/HessianOfLagUT.cpp
    M src/testing/JacobianUT.cpp
    M src/testing/LinearFunctionUT.cpp
    M src/testing/NLPBnbUT.cpp
    M src/testing/OperationsUT.cpp
    M src/testing/PerspRefUT.cpp
    M src/testing/PolySolverUT.cpp
    M src/testing/PolySolverUT.h
    M src/testing/PolyUT.cpp
    M src/testing/ProblemUT.cpp
    M src/testing/QuadraticFunctionUT.cpp

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


  Commit: f5915f0369e7ca61e43f1a0fd1b69ae777a89125
      https://github.com/minotaur-solver/minotaur/commit/f5915f0369e7ca61e43f1a0fd1b69ae777a89125
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M src/base/ParReliabilityBrancher.cpp

  Log Message:
  -----------
  minor changes


  Commit: cceeb21419354d4122fde94b237549c64b501e29
      https://github.com/minotaur-solver/minotaur/commit/cceeb21419354d4122fde94b237549c64b501e29
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M src/algorithms/McBnb.cpp

  Log Message:
  -----------
  adding initial parReliability parameters


  Commit: 543103c8041ceb70f0c4164c9caab0f43f831d3e
      https://github.com/minotaur-solver/minotaur/commit/543103c8041ceb70f0c4164c9caab0f43f831d3e
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M src/engines/Ipopt/IpoptEngine.cpp
    M src/engines/Ipopt/IpoptEngine.h
    M src/engines/Ipopt/IpoptEngineTnlp.h

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


Compare: https://github.com/minotaur-solver/minotaur/compare/eb0f85509741...543103c8041c