Updates to testing suite

CMakeLists.txt

@@ -222,10 +222,6 @@ add_subdirectory (Modules)
 # 
 include_directories(${CMAKE_INSTALL_PREFIX}/include)
 
-#add_executable(Hello "${PROJECT_SOURCE_DIR}/src/test.cpp")
-#target_link_libraries(Hello lemmacore)
-#add_dependencies(Hello YAML-CPP)
-
 # add a target to generate API documentation with Doxygen
 # ALL make documentation build by default if possible
 find_package(Doxygen)

LemmaCore/include/Grid.h

@@ -34,6 +34,8 @@ class Grid : public LemmaObject {
 
         // ====================  LIFECYCLE     ===================================
 
+        YAML::Node Serialize() const;
+
         // ====================  OPERATORS     ===================================
 
         // ====================  OPERATIONS    ===================================
@@ -51,6 +53,9 @@ class Grid : public LemmaObject {
 
         // ====================  LIFECYCLE     ===================================
 
+        /** Protected DeDerializing constructor, use factory DeSerialize  method on non abstract classes*/
+        Grid (const YAML::Node& node);
+
         /// Default protected constructor.
         Grid ( );
 

LemmaCore/include/RectilinearGrid.h

@@ -44,6 +44,7 @@ namespace Lemma {
              */
             static std::shared_ptr<RectilinearGrid> NewSP();
 
+
             /**
              *  Uses YAML to serialize this object.
              *  @return a YAML::Node

LemmaCore/src/Grid.cpp

@@ -20,11 +20,24 @@ namespace Lemma {
         return stream;
     }
 
+    // ====================  LIFECYCLE     ===================================
 
 	Grid::Grid( ) : LemmaObject( ) {
 	}
 
+    Grid::Grid( const YAML::Node& node ) : LemmaObject(node) {
+
+    }
+
 	Grid::~Grid  ( ) {
 	}
 
+    YAML::Node Grid::Serialize() const {
+
+        YAML::Node node = LemmaObject::Serialize();
+        node.SetTag( this->GetName() );
+        return node;
+
+    }
+
 }

LemmaCore/src/RectilinearGrid.cpp

@@ -20,25 +20,28 @@ namespace Lemma {
         return stream;
     }
 
-    /*
-	std::ostream &operator<<(std::ostream &stream, const
-	    RectilinearGrid &ob) {
-		stream << *(LemmaObject*)(&ob);
-        stream << "\tnx=" << ob.nx << "\tny=" << ob.ny << "\tnz=" << ob.nz << std::endl;
-        stream << "\tox=" << ob.ox << "\toy=" << ob.oy << "\toz=" << ob.oz << std::endl;
-        stream << "\tdx=" << ob.dx.transpose() << std::endl;
-        stream << "\tdy=" << ob.dy.transpose() << std::endl;
-        stream << "\tdz=" << ob.dz.transpose() << std::endl;
-		return stream;
-	}
-    */
-
     // ====================  LIFECYCLE     =======================
 
     RectilinearGrid::RectilinearGrid( ) : Grid( ), nx(0), ny(0), nz(0) {
 
     }
 
+    RectilinearGrid::RectilinearGrid( const YAML::Node& node ) : Grid(node) {
+
+        nx = node["nx"].as<int>( );
+        ny = node["ny"].as<int>( );
+        nz = node["nz"].as<int>( );
+
+        ox = node["ox"].as<Real>( );
+        oy = node["oy"].as<Real>( );
+        oz = node["oz"].as<Real>( );
+
+        dx = node["dx"].as< VectorXr >();
+        dy = node["dy"].as< VectorXr >();
+        dz = node["dz"].as< VectorXr >();
+
+    }
+
     RectilinearGrid::~RectilinearGrid() {
 
     }
@@ -48,6 +51,39 @@ namespace Lemma {
         return sp;
     }
 
+    YAML::Node RectilinearGrid::Serialize() const {
+        YAML::Node node = Grid::Serialize();
+
+        node["nx"] = nx;
+        node["ny"] = ny;
+        node["nz"] = nz;
+
+        node["ox"] = ox;
+        node["oy"] = oy;
+        node["oz"] = oz;
+
+        node["dx"] = dx;
+        node["dy"] = dy;
+        node["dz"] = dz;
+
+        node.SetTag( this->GetName() );
+        return node;
+    }
+
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  RectilinearGrid
+    //      Method:  DeSerialize
+    //--------------------------------------------------------------------------------------
+    std::shared_ptr<RectilinearGrid> RectilinearGrid::DeSerialize ( const YAML::Node& node  ) {
+        if (node.Tag() != "RectilinearGrid") {
+            throw  DeSerializeTypeMismatch( "RectilinearGrid", node.Tag());
+        }
+        std::shared_ptr<RectilinearGrid> Object(new  RectilinearGrid(node), LemmaObjectDeleter() );
+        return Object ;
+    }
+
+
     // ====================  OPERATIONS    =======================
 
     void RectilinearGrid::SetDimensions (const int &inx, const int &iny,

LemmaCore/testing/SerializeCheck.h

@@ -52,8 +52,6 @@ class MyTestSuite : public CxxTest::TestSuite
     }
 
 // /*
-
-//
 //     void testRectilinearGridReader( void )
 //     {
 //         auto Obj = RectilinearGridReader::NewSP();