Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
0b944888
Commit
0b944888
authored
Apr 24, 2014
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update LinearSolving algo to lambdas
parent
7a132517
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
221 additions
and
697 deletions
+221
-697
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+1
-1
include/Algo/LinearSolving/basic.h
include/Algo/LinearSolving/basic.h
+220
-61
include/Algo/LinearSolving/matrixSetup.h
include/Algo/LinearSolving/matrixSetup.h
+0
-477
include/Algo/LinearSolving/variablesSetup.h
include/Algo/LinearSolving/variablesSetup.h
+0
-158
No files found.
SCHNApps/CMakeLists.txt
View file @
0b944888
...
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
...
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project
(
SCHNApps
)
project
(
SCHNApps
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -fPIC"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -fPIC
-std=c++11
"
)
SET
(
CGoGN_ROOT_DIR
${
CMAKE_SOURCE_DIR
}
/.. CACHE STRING
"CGoGN root dir"
)
SET
(
CGoGN_ROOT_DIR
${
CMAKE_SOURCE_DIR
}
/.. CACHE STRING
"CGoGN root dir"
)
...
...
include/Algo/LinearSolving/basic.h
View file @
0b944888
...
@@ -26,9 +26,7 @@
...
@@ -26,9 +26,7 @@
#define __LINEAR_SOLVING_BASIC__
#define __LINEAR_SOLVING_BASIC__
#include "NL/nl.h"
#include "NL/nl.h"
#include "Algo/LinearSolving/variablesSetup.h"
#include "Topology/generic/traversor/traversorCell.h"
#include "Algo/LinearSolving/matrixSetup.h"
#include "Algo/Topo/basic.h"
namespace
CGoGN
namespace
CGoGN
{
{
...
@@ -36,6 +34,15 @@ namespace CGoGN
...
@@ -36,6 +34,15 @@ namespace CGoGN
namespace
LinearSolving
namespace
LinearSolving
{
{
template
<
typename
CoeffType
>
struct
Coeff
{
unsigned
int
index
;
CoeffType
value
;
Coeff
(
unsigned
int
i
,
CoeffType
v
)
:
index
(
i
),
value
(
v
)
{}
}
;
/*******************************************************************************
/*******************************************************************************
* VARIABLES SETUP
* VARIABLES SETUP
*******************************************************************************/
*******************************************************************************/
...
@@ -44,29 +51,31 @@ template <typename PFP, typename ATTR_TYPE>
...
@@ -44,29 +51,31 @@ template <typename PFP, typename ATTR_TYPE>
void
setupVariables
(
void
setupVariables
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>&
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>&
index
,
const
CellMarker
<
typename
PFP
::
MAP
,
VERTEX
>&
f
m
,
const
CellMarker
<
typename
PFP
::
MAP
,
VERTEX
>&
f
reeMarker
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
{
{
// TraversorV<MAP> t(m);
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
// for (Dart d = t.begin(); d != t.end(); d = t.next())
{
// {
nlSetVariable
(
index
[
d
],
attr
[
d
]);
if
(
!
freeMarker
.
isMarked
(
d
))
// }
nlLockVariable
(
index
[
d
]);
});
FunctorMeshToSolver_Scalar
<
PFP
,
ATTR_TYPE
>
fmts
(
index
,
fm
,
attr
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
fmts
)
;
}
}
template
<
typename
PFP
,
typename
ATTR_TYPE
>
template
<
typename
PFP
,
typename
ATTR_TYPE
>
void
setupVariables
(
void
setupVariables
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>&
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>&
index
,
const
CellMarker
<
typename
PFP
::
MAP
,
VERTEX
>&
f
m
,
const
CellMarker
<
typename
PFP
::
MAP
,
VERTEX
>&
f
reeMarker
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
unsigned
int
coord
)
unsigned
int
coord
)
{
{
FunctorMeshToSolver_Vector
<
PFP
,
ATTR_TYPE
>
fmts
(
index
,
fm
,
attr
,
coord
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
fmts
)
;
{
nlSetVariable
(
index
[
d
],
(
attr
[
d
])[
coord
]);
if
(
!
freeMarker
.
isMarked
(
d
))
nlLockVariable
(
index
[
d
]);
});
}
}
/*******************************************************************************
/*******************************************************************************
...
@@ -81,8 +90,16 @@ void addRowsRHS_Equality(
...
@@ -81,8 +90,16 @@ void addRowsRHS_Equality(
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
weight
)
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
weight
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorEquality_PerVertexWeight_Scalar
<
PFP
,
ATTR_TYPE
>
feq
(
index
,
attr
,
weight
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
feq
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
attr
[
d
])
;
nlRowParameterd
(
NL_ROW_SCALING
,
weight
[
d
])
;
nlBegin
(
NL_ROW
)
;
nlCoefficient
(
index
[
d
],
1
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
...
@@ -94,8 +111,16 @@ void addRowsRHS_Equality(
...
@@ -94,8 +111,16 @@ void addRowsRHS_Equality(
float
weight
)
float
weight
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorEquality_UniformWeight_Scalar
<
PFP
,
ATTR_TYPE
>
feq
(
index
,
attr
,
weight
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
feq
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
attr
[
d
])
;
nlRowParameterd
(
NL_ROW_SCALING
,
weight
)
;
nlBegin
(
NL_ROW
)
;
nlCoefficient
(
index
[
d
],
1
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
...
@@ -108,8 +133,16 @@ void addRowsRHS_Equality(
...
@@ -108,8 +133,16 @@ void addRowsRHS_Equality(
unsigned
int
coord
)
unsigned
int
coord
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorEquality_PerVertexWeight_Vector
<
PFP
,
ATTR_TYPE
>
feq
(
index
,
attr
,
weight
,
coord
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
feq
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
(
attr
[
d
])[
coord
])
;
nlRowParameterd
(
NL_ROW_SCALING
,
weight
[
d
])
;
nlBegin
(
NL_ROW
)
;
nlCoefficient
(
index
[
d
],
1
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
...
@@ -122,8 +155,16 @@ void addRowsRHS_Equality(
...
@@ -122,8 +155,16 @@ void addRowsRHS_Equality(
unsigned
int
coord
)
unsigned
int
coord
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorEquality_UniformWeight_Vector
<
PFP
,
ATTR_TYPE
>
feq
(
index
,
attr
,
weight
,
coord
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
feq
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
(
attr
[
d
])[
coord
])
;
nlRowParameterd
(
NL_ROW_SCALING
,
weight
)
;
nlBegin
(
NL_ROW
)
;
nlCoefficient
(
index
[
d
],
1
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
...
@@ -134,36 +175,99 @@ void addRowsRHS_Equality(
...
@@ -134,36 +175,99 @@ void addRowsRHS_Equality(
template
<
typename
PFP
>
template
<
typename
PFP
>
void
addRows_Laplacian_Topo
(
void
addRows_Laplacian_Topo
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
)
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorLaplacianTopo
<
PFP
>
flt
(
m
,
index
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
flt
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
0
)
;
nlBegin
(
NL_ROW
);
typename
PFP
::
REAL
aii
=
0
;
Traversor2VE
<
typename
PFP
::
MAP
>
t
(
m
,
d
)
;
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
{
typename
PFP
::
REAL
aij
=
1
;
aii
+=
aij
;
nlCoefficient
(
index
[
m
.
phi1
(
it
)],
aij
)
;
}
nlCoefficient
(
index
[
d
],
-
aii
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
template
<
typename
PFP
,
typename
ATTR_TYPE
>
template
<
typename
PFP
,
typename
ATTR_TYPE
>
void
addRowsRHS_Laplacian_Topo
(
void
addRowsRHS_Laplacian_Topo
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorLaplacianTopoRHS_Scalar
<
PFP
,
ATTR_TYPE
>
flt
(
m
,
index
,
attr
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
flt
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
std
::
vector
<
Coeff
<
typename
PFP
::
REAL
>
>
coeffs
;
coeffs
.
reserve
(
12
)
;
typename
PFP
::
REAL
norm2
=
0
;
typename
PFP
::
REAL
aii
=
0
;
Traversor2VE
<
typename
PFP
::
MAP
>
t
(
m
,
d
)
;
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
{
typename
PFP
::
REAL
aij
=
1
;
aii
+=
aij
;
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
m
.
phi1
(
it
)],
aij
))
;
norm2
+=
aij
*
aij
;
}
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
d
],
-
aii
))
;
norm2
+=
aii
*
aii
;
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
attr
[
d
]
*
sqrt
(
norm2
))
;
nlBegin
(
NL_ROW
);
for
(
unsigned
int
i
=
0
;
i
<
coeffs
.
size
();
++
i
)
nlCoefficient
(
coeffs
[
i
].
index
,
coeffs
[
i
].
value
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
template
<
typename
PFP
,
typename
ATTR_TYPE
>
template
<
typename
PFP
,
typename
ATTR_TYPE
>
void
addRowsRHS_Laplacian_Topo
(
void
addRowsRHS_Laplacian_Topo
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
unsigned
int
coord
)
unsigned
int
coord
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorLaplacianTopoRHS_Vector
<
PFP
,
ATTR_TYPE
>
flt
(
m
,
index
,
attr
,
coord
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
flt
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
std
::
vector
<
Coeff
<
typename
PFP
::
REAL
>
>
coeffs
;
coeffs
.
reserve
(
12
)
;
typename
PFP
::
REAL
norm2
=
0
;
typename
PFP
::
REAL
aii
=
0
;
Traversor2VE
<
typename
PFP
::
MAP
>
t
(
m
,
d
)
;
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
{
typename
PFP
::
REAL
aij
=
1
;
aii
+=
aij
;
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
m
.
phi1
(
it
)],
aij
))
;
norm2
+=
aij
*
aij
;
}
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
d
],
-
aii
))
;
norm2
+=
aii
*
aii
;
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
(
attr
[
d
])[
coord
]
*
sqrt
(
norm2
))
;
nlBegin
(
NL_ROW
);
for
(
unsigned
int
i
=
0
;
i
<
coeffs
.
size
();
++
i
)
nlCoefficient
(
coeffs
[
i
].
index
,
coeffs
[
i
].
value
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
...
@@ -174,57 +278,108 @@ void addRowsRHS_Laplacian_Topo(
...
@@ -174,57 +278,108 @@ void addRowsRHS_Laplacian_Topo(
template
<
typename
PFP
>
template
<
typename
PFP
>
void
addRows_Laplacian_Cotan
(
void
addRows_Laplacian_Cotan
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
,
const
EdgeAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
edgeWeight
,
const
EdgeAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
edgeWeight
,
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
vertexArea
)
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
vertexArea
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorLaplacianCotan
<
PFP
>
flc
(
m
,
index
,
edgeWeight
,
vertexArea
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
flc
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
0
)
;
nlBegin
(
NL_ROW
);
typename
PFP
::
REAL
vArea
=
vertexArea
[
d
]
;
typename
PFP
::
REAL
aii
=
0
;
Traversor2VE
<
typename
PFP
::
MAP
>
t
(
m
,
d
)
;
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
{
typename
PFP
::
REAL
aij
=
edgeWeight
[
it
]
/
vArea
;
aii
+=
aij
;
nlCoefficient
(
index
[
m
.
phi1
(
it
)],
aij
)
;
}
nlCoefficient
(
index
[
d
],
-
aii
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
template
<
typename
PFP
,
typename
ATTR_TYPE
>
template
<
typename
PFP
,
typename
ATTR_TYPE
>
void
addRowsRHS_Laplacian_Cotan
(
void
addRowsRHS_Laplacian_Cotan
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
,
const
EdgeAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
edgeWeight
,
const
EdgeAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
edgeWeight
,
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
vertexArea
,
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
vertexArea
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorLaplacianCotanRHS_Scalar
<
PFP
,
ATTR_TYPE
>
flc
(
m
,
index
,
edgeWeight
,
vertexArea
,
attr
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
flc
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
{
std
::
vector
<
Coeff
<
typename
PFP
::
REAL
>
>
coeffs
;
coeffs
.
reserve
(
12
)
;
typename
PFP
::
REAL
vArea
=
vertexArea
[
d
]
;
typename
PFP
::
REAL
norm2
=
0
;
typename
PFP
::
REAL
aii
=
0
;
Traversor2VE
<
typename
PFP
::
MAP
>
t
(
m
,
d
)
;
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
{
typename
PFP
::
REAL
aij
=
edgeWeight
[
it
]
/
vArea
;
aii
+=
aij
;
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
m
.
phi1
(
it
)],
aij
))
;
norm2
+=
aij
*
aij
;
}
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
d
],
-
aii
))
;
norm2
+=
aii
*
aii
;
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
attr
[
d
]
*
sqrt
(
norm2
))
;
nlBegin
(
NL_ROW
);
for
(
unsigned
int
i
=
0
;
i
<
coeffs
.
size
();
++
i
)
nlCoefficient
(
coeffs
[
i
].
index
,
coeffs
[
i
].
value
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
template
<
typename
PFP
,
typename
ATTR_TYPE
>
template
<
typename
PFP
,
typename
ATTR_TYPE
>
void
addRowsRHS_Laplacian_Cotan
(
void
addRowsRHS_Laplacian_Cotan
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
,
const
EdgeAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
edgeWeight
,
const
EdgeAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
edgeWeight
,
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
vertexArea
,
const
VertexAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
vertexArea
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
unsigned
int
coord
)
unsigned
int
coord
)
{
{
nlEnable
(
NL_NORMALIZE_ROWS
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
FunctorLaplacianCotanRHS_Vector
<
PFP
,
ATTR_TYPE
>
flc
(
m
,
index
,
edgeWeight
,
vertexArea
,
attr
,
coord
)
;
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
flc
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
template
<
typename
PFP
,
typename
ATTR_TYPE
>
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
void
addRowsRHS_Laplacian_Cotan_NL
(
{
typename
PFP
::
MAP
&
m
,
std
::
vector
<
Coeff
<
typename
PFP
::
REAL
>
>
coeffs
;
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
coeffs
.
reserve
(
12
)
;
const
EdgeAttribute
<
typename
PFP
::
REAL
,
typename
PFP
::
MAP
::
IMPL
>&
edgeWeight
,
const
VertexAttribute
<
typename
PFP
::
REA
,
typename
PFP
::
MAP
::
IMPLL
>&
vertexArea
,
typename
PFP
::
REAL
vArea
=
vertexArea
[
d
]
;
const
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
typename
PFP
::
REAL
norm2
=
0
;
unsigned
int
coord
)
typename
PFP
::
REAL
aii
=
0
;
{
Traversor2VE
<
typename
PFP
::
MAP
>
t
(
m
,
d
)
;
nlEnable
(
NL_NORMALIZE_ROWS
)
;
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
FunctorLaplacianCotanRHS_Vector
<
PFP
,
ATTR_TYPE
>
flc
(
m
,
index
,
edgeWeight
,
vertexArea
,
attr
,
coord
)
;
{
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
flc
)
;
typename
PFP
::
REAL
aij
=
edgeWeight
[
it
]
/
vArea
;
aii
+=
aij
;
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
m
.
phi1
(
it
)],
aij
))
;
norm2
+=
aij
*
aij
;
}
coeffs
.
push_back
(
Coeff
<
typename
PFP
::
REAL
>
(
index
[
d
],
-
aii
))
;
norm2
+=
aii
*
aii
;
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
(
attr
[
d
])[
coord
]
*
sqrt
(
norm2
))
;
nlBegin
(
NL_ROW
);
for
(
unsigned
int
i
=
0
;
i
<
coeffs
.
size
();
++
i
)
nlCoefficient
(
coeffs
[
i
].
index
,
coeffs
[
i
].
value
)
;
nlEnd
(
NL_ROW
)
;
});
nlDisable
(
NL_NORMALIZE_ROWS
)
;
nlDisable
(
NL_NORMALIZE_ROWS
)
;
}
}
...
@@ -235,22 +390,26 @@ void addRowsRHS_Laplacian_Cotan_NL(
...
@@ -235,22 +390,26 @@ void addRowsRHS_Laplacian_Cotan_NL(
template
<
typename
PFP
,
typename
ATTR_TYPE
>
template
<
typename
PFP
,
typename
ATTR_TYPE
>
void
getResult
(
void
getResult
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
,
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
)
{
{
FunctorSolverToMesh_Scalar
<
PFP
,
ATTR_TYPE
>
fstm
(
index
,
attr
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
fstm
)
;
{
attr
[
d
]
=
nlGetVariable
(
index
[
d
])
;
});
}
}
template
<
typename
PFP
,
typename
ATTR_TYPE
>
template
<
typename
PFP
,
typename
ATTR_TYPE
>
void
getResult
(
void
getResult
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
MAP
&
m
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
index
,
const
VertexAttribute
<
unsigned
int
,
typename
PFP
::
MAP
::
IMPL
>
&
index
,
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
VertexAttribute
<
ATTR_TYPE
,
typename
PFP
::
MAP
::
IMPL
>&
attr
,
unsigned
int
coord
)
unsigned
int
coord
)
{
{
FunctorSolverToMesh_Vector
<
PFP
,
ATTR_TYPE
>
fstm
(
index
,
attr
,
coord
)
;
foreach_cell
<
VERTEX
>
(
m
,
[
&
]
(
Dart
d
)
Algo
::
Topo
::
foreach_orbit
<
VERTEX
>
(
m
,
fstm
)
;
{
(
attr
[
d
])[
coord
]
=
nlGetVariable
(
index
[
d
])
;
});
}
}
}
// namespace LinearSolving
}
// namespace LinearSolving
...
...
include/Algo/LinearSolving/matrixSetup.h
deleted
100644 → 0
View file @
7a132517
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library is distributed in the hope that it will be useful, but WITHOUT *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.unistra.fr/ *
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#ifndef __LINEAR_SOLVING_MATRIX_SETUP__
#define __LINEAR_SOLVING_MATRIX_SETUP__
namespace
CGoGN
{
namespace
LinearSolving
{
template
<
typename
CoeffType
>
struct
Coeff
{
unsigned
int
index
;
CoeffType
value
;
Coeff
(
unsigned
int
i
,
CoeffType
v
)
:
index
(
i
),
value
(
v
)
{}
}
;
/*******************************************************************************
* EQUALITY MATRIX : right-hand-side SCALAR
*******************************************************************************/
template
<
typename
PFP
,
typename
ATTR_TYPE
>
class
FunctorEquality_PerVertexWeight_Scalar
:
public
FunctorType
{
typedef
typename
PFP
::
MAP
::
IMPL
MAP_IMPL
;
protected:
const
VertexAttribute
<
unsigned
int
,
MAP_IMPL
>&
indexTable
;
const
VertexAttribute
<
ATTR_TYPE
,
MAP_IMPL
>&
attrTable
;
const
VertexAttribute
<
typename
PFP
::
REAL
,
MAP_IMPL
>&
weightTable
;
public:
FunctorEquality_PerVertexWeight_Scalar
(
const
VertexAttribute
<
unsigned
int
,
MAP_IMPL
>&
index
,
const
VertexAttribute
<
ATTR_TYPE
,
MAP_IMPL
>&
attr
,
const
VertexAttribute
<
typename
PFP
::
REAL
,
MAP_IMPL
>&
weight
)
:
indexTable
(
index
),
attrTable
(
attr
),
weightTable
(
weight
)
{}
bool
operator
()(
Dart
d
)
{
nlRowParameterd
(
NL_RIGHT_HAND_SIDE
,
attrTable
[
d
])
;
nlRowParameterd
(
NL_ROW_SCALING
,
weightTable
[
d
])
;
nlBegin
(
NL_ROW
)
;
nlCoefficient
(
indexTable
[
d
],
1
)
;
nlEnd
(
NL_ROW
)
;
return
false
;
}
}
;
template
<
typename
PFP
,
typename
ATTR_TYPE
>
class
FunctorEquality_UniformWeight_Scalar
:
public
FunctorType
{
typedef
typename
PFP
::
MAP
::
IMPL
MAP_IMPL
;
protected:
const
VertexAttribute
<
unsigned
int
,
MAP_IMPL
>&
indexTable
;
const
VertexAttribute
<
ATTR_TYPE
,
MAP_IMPL
>&
attrTable
;
float
weight
;
public:
FunctorEquality_UniformWeight_Scalar
(
const
VertexAttribute
<
unsigned
int
,
MAP_IMPL
>&
index
,
const
VertexAttribute
<
ATTR_TYPE
,
MAP_IMPL
>&
attr
,
float
w
)
:
indexTable
(
index
),
attrTable
(
attr
),
weight
(
w
)
{}
bool
operator
()(
Dart
d
)