Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
amdis-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
amdis
amdis-core
Commits
94272400
Commit
94272400
authored
6 years ago
by
Praetorius, Simon
Browse files
Options
Downloads
Patches
Plain Diff
test for field matrix/vector with scalar factor added
parent
d4e95d6a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/amdis/common/FieldMatVec.hpp
+41
-34
41 additions, 34 deletions
src/amdis/common/FieldMatVec.hpp
src/amdis/common/FieldMatVec.inc.hpp
+38
-61
38 additions, 61 deletions
src/amdis/common/FieldMatVec.inc.hpp
test/FieldMatVecTest.cpp
+76
-0
76 additions, 0 deletions
test/FieldMatVecTest.cpp
with
155 additions
and
95 deletions
src/amdis/common/FieldMatVec.hpp
+
41
−
34
View file @
94272400
...
...
@@ -6,6 +6,21 @@
#include
<dune/common/fmatrix.hh>
#include
<dune/common/fvector.hh>
namespace
std
{
template
<
class
T
,
int
N
>
struct
common_type
<
Dune
::
FieldVector
<
T
,
N
>
,
T
>
{
using
type
=
T
;
};
template
<
class
T
,
int
N
,
int
M
>
struct
common_type
<
Dune
::
FieldMatrix
<
T
,
N
,
M
>
,
T
>
{
using
type
=
T
;
};
}
namespace
Dune
{
// some arithmetic operations with FieldVector
...
...
@@ -14,25 +29,19 @@ namespace Dune
FieldVector
<
T
,
N
>
operator
-
(
FieldVector
<
T
,
N
>
v
);
template
<
class
T
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
=
0
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>
=
0
>
FieldVector
<
T
,
N
>
operator
*
(
FieldVector
<
T
,
N
>
v
,
S
factor
);
template
<
class
S
,
class
T
,
int
N
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
=
0
>
template
<
class
T
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>
=
0
>
FieldVector
<
T
,
N
>
operator
*
(
S
factor
,
FieldVector
<
T
,
N
>
v
);
template
<
class
T
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
=
0
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>
=
0
>
FieldVector
<
T
,
N
>
operator
/
(
FieldVector
<
T
,
N
>
v
,
S
factor
);
template
<
class
T
>
FieldVector
<
T
,
1
>
operator
*
(
FieldVector
<
T
,
1
>
const
&
v
,
FieldVector
<
T
,
1
>
const
&
w
);
template
<
class
T
,
int
N
>
FieldVector
<
T
,
N
>
operator
*
(
FieldVector
<
T
,
1
>
const
&
factor
,
FieldVector
<
T
,
N
>
v
);
template
<
class
T
,
int
N
>
FieldVector
<
T
,
N
>
operator
*
(
FieldVector
<
T
,
N
>
v
,
FieldVector
<
T
,
1
>
const
&
factor
);
FieldVector
<
T
,
1
>
operator
*
(
FieldVector
<
T
,
1
>
v
,
FieldVector
<
T
,
1
>
w
);
// ----------------------------------------------------------------------------
...
...
@@ -48,9 +57,9 @@ namespace Dune
template
<
class
T
,
class
S
,
int
N
>
auto
dot
(
FieldVector
<
T
,
N
>
const
&
vec1
,
FieldVector
<
S
,
N
>
const
&
vec2
);
template
<
class
T
,
int
N
,
int
M
,
std
::
enable_if_t
<
(
N
!=
1
&&
M
!=
1
),
int
>
=
0
>
auto
operator
*
(
FieldVector
<
T
,
N
>
const
&
v
,
FieldVector
<
T
,
M
>
const
&
w
);
//
template <class T, int N, int M,
//
std::enable_if_t<( N!=1 && M!=1 ),int> = 0>
//
auto operator*(FieldVector<T,N> const& v, FieldVector<T,M> const& w);
template
<
class
T
,
class
S
,
int
N
>
auto
dot
(
FieldMatrix
<
T
,
1
,
N
>
const
&
vec1
,
FieldMatrix
<
S
,
1
,
N
>
const
&
vec2
);
...
...
@@ -197,34 +206,19 @@ namespace Dune
template
<
class
T
,
int
M
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
=
0
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>
=
0
>
FieldMatrix
<
T
,
M
,
N
>
operator
*
(
S
scalar
,
FieldMatrix
<
T
,
M
,
N
>
A
);
template
<
class
T
,
int
M
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
=
0
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>
=
0
>
FieldMatrix
<
T
,
M
,
N
>
operator
*
(
FieldMatrix
<
T
,
M
,
N
>
A
,
S
scalar
);
template
<
class
T
,
int
M
,
int
N
>
FieldMatrix
<
T
,
M
,
N
>
operator
*
(
FieldMatrix
<
T
,
1
,
1
>
scalar
,
FieldMatrix
<
T
,
M
,
N
>
A
);
template
<
class
T
,
int
M
,
int
N
>
FieldMatrix
<
T
,
M
,
N
>
operator
*
(
FieldMatrix
<
T
,
M
,
N
>
A
,
FieldMatrix
<
T
,
1
,
1
>
scalar
);
template
<
class
T
,
int
N
,
int
M
>
FieldMatrix
<
T
,
N
,
M
>
operator
*
(
FieldVector
<
T
,
1
>
scalar
,
FieldMatrix
<
T
,
N
,
M
>
mat
);
template
<
class
T
,
int
N
>
FieldMatrix
<
T
,
N
,
1
>
operator
*
(
FieldVector
<
T
,
1
>
scalar
,
FieldMatrix
<
T
,
N
,
1
>
mat
);
template
<
class
T
,
int
N
,
int
M
>
FieldMatrix
<
T
,
N
,
M
>
operator
*
(
FieldMatrix
<
T
,
N
,
M
>
mat
,
FieldVector
<
T
,
1
>
scalar
);
template
<
class
T
,
int
N
>
FieldMatrix
<
T
,
N
,
1
>
operator
*
(
FieldMatrix
<
T
,
N
,
1
>
mat
,
FieldVector
<
T
,
1
>
scalar
);
template
<
class
T
>
FieldMatrix
<
T
,
1
,
1
>
operator
*
(
FieldMatrix
<
T
,
1
,
1
>
lhs
,
FieldMatrix
<
T
,
1
,
1
>
rhs
);
template
<
class
T
,
int
M
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
=
0
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>
=
0
>
FieldMatrix
<
T
,
M
,
N
>
operator
/
(
FieldMatrix
<
T
,
M
,
N
>
A
,
S
scalar
);
...
...
@@ -258,12 +252,25 @@ namespace Dune
FieldMatrix
<
T
,
M
,
N
>&
multiplies_ABt
(
FieldMatrix
<
T
,
M
,
N
>
const
&
A
,
DiagonalMatrix
<
T
,
N
>
const
&
B
,
FieldMatrix
<
T
,
M
,
N
>&
C
);
// -----------------------------------------------------------------------------
template
<
class
T
>
T
operator
*
(
FieldVector
<
T
,
1
>
lhs
,
FieldMatrix
<
T
,
1
,
1
>
rhs
);
template
<
class
T
>
T
operator
*
(
FieldMatrix
<
T
,
1
,
1
>
lhs
,
FieldVector
<
T
,
1
>
rhs
);
// -----------------------------------------------------------------------------
template
<
class
T
,
int
N
>
T
const
&
at
(
FieldMatrix
<
T
,
N
,
1
>
const
&
vec
,
std
::
size_t
i
);
template
<
class
T
,
int
M
>
T
const
&
at
(
FieldMatrix
<
T
,
1
,
M
>
const
&
vec
,
std
::
size_t
i
);
template
<
class
T
>
T
const
&
at
(
FieldMatrix
<
T
,
1
,
1
>
const
&
vec
,
std
::
size_t
i
);
template
<
class
T
,
int
N
>
T
const
&
at
(
FieldVector
<
T
,
N
>
const
&
vec
,
std
::
size_t
i
);
...
...
This diff is collapsed.
Click to expand it.
src/amdis/common/FieldMatVec.inc.hpp
+
38
−
61
View file @
94272400
...
...
@@ -20,42 +20,30 @@ FieldVector<T,N> operator-(FieldVector<T,N> v)
}
template
<
class
T
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>>
FieldVector
<
T
,
N
>
operator
*
(
FieldVector
<
T
,
N
>
v
,
S
factor
)
{
return
v
*=
factor
;
}
template
<
class
S
,
class
T
,
int
N
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
>
template
<
class
T
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>>
FieldVector
<
T
,
N
>
operator
*
(
S
factor
,
FieldVector
<
T
,
N
>
v
)
{
return
v
*=
factor
;
}
template
<
class
T
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>>
FieldVector
<
T
,
N
>
operator
/
(
FieldVector
<
T
,
N
>
v
,
S
factor
)
{
return
v
/=
factor
;
}
template
<
class
T
>
FieldVector
<
T
,
1
>
operator
*
(
FieldVector
<
T
,
1
>
const
&
v
,
FieldVector
<
T
,
1
>
const
&
w
)
{
return
{
v
[
0
]
*
w
[
0
]};
}
template
<
class
T
,
int
N
>
FieldVector
<
T
,
N
>
operator
*
(
FieldVector
<
T
,
1
>
const
&
factor
,
FieldVector
<
T
,
N
>
v
)
{
return
v
*=
factor
[
0
];
}
template
<
class
T
,
int
N
>
FieldVector
<
T
,
N
>
operator
*
(
FieldVector
<
T
,
N
>
v
,
FieldVector
<
T
,
1
>
const
&
factor
)
FieldVector
<
T
,
1
>
operator
*
(
FieldVector
<
T
,
1
>
v
,
FieldVector
<
T
,
1
>
w
)
{
return
v
*=
factor
[
0
];
return
v
*=
w
[
0
];
}
// ----------------------------------------------------------------------------
...
...
@@ -83,13 +71,13 @@ auto dot(FieldVector<T,N> const& vec1, FieldVector<S,N> const& vec2)
return
vec1
.
dot
(
vec2
);
}
template
<
class
T
,
int
N
,
int
M
,
std
::
enable_if_t
<
(
N
!=
1
&&
M
!=
1
),
int
>
>
auto
operator
*
(
FieldVector
<
T
,
N
>
const
&
v
,
FieldVector
<
T
,
M
>
const
&
w
)
{
static_assert
(
M
==
N
,
"Requires vectors of the same type!"
);
return
v
.
dot
(
w
);
}
//
template <class T, int N, int M,
//
std::enable_if_t<( N!=1 && M!=1 ),int> >
//
auto operator*(FieldVector<T,N> const& v, FieldVector<T,M> const& w)
//
{
//
static_assert(M == N, "Requires vectors of the same type!");
//
return v.dot(w);
//
}
template
<
class
T
,
class
S
,
int
N
>
auto
dot
(
FieldMatrix
<
T
,
1
,
N
>
const
&
vec1
,
FieldMatrix
<
S
,
1
,
N
>
const
&
vec2
)
...
...
@@ -377,57 +365,27 @@ FieldMatrix<T,N,M> trans(FieldMatrix<T, M, N> const& A)
template
<
class
T
,
int
M
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>>
FieldMatrix
<
T
,
M
,
N
>
operator
*
(
S
scalar
,
FieldMatrix
<
T
,
M
,
N
>
A
)
{
return
A
*=
scalar
;
}
template
<
class
T
,
int
M
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>>
FieldMatrix
<
T
,
M
,
N
>
operator
*
(
FieldMatrix
<
T
,
M
,
N
>
A
,
S
scalar
)
{
return
A
*=
scalar
;
}
template
<
class
T
,
int
N
,
int
M
>
FieldMatrix
<
T
,
N
,
M
>
operator
*
(
FieldMatrix
<
T
,
1
,
1
>
scalar
,
FieldMatrix
<
T
,
N
,
M
>
mat
)
{
return
mat
*=
scalar
[
0
][
0
];
}
template
<
class
T
,
int
N
,
int
M
>
FieldMatrix
<
T
,
N
,
M
>
operator
*
(
FieldMatrix
<
T
,
N
,
M
>
mat
,
FieldMatrix
<
T
,
1
,
1
>
scalar
)
{
return
mat
*=
scalar
[
0
][
0
];
}
template
<
class
T
,
int
N
,
int
M
>
FieldMatrix
<
T
,
N
,
M
>
operator
*
(
FieldVector
<
T
,
1
>
scalar
,
FieldMatrix
<
T
,
N
,
M
>
mat
)
{
return
mat
*=
scalar
[
0
];
}
template
<
class
T
,
int
N
>
FieldMatrix
<
T
,
N
,
1
>
operator
*
(
FieldVector
<
T
,
1
>
scalar
,
FieldMatrix
<
T
,
N
,
1
>
mat
)
{
return
mat
*=
scalar
[
0
];
}
template
<
class
T
,
int
N
,
int
M
>
FieldMatrix
<
T
,
N
,
M
>
operator
*
(
FieldMatrix
<
T
,
N
,
M
>
mat
,
FieldVector
<
T
,
1
>
scalar
)
{
return
mat
*=
scalar
[
0
];
}
template
<
class
T
,
int
N
>
FieldMatrix
<
T
,
N
,
1
>
operator
*
(
FieldMatrix
<
T
,
N
,
1
>
mat
,
FieldVector
<
T
,
1
>
scalar
)
template
<
class
T
>
FieldMatrix
<
T
,
1
,
1
>
operator
*
(
FieldMatrix
<
T
,
1
,
1
>
lhs
,
FieldMatrix
<
T
,
1
,
1
>
rhs
)
{
return
mat
*=
scalar
[
0
];
return
lhs
*=
rhs
[
0
]
[
0
];
}
template
<
class
T
,
int
M
,
int
N
,
class
S
,
std
::
enable_if_t
<
std
::
is_
arithmetic
<
S
>
::
value
,
int
>
>
std
::
enable_if_t
<
std
::
is_
convertible
<
S
,
T
>
::
value
,
int
>>
FieldMatrix
<
T
,
M
,
N
>
operator
/
(
FieldMatrix
<
T
,
M
,
N
>
A
,
S
scalar
)
{
return
A
/=
scalar
;
...
...
@@ -517,6 +475,19 @@ FieldMatrix<T,M,N>& multiplies_ABt(FieldMatrix<T, M, N> const& A, DiagonalMatri
}
template
<
class
T
>
T
operator
*
(
FieldVector
<
T
,
1
>
lhs
,
FieldMatrix
<
T
,
1
,
1
>
rhs
)
{
return
lhs
[
0
]
*
rhs
[
0
][
0
];
}
template
<
class
T
>
T
operator
*
(
FieldMatrix
<
T
,
1
,
1
>
lhs
,
FieldVector
<
T
,
1
>
rhs
)
{
return
lhs
[
0
][
0
]
*
rhs
[
0
];
}
template
<
class
T
,
int
N
>
T
const
&
at
(
FieldMatrix
<
T
,
N
,
1
>
const
&
vec
,
std
::
size_t
i
)
{
...
...
@@ -529,6 +500,12 @@ T const& at(FieldMatrix<T,1,M> const& vec, std::size_t i)
return
vec
[
0
][
i
];
}
template
<
class
T
>
T
const
&
at
(
FieldMatrix
<
T
,
1
,
1
>
const
&
vec
,
std
::
size_t
i
)
{
return
vec
[
0
][
i
];
}
template
<
class
T
,
int
N
>
T
const
&
at
(
FieldVector
<
T
,
N
>
const
&
vec
,
std
::
size_t
i
)
{
...
...
This diff is collapsed.
Click to expand it.
test/FieldMatVecTest.cpp
+
76
−
0
View file @
94272400
...
...
@@ -128,12 +128,88 @@ void test2()
AMDIS_TEST_EQ
(
sol
,
a
);
}
// test of scalar wrapper FieldVector<T,1> and FieldMatrix<T,1,1>
void
test3
()
{
using
V
=
FieldVector
<
double
,
3
>
;
using
M
=
FieldMatrix
<
double
,
3
,
3
>
;
V
a
{
1.0
,
2.0
,
3.0
};
M
A
{
{
1.0
,
0.0
,
0.0
},
{
0.0
,
1.0
,
0.0
},
{
0.0
,
0.0
,
1.0
}
};
using
VD
=
FieldVector
<
double
,
1
>
;
using
MD
=
FieldMatrix
<
double
,
1
,
1
>
;
VD
vd1
=
1.0
;
MD
md1
=
1.0
;
using
VI
=
FieldVector
<
int
,
1
>
;
using
MI
=
FieldMatrix
<
int
,
1
,
1
>
;
VI
vi1
=
1
;
MI
mi1
=
1
;
// scale a vector
AMDIS_TEST_EQ
(
1
*
a
,
a
);
AMDIS_TEST_EQ
(
1.0
*
a
,
a
);
AMDIS_TEST_EQ
(
a
*
1
,
a
);
AMDIS_TEST_EQ
(
a
*
1.0
,
a
);
AMDIS_TEST_EQ
(
vd1
*
a
,
a
);
AMDIS_TEST_EQ
(
a
*
vd1
,
a
);
AMDIS_TEST_EQ
(
vi1
*
a
,
a
);
AMDIS_TEST_EQ
(
a
*
vi1
,
a
);
AMDIS_TEST_EQ
(
md1
*
a
,
a
);
AMDIS_TEST_EQ
(
a
*
md1
,
a
);
AMDIS_TEST_EQ
(
mi1
*
a
,
a
);
AMDIS_TEST_EQ
(
a
*
mi1
,
a
);
AMDIS_TEST_EQ
(
a
/
1
,
a
);
AMDIS_TEST_EQ
(
a
/
1.0
,
a
);
AMDIS_TEST_EQ
(
a
/
vd1
,
a
);
AMDIS_TEST_EQ
(
a
/
vi1
,
a
);
AMDIS_TEST_EQ
(
a
/
md1
,
a
);
AMDIS_TEST_EQ
(
a
/
mi1
,
a
);
// scale a matrix
AMDIS_TEST_EQ
(
1
*
A
,
A
);
AMDIS_TEST_EQ
(
1.0
*
A
,
A
);
AMDIS_TEST_EQ
(
A
*
1
,
A
);
AMDIS_TEST_EQ
(
A
*
1.0
,
A
);
AMDIS_TEST_EQ
(
vd1
*
A
,
A
);
AMDIS_TEST_EQ
(
A
*
vd1
,
A
);
AMDIS_TEST_EQ
(
vi1
*
A
,
A
);
AMDIS_TEST_EQ
(
A
*
vi1
,
A
);
AMDIS_TEST_EQ
(
md1
*
A
,
A
);
AMDIS_TEST_EQ
(
A
*
md1
,
A
);
AMDIS_TEST_EQ
(
mi1
*
A
,
A
);
AMDIS_TEST_EQ
(
A
*
mi1
,
A
);
AMDIS_TEST_EQ
(
A
/
1
,
A
);
AMDIS_TEST_EQ
(
A
/
1.0
,
A
);
AMDIS_TEST_EQ
(
A
/
vd1
,
A
);
AMDIS_TEST_EQ
(
A
/
vi1
,
A
);
AMDIS_TEST_EQ
(
A
/
md1
,
A
);
AMDIS_TEST_EQ
(
A
/
mi1
,
A
);
AMDIS_TEST_EQ
(
vd1
*
vd1
,
1.0
);
AMDIS_TEST_EQ
(
vd1
*
md1
,
1.0
);
AMDIS_TEST_EQ
(
md1
*
md1
,
1.0
);
AMDIS_TEST_EQ
(
md1
*
vd1
,
1.0
);
AMDIS_TEST_EQ
(
vd1
*
1.0
,
1.0
);
AMDIS_TEST_EQ
(
md1
*
1.0
,
1.0
);
AMDIS_TEST_EQ
(
1.0
*
md1
,
1.0
);
AMDIS_TEST_EQ
(
1.0
*
vd1
,
1.0
);
AMDIS_TEST_EQ
(
vi1
*
vi1
,
1
);
AMDIS_TEST_EQ
(
vi1
*
mi1
,
1
);
AMDIS_TEST_EQ
(
mi1
*
mi1
,
1
);
AMDIS_TEST_EQ
(
mi1
*
vi1
,
1
);
}
int
main
()
{
test0
();
test1
();
test2
();
test3
();
return
report_errors
();
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment