Commit 295188fe authored by Max Lyon's avatar Max Lyon

Merge from ReForm

parents 49e4334c d4ad1599
Pipeline #5572 failed with stages
in 2 minutes and 29 seconds
...@@ -42,17 +42,9 @@ namespace COMISO { ...@@ -42,17 +42,9 @@ namespace COMISO {
class COMISODLLEXPORT ArpackSolver class COMISODLLEXPORT ArpackSolver
{ {
public: public:
// sparse matrix type // sparse matrix type
typedef EigenArpackMatrixT<double,Eigen::SparseMatrix<double,Eigen::ColMajor> > Matrix; typedef EigenArpackMatrixT<double,Eigen::SparseMatrix<double,Eigen::ColMajor> > Matrix;
/// Constructor
ArpackSolver() {}
/// Destructor
~ArpackSolver() {}
// solve eigenproblem // solve eigenproblem
// number of desired eigenvalues -> _n_eigenvalues // number of desired eigenvalues -> _n_eigenvalues
// which eigenvalues -> one of {LA (largest algebraic), SA (smalles algebraic), LM (largest magnitude), SM(smallest magnitued), BE(both ends)} // which eigenvalues -> one of {LA (largest algebraic), SA (smalles algebraic), LM (largest magnitude), SM(smallest magnitued), BE(both ends)}
...@@ -77,9 +69,6 @@ public: ...@@ -77,9 +69,6 @@ public:
// check resulting eigenvalues/eigenvectors // check resulting eigenvalues/eigenvectors
template<class MatrixT,class MatrixT2> template<class MatrixT,class MatrixT2>
void check_result(const MatrixT& _A, std::vector<double>& _eigenvalues, MatrixT2& _eigenvectors); void check_result(const MatrixT& _A, std::vector<double>& _eigenvalues, MatrixT2& _eigenvectors);
private:
}; };
......
...@@ -74,9 +74,6 @@ public: ...@@ -74,9 +74,6 @@ public:
} }
} }
/// Destructor
~EigenArpackMatrixT() {}
// get reference on matrix // get reference on matrix
Matrix& matrix() { return mat_; } Matrix& matrix() { return mat_; }
......
...@@ -45,9 +45,6 @@ public: ...@@ -45,9 +45,6 @@ public:
AcceleratedQuadraticProxy(const double _eps = 1e-6, const int _max_iters = 1000, const double _accelerate = 100.0, const double _alpha_ls=0.2, const double _beta_ls = 0.6) AcceleratedQuadraticProxy(const double _eps = 1e-6, const int _max_iters = 1000, const double _accelerate = 100.0, const double _alpha_ls=0.2, const double _beta_ls = 0.6)
: eps_(_eps), max_iters_(_max_iters), accelerate_(_accelerate), alpha_ls_(_alpha_ls), beta_ls_(_beta_ls) {} : eps_(_eps), max_iters_(_max_iters), accelerate_(_accelerate), alpha_ls_(_alpha_ls), beta_ls_(_beta_ls) {}
/// Destructor
~AcceleratedQuadraticProxy() {}
// solve without linear constraints // solve without linear constraints
int solve(NProblemInterface* _quadratic_problem, NProblemInterface* _nonlinear_problem, bool _update_factorization = true) int solve(NProblemInterface* _quadratic_problem, NProblemInterface* _nonlinear_problem, bool _update_factorization = true)
{ {
......
...@@ -30,14 +30,6 @@ BoundConstraint(const unsigned int _var_idx, // index of variable for bound c ...@@ -30,14 +30,6 @@ BoundConstraint(const unsigned int _var_idx, // index of variable for bound c
} }
//-----------------------------------------------------------------------------
BoundConstraint::
~BoundConstraint()
{
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -47,10 +47,6 @@ public: ...@@ -47,10 +47,6 @@ public:
const unsigned int _n = 0, // number of unknowns in problem const unsigned int _n = 0, // number of unknowns in problem
const ConstraintType _type = NC_LESS_EQUAL); // type of bound upper, lower or both (equal) const ConstraintType _type = NC_LESS_EQUAL); // type of bound upper, lower or both (equal)
/// Destructor
virtual ~BoundConstraint();
virtual int n_unknowns ( ); virtual int n_unknowns ( );
virtual double eval_constraint ( const double* _x ); virtual double eval_constraint ( const double* _x );
virtual void eval_gradient ( const double* _x, SVectorNC& _g ); virtual void eval_gradient ( const double* _x, SVectorNC& _g );
......
...@@ -39,12 +39,6 @@ namespace COMISO { ...@@ -39,12 +39,6 @@ namespace COMISO {
class COMISODLLEXPORT CBCSolver class COMISODLLEXPORT CBCSolver
{ {
public: public:
/// Default constructor
CBCSolver() {}
/// Destructor
~CBCSolver() {}
// ********** SOLVE **************** // // ********** SOLVE **************** //
//! \throws Outcome //! \throws Outcome
bool solve( bool solve(
......
...@@ -44,12 +44,6 @@ public: ...@@ -44,12 +44,6 @@ public:
typedef std::pair<unsigned int, VariableType> PairUiV; typedef std::pair<unsigned int, VariableType> PairUiV;
/// Default constructor
COMISOSolver() {}
/// Destructor
~COMISOSolver() {}
// ********** SOLVE **************** // // ********** SOLVE **************** //
void solve(NProblemInterface* _problem, // problem instance void solve(NProblemInterface* _problem, // problem instance
std::vector<NConstraintInterface*>& _constraints, // linear constraints std::vector<NConstraintInterface*>& _constraints, // linear constraints
......
...@@ -1300,14 +1300,6 @@ add_constraint_to_model( NConstraintInterface* _constraint, std::vector<IloNumVa ...@@ -1300,14 +1300,6 @@ add_constraint_to_model( NConstraintInterface* _constraint, std::vector<IloNumVa
} }
CPLEXSolver::
CPLEXSolver()
{
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -45,12 +45,6 @@ class COMISODLLEXPORT CPLEXSolver ...@@ -45,12 +45,6 @@ class COMISODLLEXPORT CPLEXSolver
{ {
public: public:
/// Default constructor
CPLEXSolver();
/// Destructor
~CPLEXSolver() { /*env_.end();*/}
// ********** SOLVE **************** // // ********** SOLVE **************** //
// this function has to be inline due to static linking issues // this function has to be inline due to static linking issues
bool solve(NProblemInterface* _problem, // problem instance bool solve(NProblemInterface* _problem, // problem instance
......
...@@ -5,22 +5,20 @@ ...@@ -5,22 +5,20 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include "CombinedProblem.hh" #include "CombinedProblem.hh"
#include <Base/Debug/DebOut.hh>
namespace COMISO { namespace COMISO {
CombinedProblem::CombinedProblem (NProblemInterface* _p1, NProblemInterface* _p2, const double _c1, const double _c2) CombinedProblem::CombinedProblem (NProblemInterface* _p1, NProblemInterface* _p2, const double _c1, const double _c2)
: p1_(_p1) , p2_(_p2), c1_(_c1), c2_(_c2) : p1_(_p1) , p2_(_p2), c1_(_c1), c2_(_c2)
{ {
if(p1_->n_unknowns() != p2_->n_unknowns()) DEB_enter_func;
std::cerr << "Warning: CombinedProblem received two problems with different #unknowns!!!" << std::endl; DEB_warning_if(p1_->n_unknowns() != p2_->n_unknowns(), 1,
"CombinedProblem received two problems with different unknowns #");
g_temp_.resize(p1_->n_unknowns()); g_temp_.resize(p1_->n_unknowns());
} }
CombinedProblem::~CombinedProblem()
{
}
int CombinedProblem::n_unknowns() int CombinedProblem::n_unknowns()
{ {
return p1_->n_unknowns(); return p1_->n_unknowns();
......
...@@ -48,9 +48,6 @@ public: ...@@ -48,9 +48,6 @@ public:
/// Default constructor /// Default constructor
CombinedProblem (NProblemInterface* _p1, NProblemInterface* _p2, const double _c1 = 1.0, const double _c2 = 1.0); CombinedProblem (NProblemInterface* _p1, NProblemInterface* _p2, const double _c1 = 1.0, const double _c2 = 1.0);
/// Destructor
virtual ~CombinedProblem();
// problem definition // problem definition
virtual int n_unknowns(); virtual int n_unknowns();
......
...@@ -39,9 +39,6 @@ ConeConstraint::ConeConstraint(const double _c, const int _i, const SMatrixNC& _ ...@@ -39,9 +39,6 @@ ConeConstraint::ConeConstraint(const double _c, const int _i, const SMatrixNC& _
{ {
} }
/// Destructor
ConeConstraint::~ConeConstraint() {}
int ConeConstraint::n_unknowns() int ConeConstraint::n_unknowns()
{ {
return Q_.cols(); return Q_.cols();
......
...@@ -39,9 +39,6 @@ public: ...@@ -39,9 +39,6 @@ public:
// cone constraint of the form -> 0.5*(c_ * x(i_)^2 - x^T Q_ x) >= 0 // cone constraint of the form -> 0.5*(c_ * x(i_)^2 - x^T Q_ x) >= 0
ConeConstraint(const double _c, const int _i, const SMatrixNC& _Q); ConeConstraint(const double _c, const int _i, const SMatrixNC& _Q);
/// Destructor
virtual ~ConeConstraint();
virtual int n_unknowns(); virtual int n_unknowns();
// resize coefficient vector = #unknowns // resize coefficient vector = #unknowns
......
...@@ -13,17 +13,6 @@ ...@@ -13,17 +13,6 @@
namespace COMISO { namespace COMISO {
ConstraintTools::ConstraintTools()
{
}
//-----------------------------------------------------------------------------
ConstraintTools::~ConstraintTools()
{
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
......
...@@ -47,12 +47,6 @@ public: ...@@ -47,12 +47,6 @@ public:
typedef gmm::row_matrix< SVectorGMM > RMatrixGMM; typedef gmm::row_matrix< SVectorGMM > RMatrixGMM;
typedef gmm::col_matrix< SVectorGMM > CMatrixGMM; typedef gmm::col_matrix< SVectorGMM > CMatrixGMM;
/// Default constructor
ConstraintTools();
/// Destructor
~ConstraintTools();
// remove all linear dependent linear equality constraints. the remaining constraints are a subset of the original ones // remove all linear dependent linear equality constraints. the remaining constraints are a subset of the original ones
// nonlinear or equality constraints are preserved. // nonlinear or equality constraints are preserved.
static void remove_dependent_linear_constraints(std::vector<NConstraintInterface*>& _constraints, const double _eps = 1e-8); static void remove_dependent_linear_constraints(std::vector<NConstraintInterface*>& _constraints, const double _eps = 1e-8);
......
...@@ -242,8 +242,6 @@ private: ...@@ -242,8 +242,6 @@ private:
Job::~Job() Job::~Job()
{ {
DEB_enter_func;
delete stts_; delete stts_;
if (url_.empty()) // not setup if (url_.empty()) // not setup
......
...@@ -13,11 +13,6 @@ FiniteElementProblem::FiniteElementProblem(const unsigned int _n) ...@@ -13,11 +13,6 @@ FiniteElementProblem::FiniteElementProblem(const unsigned int _n)
{ {
} }
/// Destructor
FiniteElementProblem::~FiniteElementProblem()
{
}
void FiniteElementProblem::add_set(FiniteElementSetBase* _fe_set) void FiniteElementProblem::add_set(FiniteElementSetBase* _fe_set)
{ {
fe_sets_.push_back(_fe_set); fe_sets_.push_back(_fe_set);
......
...@@ -237,9 +237,6 @@ public: ...@@ -237,9 +237,6 @@ public:
/// Default constructor /// Default constructor
FiniteElementProblem(const unsigned int _n); FiniteElementProblem(const unsigned int _n);
/// Destructor
virtual ~FiniteElementProblem();
void add_set(FiniteElementSetBase* _fe_set); void add_set(FiniteElementSetBase* _fe_set);
void clear_sets(); void clear_sets();
......
...@@ -59,13 +59,6 @@ void add_constraint_to_model(COMISO::NConstraintInterface* _constraint, ...@@ -59,13 +59,6 @@ void add_constraint_to_model(COMISO::NConstraintInterface* _constraint,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
GUROBISolver::
GUROBISolver()
{
}
//-----------------------------------------------------------------------------
static void process_gurobi_exception(const GRBException& _exc) static void process_gurobi_exception(const GRBException& _exc)
{ {
DEB_enter_func; DEB_enter_func;
......
...@@ -42,13 +42,6 @@ namespace COMISO { ...@@ -42,13 +42,6 @@ namespace COMISO {
class COMISODLLEXPORT GUROBISolver class COMISODLLEXPORT GUROBISolver
{ {
public: public:
/// Default constructor
GUROBISolver();
/// Destructor
~GUROBISolver() {}
// ********** SOLVE **************** // // ********** SOLVE **************** //
bool solve(NProblemInterface* _problem, // problem instance bool solve(NProblemInterface* _problem, // problem instance
std::vector<NConstraintInterface*>& _constraints, // linear constraints std::vector<NConstraintInterface*>& _constraints, // linear constraints
......
...@@ -52,9 +52,6 @@ public: ...@@ -52,9 +52,6 @@ public:
/// Default constructor -> set up IpOptApplication /// Default constructor -> set up IpOptApplication
IPOPTSolver(); IPOPTSolver();
/// Destructor
~IPOPTSolver() {}
// ********** SOLVE **************** // // ********** SOLVE **************** //
// solve -> returns ipopt status code // solve -> returns ipopt status code
//------------------------------------------------------ //------------------------------------------------------
......
...@@ -171,12 +171,16 @@ static void throw_ipopt_solve_failure(Ipopt::ApplicationReturnStatus const statu ...@@ -171,12 +171,16 @@ static void throw_ipopt_solve_failure(Ipopt::ApplicationReturnStatus const statu
// Internal_Error=-199 // Internal_Error=-199
// }; // };
//------------------------------------------------------ //------------------------------------------------------
switch(status) { switch (status)
{
case Ipopt::Maximum_Iterations_Exceeded: case Ipopt::Maximum_Iterations_Exceeded:
COMISO_THROW(IPOPT_MAXIMUM_ITERATIONS_EXCEEDED); COMISO_THROW(IPOPT_MAXIMUM_ITERATIONS_EXCEEDED);
case Ipopt::NonIpopt_Exception_Thrown:
// this could be due to a thrown PROGRESS_ABORTED exception, ...
PROGRESS_RESUME_ABORT; // ... so check if we need to resume it
default: default:
COMISO_THROW(IPOPT_OPTIMIZATION_FAILED); COMISO_THROW(IPOPT_OPTIMIZATION_FAILED);
} // endswicth }
} }
static void check_ipopt_status(Ipopt::ApplicationReturnStatus const _stat) static void check_ipopt_status(Ipopt::ApplicationReturnStatus const _stat)
...@@ -185,7 +189,6 @@ static void check_ipopt_status(Ipopt::ApplicationReturnStatus const _stat) ...@@ -185,7 +189,6 @@ static void check_ipopt_status(Ipopt::ApplicationReturnStatus const _stat)
throw_ipopt_solve_failure(_stat); throw_ipopt_solve_failure(_stat);
} }
void IPOPTSolverLean::solve(NProblemInterface* _problem, void IPOPTSolverLean::solve(NProblemInterface* _problem,
const std::vector<NConstraintInterface*>& _constraints) const std::vector<NConstraintInterface*>& _constraints)
{ {
......
...@@ -41,10 +41,6 @@ public: ...@@ -41,10 +41,6 @@ public:
/// Default constructor /// Default constructor
LeastSquaresProblem(const int _n_unknowns = 0) :n_(_n_unknowns), x_(_n_unknowns, 0.0) {} LeastSquaresProblem(const int _n_unknowns = 0) :n_(_n_unknowns), x_(_n_unknowns, 0.0) {}
/// Destructor
~LeastSquaresProblem() {}
void add_term(NConstraintInterface* _term); void add_term(NConstraintInterface* _term);
void clear_terms() {terms_.clear();} void clear_terms() {terms_.clear();}
......
...@@ -35,9 +35,6 @@ LinearConstraint::LinearConstraint(const SVectorNC& _coeffs, const double _b, co ...@@ -35,9 +35,6 @@ LinearConstraint::LinearConstraint(const SVectorNC& _coeffs, const double _b, co
b_ = _b; b_ = _b;
} }
/// Destructor
LinearConstraint::~LinearConstraint() {}
int LinearConstraint::n_unknowns() int LinearConstraint::n_unknowns()
{ {
return coeffs_.innerSize(); return coeffs_.innerSize();
......
...@@ -48,9 +48,6 @@ public: ...@@ -48,9 +48,6 @@ public:
// linear equation of the form -> coeffs_^T *x + b_=_type= 0 // linear equation of the form -> coeffs_^T *x + b_=_type= 0
LinearConstraint(const SVectorNC& _coeffs, const double _b, const ConstraintType _type = NC_EQUAL); LinearConstraint(const SVectorNC& _coeffs, const double _b, const ConstraintType _type = NC_EQUAL);
/// Destructor
virtual ~LinearConstraint();
virtual int n_unknowns(); virtual int n_unknowns();
// resize coefficient vector = #unknowns // resize coefficient vector = #unknowns
......
...@@ -52,10 +52,6 @@ public: ...@@ -52,10 +52,6 @@ public:
LinearConstraintHandlerElimination( const MatrixT& _C, const VectorT& _c) LinearConstraintHandlerElimination( const MatrixT& _C, const VectorT& _c)
{initialize(_C, _c); } {initialize(_C, _c); }
/// Destructor
~LinearConstraintHandlerElimination() {}
// number of variables // number of variables
int n() {return n_;} int n() {return n_;}
// number of reduced variables (after elimination) // number of reduced variables (after elimination)
......
...@@ -20,13 +20,6 @@ namespace COMISO { ...@@ -20,13 +20,6 @@ namespace COMISO {
/// Constructor /// Constructor
LinearConstraintHandlerPenalty::LinearConstraintHandlerPenalty() : penalty_(10000) {} LinearConstraintHandlerPenalty::LinearConstraintHandlerPenalty() : penalty_(10000) {}
//-----------------------------------------------------------------------------
/// Destructor
LinearConstraintHandlerPenalty::~LinearConstraintHandlerPenalty()
{}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// penalty weight // penalty weight
......
...@@ -51,9 +51,6 @@ public: ...@@ -51,9 +51,6 @@ public:
template<class MatrixT, class VectorT> template<class MatrixT, class VectorT>
LinearConstraintHandlerPenalty( const MatrixT& _C, const VectorT& _c); LinearConstraintHandlerPenalty( const MatrixT& _C, const VectorT& _c);
/// Destructor
~LinearConstraintHandlerPenalty();
// penalty weight // penalty weight
double& penalty(); double& penalty();
......
...@@ -15,10 +15,6 @@ namespace COMISO { ...@@ -15,10 +15,6 @@ namespace COMISO {
x_.resize(_dimension, 0.0); x_.resize(_dimension, 0.0);
} }
LinearProblem::~LinearProblem()
{
}
int LinearProblem::n_unknowns() int LinearProblem::n_unknowns()
{ {
return static_cast<int>(coeffs_.size()); return static_cast<int>(coeffs_.size());
......
...@@ -45,9 +45,6 @@ public: ...@@ -45,9 +45,6 @@ public:
/// Default constructor /// Default constructor
LinearProblem (std::size_t _dimension = 0); LinearProblem (std::size_t _dimension = 0);
/// Destructor
virtual ~LinearProblem();
// problem definition // problem definition
virtual int n_unknowns(); virtual int n_unknowns();
......
...@@ -2,10 +2,4 @@ ...@@ -2,10 +2,4 @@
namespace COMISO { namespace COMISO {
NPDerivativeChecker::NPDerivativeChecker()
{}
NPDerivativeChecker::~NPDerivativeChecker()
{}
} }
...@@ -60,12 +60,6 @@ public: ...@@ -60,12 +60,6 @@ public:
double relativeEps; double relativeEps;
}; };
/// Default constructor
NPDerivativeChecker();
/// Destructor
~NPDerivativeChecker();
template<class ProblemInterface> template<class ProblemInterface>
bool check_all(ProblemInterface* _np, double _dx, double _eps) bool check_all(ProblemInterface* _np, double _dx, double _eps)
{ {
......
...@@ -31,9 +31,6 @@ NPLinearConstraintsElimination::NPLinearConstraintsElimination(NProblemGmmInterf ...@@ -31,9 +31,6 @@ NPLinearConstraintsElimination::NPLinearConstraintsElimination(NProblemGmmInterf
this->initialize_identity(base_->n_unknowns());