diff --git a/test/valuefactory.hh b/test/valuefactory.hh
index d9e1a83b4aa7082b26dda1e54fc556d59827eab6..2969b1f6698bfd23bdaca1d8f368fdfcb3ba0729 100644
--- a/test/valuefactory.hh
+++ b/test/valuefactory.hh
@@ -10,7 +10,7 @@
#include <dune/gfe/hyperbolichalfspacepoint.hh>
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the generic dummy. The actual work is done in specializations.
*/
template <class T>
@@ -18,12 +18,12 @@ class ValueFactory
{
public:
static void get(std::vector<T>& values);
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for RealTuple<1>
*/
template <>
@@ -31,22 +31,22 @@ class ValueFactory<RealTuple<double,1> >
{
public:
static void get(std::vector<RealTuple<double,1> >& values) {
-
+
int nTestPoints = 5;
double testPoints[5] = {-3, -1, 0, 2, 4};
-
+
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++)
values[i] = RealTuple<double,1>(testPoints[i]);
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for RealTuple<3>
*/
template <>
@@ -54,7 +54,7 @@ class ValueFactory<RealTuple<double,3> >
{
public:
static void get(std::vector<RealTuple<double,3> >& values) {
-
+
int nTestPoints = 10;
double testPoints[10][3] = {{1,0,0}, {0,1,0}, {-0.838114,0.356751,-0.412667},
{-0.490946,-0.306456,0.81551},{-0.944506,0.123687,-0.304319},
@@ -62,23 +62,23 @@ public:
{-0.1,0.3,-0.1},{-0.444506,0.123687,0.104319},{-0.7,-0.123687,-0.304319}};
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++) {
-
+
Dune::FieldVector<double,3> w;
for (int j=0; j<3; j++)
w[j] = testPoints[i][j];
values[i] = RealTuple<double,3>(w);
}
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for UnitVector<2>
*/
template <>
@@ -86,27 +86,27 @@ class ValueFactory<UnitVector<double,2> >
{
public:
static void get(std::vector<UnitVector<double,2> >& values) {
-
+
int nTestPoints = 10;
double testPoints[10][2] = {{1,0}, {0.5,0.5}, {0,1}, {-0.5,0.5}, {-1,0}, {-0.5,-0.5}, {0,-1}, {0.5,-0.5}, {0.1,1}, {1,.1}};
-
+
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++) {
-
+
Dune::array<double,2> w = {{testPoints[i][0], testPoints[i][1]}};
values[i] = UnitVector<double,2>(w);
}
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for UnitVector<3>
*/
template <>
@@ -114,7 +114,7 @@ class ValueFactory<UnitVector<double,3> >
{
public:
static void get(std::vector<UnitVector<double,3> >& values) {
-
+
int nTestPoints = 10;
double testPoints[10][3] = {{1,0,0}, {0,1,0}, {-0.838114,0.356751,-0.412667},
{-0.490946,-0.306456,0.81551},{-0.944506,0.123687,-0.304319},
@@ -122,22 +122,22 @@ public:
{-0.1,0.3,-0.1},{-0.444506,0.123687,0.104319},{-0.7,-0.123687,-0.304319}};
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++) {
-
+
Dune::array<double,3> w = {{testPoints[i][0], testPoints[i][1], testPoints[i][2]}};
values[i] = UnitVector<double,3>(w);
}
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for UnitVector<4>
*/
template <>
@@ -145,31 +145,31 @@ class ValueFactory<UnitVector<double,4> >
{
public:
static void get(std::vector<UnitVector<double,4> >& values) {
-
+
int nTestPoints = 10;
double testPoints[10][4] = {{1,0,0,0}, {0,1,0,0}, {-0.838114,0.356751,-0.412667,0.5},
{-0.490946,-0.306456,0.81551,0.23},{-0.944506,0.123687,-0.304319,-0.7},
{-0.6,0.1,-0.2,0.8},{0.45,0.12,0.517,0},
{-0.1,0.3,-0.1,0.73},{-0.444506,0.123687,0.104319,-0.23},{-0.7,-0.123687,-0.304319,0.72}};
-
+
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++) {
-
+
Dune::array<double,4> w = {{testPoints[i][0], testPoints[i][1], testPoints[i][2], testPoints[i][3]}};
values[i] = UnitVector<double,4>(w);
}
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for Rotation<3>
*/
template <>
@@ -177,30 +177,30 @@ class ValueFactory<Rotation<double,3> >
{
public:
static void get(std::vector<Rotation<double,3> >& values) {
-
+
int nTestPoints = 10;
double testPoints[10][4] = {{1,0,0,0}, {0,1,0,0}, {-0.838114,0.356751,-0.412667,0.5},
{-0.490946,-0.306456,0.81551,0.23},{-0.944506,0.123687,-0.304319,-0.7},
{-0.6,0.1,-0.2,0.8},{0.45,0.12,0.517,0},
{-0.1,0.3,-0.1,0.73},{-0.444506,0.123687,0.104319,-0.23},{-0.7,-0.123687,-0.304319,0.72}};
-
+
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++) {
-
+
Dune::array<double,4> w = {{testPoints[i][0], testPoints[i][1], testPoints[i][2], testPoints[i][3]}};
values[i] = Rotation<double,3>(w);
}
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for RigidBodyMotion<3>
*/
template <>
@@ -208,27 +208,27 @@ class ValueFactory<RigidBodyMotion<double,3> >
{
public:
static void get(std::vector<RigidBodyMotion<double,3> >& values) {
-
+
std::vector<RealTuple<double,3> > rValues;
ValueFactory<RealTuple<double,3> >::get(rValues);
-
+
std::vector<Rotation<double,3> > qValues;
ValueFactory<Rotation<double,3> >::get(qValues);
-
+
int nTestPoints = std::min(rValues.size(), qValues.size());
-
+
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++)
values[i] = RigidBodyMotion<double,3>(rValues[i].globalCoordinates(),qValues[i]);
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for square FieldMatrices
*/
template <class T, int N>
@@ -236,10 +236,10 @@ class ValueFactory<Dune::FieldMatrix<T,N,N> >
{
public:
static void get(std::vector<Dune::FieldMatrix<T,N,N> >& values) {
-
+
int nTestPoints = 10;
values.resize(nTestPoints);
-
+
// Set up elements of T^{N \times N}
for (int i=0; i<nTestPoints; i++)
for (int j=0; j<N; j++)
@@ -247,51 +247,51 @@ public:
values[i][j][k] = std::rand()%100 - 50;
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for OrthogonalMatrices
*/
template <class T, int N>
class ValueFactory<OrthogonalMatrix<T,N> >
{
-
+
static Dune::FieldVector<T,N> proj(const Dune::FieldVector<T,N>& u, const Dune::FieldVector<T,N>& v)
{
Dune::FieldVector<T,N> result = u;
result *= (v*u) / (u*u);
return result;
}
-
+
public:
static void get(std::vector<OrthogonalMatrix<T,N> >& values) {
// Get general matrices
std::vector<Dune::FieldMatrix<T,N,N> > mValues;
ValueFactory<Dune::FieldMatrix<T,N,N> >::get(mValues);
-
+
values.resize(mValues.size());
// Do Gram-Schmidt orthogonalization of the rows
for (size_t m=0; m<mValues.size(); m++) {
-
+
Dune::FieldMatrix<T,N,N>& v = mValues[m];
-
+
if (std::fabs(v.determinant()) < 1e-6)
continue;
-
+
for (int j=0; j<N; j++) {
-
+
for (int i=0; i<j; i++) {
-
+
// v_j = v_j - proj_{v_i} v_j
v[j] -= proj(v[i],v[j]);
-
+
}
-
+
// normalize
v[j] /= v[j].two_norm();
}
@@ -299,13 +299,13 @@ public:
values[m] = OrthogonalMatrix<T,N>(v);
}
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for HyperbolicHalfspacePoint<3>
*/
template <>
@@ -313,7 +313,7 @@ class ValueFactory<HyperbolicHalfspacePoint<double,2> >
{
public:
static void get(std::vector<HyperbolicHalfspacePoint<double,2> >& values) {
-
+
int nTestPoints = 10;
double testPoints[10][2] = {{0,2}, {0,1}, {0,0.5},
{-0.490946,0.81551},{-0.944506,0.304319},
@@ -321,23 +321,23 @@ public:
{-0.1,0.1},{-0.444506,0.104319},{-0.7,0.304319}};
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++) {
-
+
Dune::FieldVector<double,2> w;
for (int j=0; j<2; j++)
w[j] = testPoints[i][j];
values[i] = HyperbolicHalfspacePoint<double,2>(w);
}
-
+
}
-
+
};
/** \brief A class that creates sets of values of various types, to be used in unit tests
- *
+ *
* This is the specialization for HyperbolicHalfspacePoint<3>
*/
template <>
@@ -345,7 +345,7 @@ class ValueFactory<HyperbolicHalfspacePoint<double,3> >
{
public:
static void get(std::vector<HyperbolicHalfspacePoint<double,3> >& values) {
-
+
int nTestPoints = 10;
double testPoints[10][3] = {{1,0,0.01}, {0,1,0.01}, {-0.838114,0.356751,0.412667},
{-0.490946,-0.306456,0.81551},{-0.944506,0.123687,0.304319},
@@ -353,19 +353,19 @@ public:
{-0.1,0.3,0.1},{-0.444506,0.123687,0.104319},{-0.7,-0.123687,0.304319}};
values.resize(nTestPoints);
-
+
// Set up elements of S^1
for (int i=0; i<nTestPoints; i++) {
-
+
Dune::FieldVector<double,3> w;
for (int j=0; j<3; j++)
w[j] = testPoints[i][j];
values[i] = HyperbolicHalfspacePoint<double,3>(w);
}
-
+
}
-
+
};