Commit c4febf53 authored by Marco Amagliani's avatar Marco Amagliani
Browse files

instanitation of COMiso matrix solver for other types of matrix. The new...

instanitation of COMiso matrix solver for other types of matrix. The new instantiation should improve performances.

[git-p4: depot-paths = "//ReForm/ReForm/main/CoMISo/": change = 12284]
parent 11199c26
......@@ -20,6 +20,7 @@ namespace COMISO_GMM
typedef gmm::col_matrix< gmm::wsvector<double> > WSColMatrix;
typedef gmm::row_matrix< gmm::wsvector<double> > WSRowMatrix;
typedef gmm::col_matrix< gmm::rsvector<double> > RSColMatrix;
typedef gmm::row_matrix< gmm::rsvector<double> > RSRowMatrix;
typedef gmm::csc_matrix<double> CSCMatrix;
}//namespace COMISO_GMM
......
......@@ -131,7 +131,13 @@ template void ConstrainedSolver::solve_const(const WSRowMatrix&,
const WSColMatrix&, DoubleVector&, const DoubleVector&, const IntVector&,
double, bool, bool);
template void COMISO::ConstrainedSolver::resolve(const WSRowMatrix&,
DoubleVector&, DoubleVector*, bool);
template void COMISO::ConstrainedSolver::solve_const(const WSRowMatrix&,
const WSRowMatrix&, DoubleVector&, const IntVector&, double, bool, bool);
template void COMISO::ConstrainedSolver::solve_const(const RSRowMatrix&,
const RSRowMatrix&, DoubleVector&, const IntVector&, double, bool, bool);
}//namespace COMISO_GMM
......@@ -1271,6 +1271,7 @@ using namespace COMISO_STD;
template void factored_to_quadratic(WSRowMatrix&, WSColMatrix&, DoubleVector&);
template void factored_to_quadratic(WSRowMatrix&, RSColMatrix&, DoubleVector&);
template void factored_to_quadratic(RSRowMatrix&, RSColMatrix&, DoubleVector&);
template void eliminate_csc_vars(const IntVector&, const DoubleVector&,
CSCMatrix&, DoubleVector&, DoubleVector&);
......
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