Commit dea8257e authored by Martin Marinov's avatar Martin Marinov
Browse files

Merge remote-tracking branch 'origin/warning_fixes'

parents 957aeb32 54dc54db
...@@ -28,7 +28,7 @@ if (MSVC) ...@@ -28,7 +28,7 @@ if (MSVC)
add_definitions(-DNOMINMAX) add_definitions(-DNOMINMAX)
# add_definitions(-DIL_STD) #set CPLEX to use its STL interface, change this?! # add_definitions(-DIL_STD) #set CPLEX to use its STL interface, change this?!
add_definitions(/W1) #add appropriate warnings flags for this project, the compilation raises to too may warnings add_definitions(/W3) #add appropriate warnings flags for this project, the compilation raises to too may warnings
add_definitions(/MP) #build on all cores add_definitions(/MP) #build on all cores
endif (MSVC) endif (MSVC)
......
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <iostream> #include <iostream>
#include <Base/Code/Quality.hh>
LOW_CODE_QUALITY_SECTION_BEGIN
#include <Eigen/Eigen> #include <Eigen/Eigen>
#if EIGEN_VERSION_AT_LEAST(3,1,0) #if EIGEN_VERSION_AT_LEAST(3,1,0)
...@@ -26,6 +29,7 @@ ...@@ -26,6 +29,7 @@
#include <unsupported/Eigen/CholmodSupport> #include <unsupported/Eigen/CholmodSupport>
#endif #endif
#include <Eigen/Sparse> #include <Eigen/Sparse>
LOW_CODE_QUALITY_SECTION_END
//== FORWARDDECLARATIONS ====================================================== //== FORWARDDECLARATIONS ======================================================
......
...@@ -63,9 +63,9 @@ public: ...@@ -63,9 +63,9 @@ public:
COMISO::StopWatch sw; sw.start(); COMISO::StopWatch sw; sw.start();
// number of unknowns // number of unknowns
int n = _quadratic_problem->n_unknowns(); size_t n = _quadratic_problem->n_unknowns();
// number of constraints // number of constraints
int m = _b.size(); size_t m = _b.size();
std::cerr << "optmize via AQP with " << n << " unknowns and " << m << " linear constraints" << std::endl; std::cerr << "optmize via AQP with " << n << " unknowns and " << m << " linear constraints" << std::endl;
...@@ -193,7 +193,7 @@ protected: ...@@ -193,7 +193,7 @@ protected:
double backtracking_line_search(NProblemInterface* _quadratic_problem, NProblemInterface* _nonlinear_problem, VectorD& _x, VectorD& _g, VectorD& _dx, double& _rel_df, double _t_start = 1.0) double backtracking_line_search(NProblemInterface* _quadratic_problem, NProblemInterface* _nonlinear_problem, VectorD& _x, VectorD& _g, VectorD& _dx, double& _rel_df, double _t_start = 1.0)
{ {
int n = _x.size(); size_t n = _x.size();
// pre-compute objective // pre-compute objective
double fx = _quadratic_problem->eval_f(_x.data()) + _nonlinear_problem->eval_f(_x.data()); double fx = _quadratic_problem->eval_f(_x.data()) + _nonlinear_problem->eval_f(_x.data());
......
...@@ -150,7 +150,7 @@ bool solve_impl( ...@@ -150,7 +150,7 @@ bool solve_impl(
DEB_warning_if(!_problem->constant_gradient(), 1, DEB_warning_if(!_problem->constant_gradient(), 1,
"CBCSolver received a problem with non-constant gradient!"); "CBCSolver received a problem with non-constant gradient!");
const int n_rows = _constraints.size(); // Constraints # const size_t n_rows = _constraints.size(); // Constraints #
const int n_cols = _problem->n_unknowns(); // Unknowns # const int n_cols = _problem->n_unknowns(); // Unknowns #
// expand the variable types from discrete mtrx array // expand the variable types from discrete mtrx array
......
...@@ -50,7 +50,7 @@ solve(NProblemInterface* _problem, ...@@ -50,7 +50,7 @@ solve(NProblemInterface* _problem,
//---------------------------------------------- //----------------------------------------------
// 2. setup constraints // 2. setup constraints
//---------------------------------------------- //----------------------------------------------
int n = _problem->n_unknowns(); std::size_t n = _problem->n_unknowns();
gmm::row_matrix< gmm::wsvector< double > > C(_constraints.size(), n+1); gmm::row_matrix< gmm::wsvector< double > > C(_constraints.size(), n+1);
int n_constraints = 0; int n_constraints = 0;
......
...@@ -26,11 +26,10 @@ namespace COMISO { ...@@ -26,11 +26,10 @@ namespace COMISO {
/// Default constructor /// Default constructor
ConeConstraint::ConeConstraint() ConeConstraint::ConeConstraint()
: NConstraintInterface(NConstraintInterface::NC_GREATER_EQUAL) : NConstraintInterface(NConstraintInterface::NC_GREATER_EQUAL),
i_(1), c_(1.0)
{ {
Q_.clear(); Q_.clear();
i_ = 1.0;
c_ = 1.0;
} }
// 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
......
...@@ -62,8 +62,8 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain ...@@ -62,8 +62,8 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain
if(_constraints.empty()) return; if(_constraints.empty()) return;
// 1. copy (normalized) data into gmm dynamic sparse matrix // 1. copy (normalized) data into gmm dynamic sparse matrix
unsigned int n(_constraints[0]->n_unknowns()); size_t n(_constraints[0]->n_unknowns());
unsigned int m(_constraints.size()); size_t m(_constraints.size());
std::vector<double> x(n, 0.0); std::vector<double> x(n, 0.0);
NConstraintInterface::SVectorNC g; NConstraintInterface::SVectorNC g;
RMatrixGMM A; RMatrixGMM A;
...@@ -92,27 +92,28 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain ...@@ -92,27 +92,28 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain
// 3. initialize priorityqueue for sorting // 3. initialize priorityqueue for sorting
// init priority queue // init priority queue
MutablePriorityQueueT<unsigned int, unsigned int> queue; MutablePriorityQueueT<gmm::size_type, gmm::size_type> queue;
queue.clear(m); queue.clear(m);
for(unsigned int i=0; i<m; ++i) for (gmm::size_type i = 0; i<m; ++i)
{ {
int cur_nnz = gmm::nnz( gmm::mat_row(A,i)); gmm::size_type cur_nnz = gmm::nnz( gmm::mat_row(A,i));
if( A(i,n) != 0.0) --cur_nnz; if (A(i,n) != 0.0)
--cur_nnz;
queue.update(i, cur_nnz); queue.update(i, cur_nnz);
} }
// track row status -1=undecided, 0=remove, 1=keep // track row status -1=undecided, 0=remove, 1=keep
std::vector<int> row_status(m, -1); std::vector<int> row_status(m, -1);
std::vector<int> keep; std::vector<gmm::size_type> keep;
// std::vector<int> remove; // std::vector<int> remove;
// for all conditions // for all conditions
while(!queue.empty()) while(!queue.empty())
{ {
// get next row // get next row
unsigned int i = queue.get_next(); gmm::size_type i = queue.get_next();
unsigned int j = find_max_abs_coeff(A.row(i)); gmm::size_type j = find_max_abs_coeff(A.row(i));
double aij = A(i,j); double aij = A(i,j);
if(std::abs(aij) <= _eps) if(std::abs(aij) <= _eps)
{ {
...@@ -145,7 +146,7 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain ...@@ -145,7 +146,7 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain
if( row_status[c_it.index()] == -1) // only process unvisited rows if( row_status[c_it.index()] == -1) // only process unvisited rows
{ {
// row idx // row idx
int k = c_it.index(); gmm::size_type k = c_it.index();
double s = -(*c_it)/aij; double s = -(*c_it)/aij;
add_row_simultaneously( k, s, row, A, Ac, _eps); add_row_simultaneously( k, s, row, A, Ac, _eps);
...@@ -153,8 +154,9 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain ...@@ -153,8 +154,9 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain
A( k, j) = 0; A( k, j) = 0;
Ac(k, j) = 0; Ac(k, j) = 0;
int cur_nnz = gmm::nnz( gmm::mat_row(A,k)); gmm::size_type cur_nnz = gmm::nnz( gmm::mat_row(A,k));
if( A(k,n) != 0.0) --cur_nnz; if( A(k,n) != 0.0)
--cur_nnz;
queue.update(k, cur_nnz); queue.update(k, cur_nnz);
} }
...@@ -177,12 +179,12 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain ...@@ -177,12 +179,12 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
unsigned int gmm::size_type
ConstraintTools:: ConstraintTools::
find_max_abs_coeff(SVectorGMM& _v) find_max_abs_coeff(SVectorGMM& _v)
{ {
unsigned int n = _v.size(); size_t n = _v.size();
unsigned int imax(0); gmm::size_type imax(0);
double vmax(0.0); double vmax(0.0);
gmm::linalg_traits<SVectorGMM>::const_iterator c_it = gmm::vect_const_begin(_v); gmm::linalg_traits<SVectorGMM>::const_iterator c_it = gmm::vect_const_begin(_v);
...@@ -205,7 +207,7 @@ find_max_abs_coeff(SVectorGMM& _v) ...@@ -205,7 +207,7 @@ find_max_abs_coeff(SVectorGMM& _v)
void void
ConstraintTools:: ConstraintTools::
add_row_simultaneously( int _row_i, add_row_simultaneously( gmm::size_type _row_i,
double _coeff, double _coeff,
SVectorGMM& _row, SVectorGMM& _row,
RMatrixGMM& _rmat, RMatrixGMM& _rmat,
......
...@@ -58,13 +58,13 @@ public: ...@@ -58,13 +58,13 @@ public:
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);
// same as above but assumes already that all constraints are linear equality constraints // same as above but assumes already that all constraints are linear equality constraints
static void remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstraintInterface*>& _constraints, const double _eps = 1e-8); static void remove_dependent_linear_constraints_only_linear_equality(std::vector<NConstraintInterface*>& _constraints, const double _eps = 1e-8);
private: private:
static unsigned int find_max_abs_coeff(SVectorGMM& _v); static gmm::size_type find_max_abs_coeff(SVectorGMM& _v);
static void add_row_simultaneously( int _row_i, static void add_row_simultaneously( gmm::size_type _row_i,
double _coeff, double _coeff,
SVectorGMM& _row, SVectorGMM& _row,
RMatrixGMM& _rmat, RMatrixGMM& _rmat,
......
...@@ -72,7 +72,7 @@ void FiniteElementProblem::eval_hessian ( const double* _x, SMatrixNP& _H) ...@@ -72,7 +72,7 @@ void FiniteElementProblem::eval_hessian ( const double* _x, SMatrixNP& _H)
fe_sets_[i]->accumulate_hessian(_x, triplets_); fe_sets_[i]->accumulate_hessian(_x, triplets_);
// set data // set data
_H.resize(n_unknowns(), n_unknowns()); _H.resize(static_cast<int>(n_unknowns()), static_cast<int>(n_unknowns()));
_H.setFromTriplets(triplets_.begin(), triplets_.end()); _H.setFromTriplets(triplets_.begin(), triplets_.end());
} }
......
...@@ -187,8 +187,8 @@ public: ...@@ -187,8 +187,8 @@ public:
for(unsigned int j=0; j<triplets_.size(); ++j) for(unsigned int j=0; j<triplets_.size(); ++j)
{ {
// add re-indexed Triplet // add re-indexed Triplet
_triplets.push_back(Triplet( instances_.index(i,triplets_[j].row()), _triplets.push_back(Triplet( (int)instances_.index(i,triplets_[j].row()),
instances_.index(i,triplets_[j].col()), (int)instances_.index(i,triplets_[j].col()),
triplets_[j].value() )); triplets_[j].value() ));
} }
} }
......
...@@ -43,12 +43,12 @@ int LinearConstraint::n_unknowns() ...@@ -43,12 +43,12 @@ int LinearConstraint::n_unknowns()
return coeffs_.innerSize(); return coeffs_.innerSize();
} }
void LinearConstraint::resize(const unsigned int _n) void LinearConstraint::resize(const std::size_t _n)
{ {
if(coeffs_.innerSize() != (int)_n) if(coeffs_.innerSize() != static_cast<std::ptrdiff_t>(_n))
{ {
// resize while maintaining all values in range // resize while maintaining all values in range
SVectorNC coeffs_new(_n); SVectorNC coeffs_new(static_cast<int>(_n));
coeffs_new.setZero(); coeffs_new.setZero();
coeffs_new.reserve(coeffs_.nonZeros()); coeffs_new.reserve(coeffs_.nonZeros());
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
// resize coefficient vector = #unknowns // resize coefficient vector = #unknowns
// maintain all values in range // maintain all values in range
void resize(const unsigned int _n); void resize(const std::size_t _n);
// clear to zero constraint 0 =_type 0 // clear to zero constraint 0 =_type 0
void clear(); void clear();
......
...@@ -14,9 +14,13 @@ ...@@ -14,9 +14,13 @@
#include <CoMISo/Config/CoMISoDefines.hh> #include <CoMISo/Config/CoMISoDefines.hh>
#include "NConstraintInterface.hh" #include "NConstraintInterface.hh"
#include "LinearConstraint.hh" #include "LinearConstraint.hh"
#include <Base/Code/Quality.hh>
LOW_CODE_QUALITY_SECTION_BEGIN
#include <Eigen/StdVector> #include <Eigen/StdVector>
#include <Eigen/Dense> #include <Eigen/Dense>
#include <Eigen/Sparse> #include <Eigen/Sparse>
LOW_CODE_QUALITY_SECTION_END
//== FORWARDDECLARATIONS ====================================================== //== FORWARDDECLARATIONS ======================================================
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace COMISO { namespace COMISO {
LinearProblem::LinearProblem (unsigned int _dimension) LinearProblem::LinearProblem (std::size_t _dimension)
{ {
// resize and zero elements // resize and zero elements
coeffs_.resize(_dimension,0.0); coeffs_.resize(_dimension,0.0);
...@@ -19,9 +19,9 @@ LinearProblem::~LinearProblem() ...@@ -19,9 +19,9 @@ LinearProblem::~LinearProblem()
{ {
} }
int LinearProblem::n_unknowns() int LinearProblem::n_unknowns()
{ {
return coeffs_.size(); return static_cast<int>(coeffs_.size());
} }
void LinearProblem::initial_x(double* _x) void LinearProblem::initial_x(double* _x)
......
...@@ -43,7 +43,7 @@ class COMISODLLEXPORT LinearProblem : public NProblemInterface ...@@ -43,7 +43,7 @@ class COMISODLLEXPORT LinearProblem : public NProblemInterface
public: public:
/// Default constructor /// Default constructor
LinearProblem (unsigned int _dimension = 0); LinearProblem (std::size_t _dimension = 0);
/// Destructor /// Destructor
virtual ~LinearProblem(); virtual ~LinearProblem();
......
...@@ -18,8 +18,11 @@ ...@@ -18,8 +18,11 @@
#include "SuperSparseMatrixT.hh" #include "SuperSparseMatrixT.hh"
#include <Base/Code/Quality.hh>
LOW_CODE_QUALITY_SECTION_BEGIN
#define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET #define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET
#include <Eigen/Sparse> #include <Eigen/Sparse>
LOW_CODE_QUALITY_SECTION_END
//== FORWARDDECLARATIONS ====================================================== //== FORWARDDECLARATIONS ======================================================
......
...@@ -101,10 +101,10 @@ bool NProblemIPOPT::get_nlp_info(Index& n, Index& m, Index& nnz_jac_g, ...@@ -101,10 +101,10 @@ bool NProblemIPOPT::get_nlp_info(Index& n, Index& m, Index& nnz_jac_g,
Index& nnz_h_lag, IndexStyleEnum& index_style) Index& nnz_h_lag, IndexStyleEnum& index_style)
{ {
// number of variables // number of variables
n = problem_->n_unknowns(); n = static_cast<Index>(problem_->n_unknowns());
// number of constraints // number of constraints
m = constraints_.size(); m = static_cast<Index>(constraints_.size());
// get non-zeros of hessian of lagrangian and jacobi of constraints // get non-zeros of hessian of lagrangian and jacobi of constraints
nnz_jac_g = 0; nnz_jac_g = 0;
...@@ -546,7 +546,7 @@ bool NProblemGmmIPOPT::get_nlp_info(Index& n, Index& m, Index& nnz_jac_g, ...@@ -546,7 +546,7 @@ bool NProblemGmmIPOPT::get_nlp_info(Index& n, Index& m, Index& nnz_jac_g,
n = problem_->n_unknowns(); n = problem_->n_unknowns();
// number of constraints // number of constraints
m = constraints_.size(); m = static_cast<Index>(constraints_.size());
// get nonzero structure // get nonzero structure
std::vector<double> x(n); std::vector<double> x(n);
...@@ -582,7 +582,7 @@ bool NProblemGmmIPOPT::get_nlp_info(Index& n, Index& m, Index& nnz_jac_g, ...@@ -582,7 +582,7 @@ bool NProblemGmmIPOPT::get_nlp_info(Index& n, Index& m, Index& nnz_jac_g,
if( i >= (int)v_it.index()) if( i >= (int)v_it.index())
{ {
h_lag_iRow_.push_back(i); h_lag_iRow_.push_back(i);
h_lag_jCol_.push_back(v_it.index()); h_lag_jCol_.push_back(static_cast<int>(v_it.index()));
++nnz_h_lag; ++nnz_h_lag;
} }
} }
......
...@@ -15,14 +15,17 @@ ...@@ -15,14 +15,17 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <Base/Code/Quality.hh>
#include <iostream> #include <iostream>
#include <cfloat> #include <cfloat>
LOW_CODE_QUALITY_SECTION_BEGIN
#include <Eigen/Eigen> #include <Eigen/Eigen>
#if !(EIGEN_VERSION_AT_LEAST(3,1,0)) #if !(EIGEN_VERSION_AT_LEAST(3,1,0))
#define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET #define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET
#endif #endif
#include <Eigen/Sparse> #include <Eigen/Sparse>
LOW_CODE_QUALITY_SECTION_END
#include <CoMISo/Config/CoMISoDefines.hh> #include <CoMISo/Config/CoMISoDefines.hh>
......
...@@ -122,9 +122,9 @@ int NewtonSolver::solve(NProblemInterface* _problem, const SMatrixD& _A, ...@@ -122,9 +122,9 @@ int NewtonSolver::solve(NProblemInterface* _problem, const SMatrixD& _A,
DEB_time_func_def; DEB_time_func_def;
// number of unknowns // number of unknowns
const int n = _problem->n_unknowns(); size_t n = _problem->n_unknowns();
// number of constraints // number of constraints
const int m = _b.size(); size_t m = _b.size();
DEB_line(2, "optimize via Newton with " << n << " unknowns and " << m << DEB_line(2, "optimize via Newton with " << n << " unknowns and " << m <<
" linear constraints"); " linear constraints");
...@@ -311,7 +311,7 @@ double NewtonSolver::backtracking_line_search(NProblemInterface* _problem, ...@@ -311,7 +311,7 @@ double NewtonSolver::backtracking_line_search(NProblemInterface* _problem,
double& _fx, const double _t_start) double& _fx, const double _t_start)
{ {
DEB_enter_func; DEB_enter_func;
int n = _x.size(); size_t n = _x.size();
// pre-compute objective // pre-compute objective
double fx = _problem->eval_f(_x.data()); double fx = _problem->eval_f(_x.data());
......
...@@ -5,9 +5,12 @@ ...@@ -5,9 +5,12 @@
#include <CoMISo/Utils/StopWatch.hh> #include <CoMISo/Utils/StopWatch.hh>
#include <vector> #include <vector>
#include <CoMISo/NSolver/NProblemInterface.hh> #include <CoMISo/NSolver/NProblemInterface.hh>
#include <Base/Code/Quality.hh>
LOW_CODE_QUALITY_SECTION_BEGIN
#include <Eigen/Eigen> #include <Eigen/Eigen>
#include <Eigen/Core> #include <Eigen/Core>
#include <Eigen/Sparse> #include <Eigen/Sparse>
LOW_CODE_QUALITY_SECTION_END
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
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