portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Merge branch 'develop' into feature/hadrons

Browse Source 
# Conflicts:
#	lib/serialisation/BaseIO.h
This commit is contained in:
Antonin Portelli 2018-03-07 15:22:16 +00:00
commit 9942723189
2 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lib/serialisation/BaseIO.h
View File

@ -35,37 +35,72 @@ Author: Guido Cossu <guido.cossu@ed.ac.uk>
namespace Grid {
// Grid scalar tensors to nested std::vectors //////////////////////////////////
template <typename T, typename V>
void tensorToVec(V &v, const T& t)
template <typename T>
struct TensorToVec
{
v = t;
typedef T type;
};
template <typename T>
struct TensorToVec<iScalar<T>>
{
typedef typename TensorToVec<T>::type type;
};
template <typename T, int N>
struct TensorToVec<iVector<T, N>>
{
typedef typename std::vector<typename TensorToVec<T>::type> type;
};
template <typename T, int N>
struct TensorToVec<iMatrix<T, N>>
{
typedef typename std::vector<std::vector<typename TensorToVec<T>::type>> type;
};
template <typename T>
typename TensorToVec<T>::type tensorToVec(const T &t)
{
return t;
}
template <typename T, typename V>
void tensorToVec(V &v, const iScalar<T>& t)
template <typename T>
typename TensorToVec<iScalar<T>>::type tensorToVec(const iScalar<T>& t)
{
tensorToVec(v, t._internal);
return tensorToVec(t._internal);
}
template <typename T, typename V, int N>
void tensorToVec(std::vector<V> &v, const iVector<T, N>& t)
template <typename T, int N>
typename TensorToVec<iVector<T, N>>::type tensorToVec(const iVector<T, N>& t)
{
typename TensorToVec<iVector<T, N>>::type v;
v.resize(N);
for (unsigned int i = 0; i < N; i++)
{
tensorToVec(v[i], t._internal[i]);
v[i] = tensorToVec(t._internal[i]);
}
return v;
}
template <typename T, typename V, int N>
void tensorToVec(std::vector<std::vector<V>> &v, const iMatrix<T, N>& t)
template <typename T, int N>
typename TensorToVec<iMatrix<T, N>>::type tensorToVec(const iMatrix<T, N>& t)
{
v.resize(N, std::vector<V>(N));
typename TensorToVec<iMatrix<T, N>>::type v;
v.resize(N);
for (unsigned int i = 0; i < N; i++)
for (unsigned int j = 0; j < N; j++)
{
tensorToVec(v[i][j], t._internal[i][j]);
v[i].resize(N);
for (unsigned int j = 0; j < N; j++)
{
v[i][j] = tensorToVec(t._internal[i][j]);
}
}
return v;
}
// Vector element trait //////////////////////////////////////////////////////
@ -150,15 +185,15 @@ namespace Grid {
do
{
is.get(c);
} while (c != '{' && !is.eof());
if (c == '{')
} while (c != '(' && !is.eof());
if (c == '(')
{
int start = is.tellg();
do
{
is.get(c);
} while (c != '}' && !is.eof());
if (c == '}')
} while (c != ')' && !is.eof());
if (c == ')')
{
int end = is.tellg();
int psize = end - start - 1;
@ -181,7 +216,7 @@ namespace Grid {
template <class T1, class T2>
inline std::ostream & operator<<(std::ostream &os, const std::pair<T1, T2> &p)
{
os << "{" << p.first << " " << p.second << "}";
os << "(" << p.first << " " << p.second << ")";
return os;
}

6
tests/IO/Test_serialisation.cc
View File

@ -202,8 +202,6 @@ int main(int argc,char **argv)
GridSerialRNG rng;
SpinColourMatrix scm;
SpinColourVector scv;
std::vector<std::vector<std::vector<std::vector<ComplexD>>>> scmv;
std::vector<std::vector<ComplexD>> scvv;
rng.SeedFixedIntegers(std::vector<int>({42,10,81,9}));
random(rng, scm);
@ -211,8 +209,8 @@ int main(int argc,char **argv)
std::cout << "Test spin-color matrix: " << scm << std::endl;
std::cout << "Test spin-color vector: " << scv << std::endl;
std::cout << "Converting to std::vector" << std::endl;
tensorToVec(scmv, scm);
tensorToVec(scvv, scv);
auto scmv = tensorToVec(scm);
auto scvv = tensorToVec(scv);
std::cout << "Spin-color matrix: " << scmv << std::endl;
std::cout << "Spin-color vector: " << scvv << std::endl;
}