portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-10 06:00:45 +01:00
Code Releases Activity

Fixing JSON for complex numbers

Browse Source
This commit is contained in:
Guido Cossu 2017-05-08 21:41:39 +01:00
parent 4ec746d262
commit 8ba0494485
3 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/serialisation/JSON_IO.cc
View File

@ -43,6 +43,7 @@ JSONWriter::~JSONWriter(void)
cout << ss_.str() << endl; cout << ss_.str() << endl;
// write prettified JSON to file // write prettified JSON to file
std::ofstream os(fileName_); std::ofstream os(fileName_);
std::cout << "Writing on file" << std::endl;
os << std::setw(2) << json::parse(ss_.str()) << std::endl; os << std::setw(2) << json::parse(ss_.str()) << std::endl;
} }

37
lib/serialisation/JSON_IO.h
View File

@ -55,6 +55,8 @@ namespace Grid
template <typename U> template <typename U>
void writeDefault(const std::string &s, const U &x); void writeDefault(const std::string &s, const U &x);
template <typename U> template <typename U>
void writeDefault(const std::string &s, const std::complex<U> &x);
template <typename U>
void writeDefault(const std::string &s, const std::vector<U> &x); void writeDefault(const std::string &s, const std::vector<U> &x);
template<std::size_t N> template<std::size_t N>
@ -77,6 +79,8 @@ namespace Grid
template <typename U> template <typename U>
void readDefault(const std::string &s, U &output); void readDefault(const std::string &s, U &output);
template <typename U> template <typename U>
void readDefault(const std::string &s, std::complex<U> &output);
template <typename U>
void readDefault(const std::string &s, std::vector<U> &output); void readDefault(const std::string &s, std::vector<U> &output);
private: private:
json jobject_; // main object json jobject_; // main object
@ -102,6 +106,7 @@ namespace Grid
template <typename U> template <typename U>
void JSONWriter::writeDefault(const std::string &s, const U &x) void JSONWriter::writeDefault(const std::string &s, const U &x)
{ {
std::cout << "JSONReader::writeDefault(U) : " << s << std::endl;
std::ostringstream os; std::ostringstream os;
os << std::boolalpha << x; os << std::boolalpha << x;
if (s.size()) if (s.size())
@ -110,9 +115,23 @@ namespace Grid
ss_ << os.str() << " ," ; ss_ << os.str() << " ," ;
} }
template <typename U>
void JSONWriter::writeDefault(const std::string &s, const std::complex<U> &x)
{
std::cout << "JSONReader::writeDefault(complex) : " << s << std::endl;
std::ostringstream os;
os << "["<< std::boolalpha << x.real() << ", " << x.imag() << "]";
if (s.size())
ss_ << "\""<< s << "\" : " << os.str() << " ," ;
else
ss_ << os.str() << " ," ;
}
template <typename U> template <typename U>
void JSONWriter::writeDefault(const std::string &s, const std::vector<U> &x) void JSONWriter::writeDefault(const std::string &s, const std::vector<U> &x)
{ {
std::cout << "JSONReader::writeDefault(vec U) : " << s << std::endl;
if (s.size()) if (s.size())
ss_ << " \""<<s<<"\" : ["; ss_ << " \""<<s<<"\" : [";
else else
@ -127,6 +146,8 @@ namespace Grid
template<std::size_t N> template<std::size_t N>
void JSONWriter::writeDefault(const std::string &s, const char(&x)[N]){ void JSONWriter::writeDefault(const std::string &s, const char(&x)[N]){
std::cout << "JSONReader::writeDefault(char U) : " << s << std::endl;
if (s.size()) if (s.size())
ss_ << "\""<< s << "\" : \"" << x << "\" ," ; ss_ << "\""<< s << "\" : \"" << x << "\" ," ;
else else
@ -152,6 +173,22 @@ namespace Grid
} }
template <typename U>
void JSONReader::readDefault(const std::string &s, std::complex<U> &output)
{
U tmp1, tmp2;
std::cout << "JSONReader::readDefault( complex U) : " << s << " : "<< jcur_ << std::endl;
json j = jcur_;
json::iterator it = j.begin();
jcur_ = *it;
read("", tmp1);
it++;
jcur_ = *it;
read("", tmp2);
output = std::complex<U>(tmp1,tmp2);
}
template <> template <>
void JSONReader::readDefault(const std::string &s, std::string &output); void JSONReader::readDefault(const std::string &s, std::string &output);

11
tests/IO/Test_serialisation.cc
View File

@ -214,6 +214,7 @@ int main(int argc,char **argv)
// test serializable class writing // test serializable class writing
myclass obj(1234); // non-trivial constructor myclass obj(1234); // non-trivial constructor
std::cout << "-- serialisable class writing to 'bother.json'..." << std::endl;
write(JW,"obj",obj); write(JW,"obj",obj);
JW.write("obj2", obj); JW.write("obj2", obj);
@ -232,11 +233,11 @@ int main(int argc,char **argv)
myclass jcopy1; myclass jcopy1;
std::vector<myclass> jveccopy1; std::vector<myclass> jveccopy1;
read(RD,"obj",jcopy1); read(RD,"obj",jcopy1);
read(RD,"objvec", jveccopy1); //read(RD,"objvec", jveccopy1);
std::cout << "Loaded (JSON) -----------------" << std::endl; //std::cout << "Loaded (JSON) -----------------" << std::endl;
std::cout << jcopy1 << std::endl << jveccopy1 << std::endl; //std::cout << jcopy1 << std::endl << jveccopy1 << std::endl;
} }
/*
{ {
// Testing the next element function // Testing the next element function
JSONReader RD("test.json"); JSONReader RD("test.json");
@ -245,7 +246,7 @@ int main(int argc,char **argv)
std::string name; std::string name;
read(RD,"name", name); read(RD,"name", name);
} }
*/
} }