Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CoMISo
CoMISo
Commits
3676ccf9
Commit
3676ccf9
authored
May 05, 2020
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Revert "Merge branch 'gmm5.4-compat' into 'master'""
This reverts commit
73cd204b
.
parent
1c909602
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Solver/Eigen_ToolsT.cc
Solver/Eigen_ToolsT.cc
+2
-2
No files found.
Solver/Eigen_ToolsT.cc
View file @
3676ccf9
...
...
@@ -751,11 +751,11 @@ void f(const gmm::row_matrix<GMM_VectorT>& _G, EIGEN_MatrixT& _E)
// convert a gmm col-sparse matrix into an eigen sparse matrix
template
<
class
GMM_RealT
,
class
EIGEN_MatrixT
>
void
f
(
const
gmm
::
csc_matrix
<
GMM_RealT
,
0
>&
_G
,
EIGEN_MatrixT
&
_E
)
void
f
(
const
gmm
::
csc_matrix
<
GMM_RealT
>&
_G
,
EIGEN_MatrixT
&
_E
)
{
typedef
typename
EIGEN_MatrixT
::
Scalar
Scalar
;
typedef
typename
gmm
::
csc_matrix
<
GMM_RealT
,
0
>
GMM_MatrixT
;
typedef
typename
gmm
::
csc_matrix
<
GMM_RealT
>
GMM_MatrixT
;
typedef
typename
gmm
::
linalg_traits
<
GMM_MatrixT
>::
const_sub_col_type
ColT
;
typedef
typename
gmm
::
linalg_traits
<
ColT
>::
const_iterator
CIter
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment