[Minotaur-dev] [minotaur-solver/minotaur] a51e8a: transformer for univariate quad cons

[Mustafa Vora]

  Branch: refs/heads/master
  Home:   https://github.com/minotaur-solver/minotaur
  Commit: a51e8a88395e846c7852dd7a842657bb9268701b
      https://github.com/minotaur-solver/minotaur/commit/a51e8a88395e846c7852dd7a842657bb9268701b
  Author: Vora Mustafa Makbul <mustafa.vora at iitb.ac.in>
  Date:   2021-01-19 (Tue, 19 Jan 2021)

  Changed paths:
    M src/algorithms/Glob.cpp
    M src/base/CMakeLists.txt
    M src/base/Constraint.cpp
    M src/base/Function.cpp
    M src/base/QuadHandler.cpp
    M src/base/QuadHandler.h
    A src/base/QuadTransformer.cpp
    A src/base/QuadTransformer.h
    M src/base/QuadraticFunction.cpp
    M src/base/Transformer.h
    A src/base/UnivarQuadHandler.cpp
    A src/base/UnivarQuadHandler.h
    M src/base/Variable.h
    A src/base/YEqBivar.cpp
    A src/base/YEqBivar.h
    M src/base/YEqQfBil.cpp
    M src/base/YEqQfBil.h
    A src/base/YEqUnivar.cpp
    A src/base/YEqUnivar.h

  Log Message:
  -----------
  transformer for univariate quad cons


  Commit: 5258096c7683e054d983a7d2795a1c5d49ae7331
      https://github.com/minotaur-solver/minotaur/commit/5258096c7683e054d983a7d2795a1c5d49ae7331
  Author: Vora Mustafa Makbul <mustafa.vora at iitb.ac.in>
  Date:   2021-01-19 (Tue, 19 Jan 2021)

  Changed paths:
    M src/algorithms/Bnb.cpp
    M src/algorithms/CMakeLists.txt
    M src/algorithms/McBnb.cpp
    M src/algorithms/McQG.cpp
    M src/algorithms/QGAdv.cpp
    A src/base/AnalyticalCenter.cpp
    A src/base/AnalyticalCenter.h
    M src/base/CGraph.cpp
    M src/base/CGraph.h
    M src/base/CMakeLists.txt
    M src/base/Constraint.h
    M src/base/Cut.h
    M src/base/Environment.cpp
    M src/base/IntVarHandler.cpp
    M src/base/LinearHandler.cpp
    M src/base/NlPresHandler.cpp
    M src/base/NlPresHandler.h
    M src/base/Node.cpp
    M src/base/Node.h
    M src/base/ParBranchAndBound.cpp
    M src/base/ParBranchAndBound.h
    M src/base/ParNodeIncRelaxer.cpp
    M src/base/ParPCBProcessor.cpp
    M src/base/ParQGBranchAndBound.cpp
    M src/base/ParQGBranchAndBound.h
    M src/base/ParQGHandler.cpp
    M src/base/ParQGHandler.h
    M src/base/ParReliabilityBrancher.cpp
    M src/base/ParTreeManager.cpp
    M src/base/PerspCon.cpp
    M src/base/PerspCon.h
    M src/base/PerspCutGenerator.cpp
    M src/base/PerspCutGenerator.h
    M src/base/QGHandlerAdvance.cpp
    M src/base/QGHandlerAdvance.h
    M src/base/QuadraticFunction.cpp
    M src/base/QuadraticFunction.h
    M src/base/TransSep.cpp
    M src/base/TransSep.h
    M src/base/Types.h
    M src/base/UnambRelBrancher.cpp
    M src/base/UnambRelBrancher.h
    M src/base/Variable.h
    M src/engines/Cplex/CplexLPEngine.cpp

  Log Message:
  -----------
  resolved conflicts in src/base/CMakeLists.txt


Compare: https://github.com/minotaur-solver/minotaur/compare/6bce94d2b20a...5258096c7683