Fixing JSON for complex numbers

lib/serialisation/JSON_IO.cc

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

lib/serialisation/JSON_IO.h

@@ -1,6 +1,6 @@
     /*************************************************************************************
 
-    Grid physics library, www.github.com/paboyle/Grid 
+    Grid physics library, www.github.com/paboyle/Grid
 
     Source file: ./lib/serialisation/JSON_IO.h
 
@@ -43,10 +43,10 @@ using json = nlohmann::json;
 
 namespace Grid
 {
-  
+
   class JSONWriter: public Writer<JSONWriter>
   {
-    
+
   public:
     JSONWriter(const std::string &fileName);
     virtual ~JSONWriter(void);
@@ -55,6 +55,8 @@ namespace Grid
     template <typename U>
     void writeDefault(const std::string &s, const U &x);
     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);
 
     template<std::size_t N>
@@ -65,7 +67,7 @@ namespace Grid
     std::string         fileName_;
     std::ostringstream  ss_;
   };
-  
+
   class JSONReader: public Reader<JSONReader>
   {
   public:
@@ -77,6 +79,8 @@ namespace Grid
     template <typename U>
     void readDefault(const std::string &s, U &output);
     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);
   private:
     json                jobject_; // main object
@@ -97,11 +101,12 @@ namespace Grid
   struct isWriter< JSONWriter > {
     static const bool value = true;
   };
-  
+
   // Writer template implementation ////////////////////////////////////////////
   template <typename U>
   void JSONWriter::writeDefault(const std::string &s, const U &x)
   {
+    std::cout << "JSONReader::writeDefault(U) : " << s <<  std::endl;
     std::ostringstream os;
     os << std::boolalpha << x;
     if (s.size())
@@ -110,9 +115,23 @@ namespace Grid
      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>
   void JSONWriter::writeDefault(const std::string &s, const std::vector<U> &x)
   {
+    std::cout << "JSONReader::writeDefault(vec U) : " << s <<  std::endl;
+
     if (s.size())
       ss_ << " \""<<s<<"\" : [";
     else
@@ -124,13 +143,15 @@ namespace Grid
     delete_comma();
     ss_<< "],";
   }
-  
+
   template<std::size_t N>
   void JSONWriter::writeDefault(const std::string &s, const char(&x)[N]){
+    std::cout << "JSONReader::writeDefault(char U) : " << s <<  std::endl;
+
     if (s.size())
     ss_ << "\""<< s << "\" : \"" << x << "\" ," ;
     else
-    ss_ << "\"" << x << "\" ," ; 
+    ss_ << "\"" << x << "\" ," ;
   }
 
   // Reader template implementation ////////////////////////////////////////////
@@ -138,7 +159,7 @@ namespace Grid
   void JSONReader::readDefault(const std::string &s, U &output)
   {
     std::cout << "JSONReader::readDefault(U) : " << s << "  :  "<< jcur_ << std::endl;
-  
+
     if (s.size()){
       std::cout << "String: "<< jcur_[s] << std::endl;
       output = jcur_[s];
@@ -146,15 +167,31 @@ namespace Grid
     else
     {
       std::cout << "String: "<< jcur_ << std::endl;
-      output = jcur_;    
+      output = jcur_;
     }
 
 
   }
-  
+
+  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 <>
   void JSONReader::readDefault(const std::string &s, std::string &output);
-  
+
   template <typename U>
   void JSONReader::readDefault(const std::string &s, std::vector<U> &output)
   {
@@ -163,7 +200,7 @@ namespace Grid
     std::cout << "JSONReader::readDefault(vec) : " << jcur_ << std::endl;
     if (s.size())
       push(s);
-    
+
     json j = jcur_;
     for (json::iterator it = j.begin(); it != j.end(); ++it) {
       jcur_ = *it;
@@ -171,12 +208,12 @@ namespace Grid
       output.resize(i + 1);
       read("", output[i++]);
     }
-    
+
 
     jcur_ = j;
     if (s.size())
       pop();
   }
-  
+
 }
 #endif

tests/IO/Test_serialisation.cc

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