Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ add_library(CoMISo STATIC
target_include_directories(CoMISo PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/.."
"${CMAKE_CURRENT_SOURCE_DIR}/../eigen"
"${CMAKE_CURRENT_SOURCE_DIR}/ext/gmm-4.2/include")
"${CMAKE_CURRENT_SOURCE_DIR}/ext/gmm-5.3/include")
target_compile_definitions(CoMISo PUBLIC -DINCLUDE_TEMPLATES)

# Generate position independent code
Expand Down
27 changes: 13 additions & 14 deletions Solver/ConstrainedSolver.hh
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public:

template<class RMatrixT, class VectorIT >
void make_constraints_independent_reordering(
RMatrixT& _constraints,
RMatrixT& _constraints,
VectorIT& _idx_to_round,
std::vector<int>& _c_elim );

Expand Down Expand Up @@ -231,14 +231,14 @@ public:

template<class SVector1T, class SVector2T, class VectorIT, class CSCMatrixT>
void eliminate_constraints(
gmm::row_matrix<SVector1T>& _constraints,
gmm::col_matrix<SVector2T>& _A,
std::vector<double>& _x,
std::vector<double>& _rhs,
VectorIT& _idx_to_round,
std::vector<int>& _c_elim,
std::vector<int>& _new_idx,
CSCMatrixT& _Acsc);
gmm::row_matrix<SVector1T>& _constraints,
gmm::col_matrix<SVector2T>& _A,
std::vector<double>& _x,
std::vector<double>& _rhs,
VectorIT& _idx_to_round,
std::vector<int>& _c_elim,
std::vector<int>& _new_idx,
CSCMatrixT& _Acsc);

/// Restore a solution vector to the un-eliminated size
/**
Expand Down Expand Up @@ -371,8 +371,7 @@ private:

void append(int _i, double _f, int _j, bool _flag)
{
// std::cerr << "append " << _i << ", " << _j << ", " << _f << ", " << int(_flag) << std::endl;
table_.push_back(rhsUpdateTableEntry(_i, _j, _f, _flag));
table_.emplace_back(_i, _j, _f, _flag);
}
void add_elim_id(int _i) { elim_var_ids_.push_back(_i); }
void clear() { table_.clear(); elim_var_ids_.clear(); }
Expand Down Expand Up @@ -401,9 +400,9 @@ private:
std::sort( evar.begin(), evar.end() );
evar.push_back( std::numeric_limits<int>::max() );

int cur_evar_idx=0;
unsigned int nc = _rhs.size();
for( unsigned int i=0; i<nc; ++i )
int cur_evar_idx = 0;
size_t nc = _rhs.size();
for( unsigned int i = 0; i < nc; ++i )
{
unsigned int next_i = evar[cur_evar_idx];

Expand Down
1 change: 0 additions & 1 deletion ext/gmm-4.2/README

This file was deleted.

Loading