[Minotaur-dev] [minotaur-solver/minotaur] d31acf: Prashant's work in progress

[Prashant Palkar]

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

  Changed paths:
    M CMakeLists.txt
    M src/algorithms/Bnb.cpp
    M src/algorithms/CMakeLists.txt
    A src/algorithms/LSTOA.cpp
    M src/algorithms/McBnb.cpp
    M src/algorithms/McQG.cpp
    M src/algorithms/OA.cpp
    M src/algorithms/QG.cpp
    M src/base/BranchAndBound.cpp
    M src/base/BranchAndBound.h
    M src/base/CMakeLists.txt
    M src/base/Environment.cpp
    M src/base/MILPEngine.h
    M src/base/Node.cpp
    M src/base/Node.h
    M src/base/OAHandler.cpp
    M src/base/OAHandler.h
    M src/base/PCBProcessor.cpp
    M src/base/ParBranchAndBound.cpp
    A src/base/ParMINLPDiving.cpp
    A src/base/ParMINLPDiving.h
    M src/base/ParQGBranchAndBound.cpp
    M src/base/ParQGHandler.cpp
    M src/base/ParQGHandler.h
    M src/base/ParTreeManager.cpp
    M src/base/Problem.cpp
    M src/base/Problem.h
    M src/base/QGHandler.cpp
    M src/base/QGHandler.h
    M src/base/ReliabilityBrancher.cpp
    A src/base/STOAHandler.cpp
    A src/base/STOAHandler.h
    M src/base/SolutionPool.cpp
    M src/base/SolutionPool.h
    A src/base/UnambRelBrancher.cpp
    A src/base/UnambRelBrancher.h
    M src/base/Variable.h
    M src/engines/CMakeLists.txt
    M src/engines/EngineFactory.cpp

  Log Message:
  -----------
  Prashant's work in progress


  Commit: 23b8a432c1c384cfb980e379f8aaf23918a182c6
      https://github.com/minotaur-solver/minotaur/commit/23b8a432c1c384cfb980e379f8aaf23918a182c6
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-06-04 (Tue, 04 Jun 2019)

  Changed paths:
    M src/engines/CMakeLists.txt

  Log Message:
  -----------
  Minor change in permissions


  Commit: 6a339d224769a119b8ed335ff70bebdd61add76a
      https://github.com/minotaur-solver/minotaur/commit/6a339d224769a119b8ed335ff70bebdd61add76a
  Author: ppalkar <ppalkar.iitb at gmail.com>
  Date:   2019-06-04 (Tue, 04 Jun 2019)

  Changed paths:
    M CMakeLists.txt
    M scripts/daily-lnx-iit-test.sh
    M src/algorithms/Bnb.cpp
    M src/algorithms/Bnc.cpp
    M src/algorithms/CMakeLists.txt
    M src/algorithms/Glob.cpp
    M src/algorithms/McBnb.cpp
    M src/algorithms/McQG.cpp
    M src/algorithms/MiDfo.cpp
    M src/algorithms/MsBnb.cpp
    M src/algorithms/OA.cpp
    M src/algorithms/QG.cpp
    M src/algorithms/QGAdv.cpp
    M src/algorithms/QPDive.cpp
    M src/algorithms/mipdecoqg.cpp
    M src/base/BndProcessor.cpp
    M src/base/BndProcessor.h
    M src/base/BrCand.cpp
    M src/base/BrCand.h
    M src/base/BrVarCand.cpp
    M src/base/Branch.cpp
    M src/base/Branch.h
    M src/base/CMakeLists.txt
    M src/base/CNode.h
    M src/base/ConBoundMod.cpp
    M src/base/ConBoundMod.h
    M src/base/Constraint.h
    M src/base/CutInfo.h
    M src/base/CutMan2.h
    M src/base/CxQuadHandler.cpp
    M src/base/CxQuadHandler.h
    M src/base/CxUnivarHandler.cpp
    M src/base/CxUnivarHandler.h
    M src/base/Engine.h
    M src/base/FeasibilityPump.cpp
    M src/base/FeasibilityPump.h
    M src/base/Function.cpp
    M src/base/HessianOfLag.cpp
    M src/base/IntVarHandler.cpp
    M src/base/LGCIGenerator.cpp
    M src/base/LPEngine.h
    M src/base/LinBil.cpp
    M src/base/LinConMod.cpp
    M src/base/LinConMod.h
    M src/base/LinFeasPump.h
    M src/base/LinearFunction.h
    M src/base/LinearHandler.cpp
    M src/base/LinearHandler.h
    M src/base/MILPEngine.h
    M src/base/MINLPDiving.cpp
    M src/base/MINLPDiving.h
    M src/base/MsProcessor.cpp
    M src/base/MsProcessor.h
    M src/base/MultilinearTermsHandler.cpp
    M src/base/NLPEngine.h
    M src/base/NLPMultiStart.h
    M src/base/NlPresHandler.cpp
    M src/base/NlWriter.cpp
    M src/base/NodeFullRelaxer.cpp
    M src/base/NodeIncRelaxer.cpp
    M src/base/OAHandler.cpp
    M src/base/Objective.h
    M src/base/PCBProcessor.cpp
    M src/base/ParBndProcessor.h
    M src/base/ParBranchAndBound.h
    M src/base/ParNodeIncRelaxer.cpp
    M src/base/ParPCBProcessor.cpp
    M src/base/ParPCBProcessor.h
    M src/base/ParQGBranchAndBound.h
    M src/base/ParQGHandler.cpp
    M src/base/ParReliabilityBrancher.h
    M src/base/PolynomialFunction.cpp
    M src/base/Problem.cpp
    M src/base/Problem.h
    M src/base/QPDProcessor.cpp
    M src/base/QPDProcessor.h
    M src/base/QPDRelaxer.cpp
    M src/base/QPDRelaxer.h
    M src/base/QPEngine.h
    M src/base/QuadHandler.cpp
    M src/base/QuadraticFunction.cpp
    M src/base/QuadraticFunction.h
    M src/base/RCHandler.cpp
    M src/base/RCHandler.h
    M src/base/Relaxation.cpp
    M src/base/ReliabilityBrancher.cpp
    M src/base/ReliabilityBrancher.h
    M src/base/SOS1Handler.cpp
    M src/base/SOS2Handler.cpp
    M src/base/SOSBrCand.h
    M src/base/SimpleTransformer.cpp
    M src/base/TransPoly.cpp
    M src/base/Transformer.cpp
    M src/base/Types.h
    M src/base/VarBoundMod.cpp
    M src/base/VarBoundMod.h
    M src/base/Variable.cpp
    M src/base/Variable.h
    M src/base/YEqMonomial.h
    M src/engines/Bqpd/BqpdEngine.h
    M src/engines/Cbc/CbcEngine.cpp
    M src/engines/Cbc/CbcEngine.h
    M src/engines/EngineFactory.h
    M src/engines/FilterSQP/FilterSQPEngine.h
    M src/engines/Ipopt/IpoptEngine.cpp
    M src/engines/Ipopt/IpoptEngine.h
    M src/engines/OsiLP/OsiLPEngine.h
    M src/interfaces/ampl/AMPLInterface.cpp
    M src/interfaces/ampl/AMPLInterface.h
    M src/testing/AMPLBqpdUT.cpp
    M src/testing/AMPLCGraphUT.cpp
    M src/testing/AMPLCbcUT.cpp
    M src/testing/AMPLFilterSQPUT.cpp
    M src/testing/AMPLInstanceUT.cpp
    M src/testing/AMPLIpoptUT.cpp
    M src/testing/AMPLOsiUT.cpp
    M src/testing/CGraphUT.cpp
    M src/testing/CMakeLists.txt
    M src/testing/FunctionUT.cpp
    M src/testing/IpoptEngineUT.cpp
    M src/testing/LinearFunctionUT.cpp
    M src/testing/NLPBnbUT.cpp
    M src/testing/ObjectiveUT.cpp
    M src/testing/ObjectiveUT.h
    M src/testing/PerspRefUT.cpp
    M src/testing/PerspRefUT.h
    M src/testing/PolySolverUT.cpp
    M src/testing/PolyUT.cpp
    M src/testing/ProblemUT.cpp
    M src/testing/QuadraticFunctionUT.cpp
    M src/testing/TransformerUT.cpp
    M third-party/build_third_party
    M third-party/clean_third_party

  Log Message:
  -----------
  resolved conflicts


Compare: https://github.com/minotaur-solver/minotaur/compare/434c01d25679...6a339d224769