portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-13 01:05:36 +00:00
Code Releases Activity

Cosmetic

Browse Source
This commit is contained in:
Peter Boyle 2015-08-20 16:30:52 +01:00
parent ab81a25073
commit 77d299b414
1 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
lib/serialisation/Reader.h
View File

@ -5,76 +5,81 @@
namespace Grid { namespace Grid {
// Generic reader writer interface // Generic reader writer interface
template< class Writer> void push(Writer & WR,const std::string &s) { WR.push(s);} template< class Writer> void push(Writer & WR,const std::string &s) { WR.push(s);}
template< class Writer> void push(Writer & WR,const char *s) { WR.push(std::string(s));} template< class Writer> void push(Writer & WR,const char *s) { WR.push(std::string(s));}
template< class Writer> void pop (Writer & WR) { WR.pop();} template< class Writer> void pop (Writer & WR) { WR.pop();}
template< class Writer> void write(Writer& wr, const std::string& s,const char * output ) { wr.iwrite(s,std::string(output)); }; template< class Writer> void write(Writer& wr, const std::string& s,const char * output ) { wr.iwrite(s,std::string(output)); };
template< class Writer> void write(Writer& wr, const std::string& s,const std::string &output) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s,const std::string &output) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, int16_t output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, int16_t output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, uint16_t output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, uint16_t output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, int32_t output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, int32_t output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, uint32_t output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, uint32_t output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, int64_t output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, int64_t output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, uint64_t output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, uint64_t output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, float output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, float output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, double output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, double output ) { wr.iwrite(s,output); };
template< class Writer> void write(Writer& wr, const std::string& s, bool output ) { wr.iwrite(s,output); }; template< class Writer> void write(Writer& wr, const std::string& s, bool output ) { wr.iwrite(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s,std::string &output) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s,std::string &output) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, int16_t &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, int16_t &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, uint16_t &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, uint16_t &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, int32_t &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, int32_t &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, uint32_t &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, uint32_t &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, int64_t &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, int64_t &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, uint64_t &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, uint64_t &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, float &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, float &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, double &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, double &output ) { rd.iread(s,output); };
template< class Reader> void read(Reader& rd, const std::string& s, bool &output ) { rd.iread(s,output); }; template< class Reader> void read(Reader& rd, const std::string& s, bool &output ) { rd.iread(s,output); };
template<class Writer, class T> template<class Writer, class T>
void write(Writer& wr, const std::string& s,const std::vector<T> output ) { void write(Writer& wr, const std::string& s,const std::vector<T> output ) {
push(wr,s); push(wr,s);
for(int i=0;i<output.size();i++){ for(int i=0;i<output.size();i++){
std::ostringstream oss; oss << "elem" << i; std::ostringstream oss; oss << "elem" << i;
write(wr,oss.str(),output[i]); write(wr,oss.str(),output[i]);
} }
pop(wr); pop(wr);
}; };
template<class Reader, class T> template<class Reader, class T>
void read(Reader& rd, const std::string& s,std::vector<T> &output ) { void read(Reader& rd, const std::string& s,std::vector<T> &output ) {
rd.iread(s,output); rd.iread(s,output);
}; };
template < class T > template < class T >
inline std::ostream& operator << (std::ostream& os, const std::vector<T>& v) inline std::ostream& operator << (std::ostream& os, const std::vector<T>& v)
{ {
os << "["; os << "[";
for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii) for (typename std::vector<T>::const_iterator ii = v.begin(); ii != v.end(); ++ii)
{ {
os << " " << *ii; os << " " << *ii;
}
os << " ]";
return os;
} }
os << " ]";
return os;
}
} }
//////////////////////////////////////////
// Todo: // Todo:
//////////////////////////////////////////
//#include <serialisation/CoutReader.h> //#include <serialisation/CoutReader.h>
//#include <serialisation/TextReader.h> //#include <serialisation/TextReader.h>
//#include <serialisation/JSONReader.h> //#include <serialisation/JSONReader.h>
//#include <serialisation/YAMLReader.h> //#include <serialisation/YAMLReader.h>
#include <serialisation/XMLReader.h> #include <serialisation/XMLReader.h>
//////////////////////////////////////////
// Select the default serialiser
//////////////////////////////////////////
namespace Grid { namespace Grid {
using XMLPolicy::Reader; using XMLPolicy::Reader;
using XMLPolicy::Writer; using XMLPolicy::Writer;
} }