Commit f3ef275c authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'master' into Use_gurobi_finder_from_library

parents 0bd08196 87255cfa
Subproject commit a73620585086c6720e6f6cf163f9637e3b0f089d
Subproject commit 21458a916eed4b1d60de52e48733ba7922cb0d77
......@@ -117,7 +117,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_EIGENARPACKMATRIXT_C)
#define COMISO_EIGENARPACKMATRIXT_TEMPLATES
#include "EigenArpackMatrixT.cc"
#include "EigenArpackMatrixT_impl.hh"
#endif
//=============================================================================
#endif // COMISO_SUITESPARSE_AVAILABLE
......
......@@ -184,7 +184,7 @@ find_max_abs_coeff(SVectorGMM& _v)
if(std::abs(*c_it) > vmax)
{
imax = c_it.index();
vmax = *c_it;
vmax = std::abs(*c_it);
}
return imax;
......
......@@ -122,7 +122,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_LINEARCONSTRAINTHANDLERELIMINATION_C)
#define COMISO_LINEARCONSTRAINTHANDLERELIMINATION_TEMPLATES
#include "LinearConstraintHandlerEliminationT.cc"
#include "LinearConstraintHandlerEliminationT_impl.hh"
#endif
//=============================================================================
#endif // COMISO_LINEARCONSTRAINTHANDLERELIMINATION_HH defined
......
......@@ -104,7 +104,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_LINEARCONSTRAINTHANDLERPENALTY_C)
#define COMISO_LINEARCONSTRAINTHANDLERPENALTY_TEMPLATES
#include "LinearConstraintHandlerPenaltyT.cc"
#include "LinearConstraintHandlerPenaltyT_impl.hh"
#endif
//=============================================================================
#endif // COMISO_LINEARCONSTRAINTHANDLERPENALTY_HH defined
......
......@@ -124,7 +124,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_NSOLVERGMMINTERFACE_C)
#define COMISO_NSOLVERGMMINTERFACE_TEMPLATES
#include "NPLinearConstraintsT.cc"
#include "NPLinearConstraintsT_impl.hh"
#endif
//=============================================================================
#endif // COMISO_NSOLVERGMMINTERFACE_HH defined
......
......@@ -190,7 +190,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_SUPERSPARSEMATRIXT_C)
#define COMISO_SUPERSPARSEMATRIXT_TEMPLATES
#include "SuperSparseMatrixT.cc"
#include "SuperSparseMatrixT_impl.hh"
#endif
//=============================================================================
#endif // COMISO_SUPERSPARSEMATRIXT_HH defined
......
......@@ -136,7 +136,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_CHOLMOD_SOLVER_TEMPLATES_C)
#define COMISO_CHOLMOD_SOLVER_TEMPLATES
#include "CholmodSolverT.cc"
#include "CholmodSolverT_impl.hh"
#endif
//=============================================================================
#else // COMISO_SUITESPARSE_AVAILABLE
......
......@@ -23,7 +23,7 @@
\*===========================================================================*/
#include "ConstrainedSolverT.cc"
#include "ConstrainedSolverT_impl.hh"
namespace COMISO {
......
......@@ -432,7 +432,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_CONSTRAINEDSOLVER_C)
#define COMISO_CONSTRAINEDSOLVER_TEMPLATES
#include "ConstrainedSolverT.cc"
#include "ConstrainedSolverT_impl.hh"
#endif
//=============================================================================
#endif // COMISO_CONSTRAINEDSOLVER_HH defined
......
......@@ -22,7 +22,7 @@
* *
\*===========================================================================*/
#include "EigenLDLTSolverT.cc"
#include "EigenLDLTSolverT_impl.hh"
//== COMPILE-TIME PACKAGE REQUIREMENTS ========================================
#if (COMISO_EIGEN3_AVAILABLE)
......
......@@ -110,7 +110,7 @@ private:
//=============================================================================
#if defined(INCLUDE_TEMPLATES) && !defined(COMISO_EIGEN_LDLT_SOLVER_TEMPLATES_C)
#define COMISO_EIGEN_LDLT_SOLVER_TEMPLATES
#include "EigenLDLTSolverT.cc"
#include "EigenLDLTSolverT_impl.hh"
#endif
//=============================================================================
#endif // COMISO_EIGEN3_AVAILABLE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment