Changes to unit testing

LemmaCore/include/ASCIIParser.h

@@ -43,6 +43,18 @@ class ASCIIParser : public LemmaObject {
      */
     static std::shared_ptr< ASCIIParser >  NewSP();
 
+    /**
+     *  Constructs an object from a YAML serialization
+     *  @return a std::shared_ptr of type ASCIIParser
+     */
+    static std::shared_ptr< ASCIIParser >  DeSerialize( const YAML::Node& node );
+
+    /**
+     *  Uses YAML to serialize this object.
+     *  @return a YAML::Node
+     */
+    YAML::Node Serialize() const;
+
     // ====================  OPERATORS     =======================
 
     // ====================  OPERATIONS    =======================
@@ -113,6 +125,9 @@ class ASCIIParser : public LemmaObject {
     /** Default protected constructor, use New */
     ASCIIParser ( );
 
+    /** Constructor using YAML::Node */
+    ASCIIParser ( const YAML::Node& node );
+
     /** Default protected destructor, use Delete */
     ~ASCIIParser ();
 

LemmaCore/include/CubicSplineInterpolator.h

@@ -71,6 +71,16 @@ class CubicSplineInterpolator : public LemmaObject {
      */
     static std::shared_ptr<CubicSplineInterpolator> NewSP();
 
+    /**
+     *  Uses YAML to serialize this object.
+     *  @return a YAML::Node
+     */
+    YAML::Node Serialize() const;
+
+    /**
+     *   Constructs an object from a YAML::Node.
+     */
+    static std::shared_ptr< CubicSplineInterpolator > DeSerialize(const YAML::Node& node);
 
     // ====================  OPERATORS     =======================
 
@@ -143,6 +153,9 @@ class CubicSplineInterpolator : public LemmaObject {
     /** Default protected constructor, use New */
     CubicSplineInterpolator ( );
 
+    /** Protected DeDerializing constructor, use factory DeSerialize  method*/
+    CubicSplineInterpolator (const YAML::Node& node);
+
     /** Default protected destructor, smart pointers auto delete */
     ~CubicSplineInterpolator ();
 
@@ -154,12 +167,6 @@ class CubicSplineInterpolator : public LemmaObject {
 
     // ====================  OPERATIONS    =======================
 
-    /**
-        Performs spline fitting.
-     */
-    //void Spline() {
-    // }
-
     /** Finds the interval of knots in spline to use for integration.
      */
     int Interval(const Real& x);
@@ -182,3 +189,6 @@ class CubicSplineInterpolator : public LemmaObject {
 }		// -----  end of Lemma  name  -----
 
 #endif   // ----- #ifndef CUBICSPLINEINTERPOLATOR_INC  -----
+
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp: */

LemmaCore/include/RectilinearGrid.h

@@ -44,6 +44,17 @@ namespace Lemma {
              */
             static std::shared_ptr<RectilinearGrid> NewSP();
 
+            /**
+             *  Uses YAML to serialize this object.
+             *  @return a YAML::Node
+             */
+            YAML::Node Serialize() const;
+
+            /**
+             *   Constructs an object from a YAML::Node.
+             */
+            static std::shared_ptr< RectilinearGrid > DeSerialize(const YAML::Node& node);
+
             // ====================  OPERATORS     =======================
 
             // ====================  OPERATIONS    =======================
@@ -150,10 +161,13 @@ namespace Lemma {
 
             // ====================  LIFECYCLE     =======================
 
-            /// Default protected constructor.
+            /** Default protected constructor. */
             RectilinearGrid ( );
 
-            /// Default protected constructor.
+            /** Protected DeDerializing constructor, use factory DeSerialize  method*/
+            RectilinearGrid (const YAML::Node& node);
+
+            /** Default protected constructor. */
             ~RectilinearGrid ();
 
             // ====================  DATA MEMBERS  =========================
@@ -185,51 +199,16 @@ namespace Lemma {
             /// Cell spacing in the z dimension
             VectorXr dz;
 
-/*          @todo find a good way to store models that works with portions threadprivate
-            /// Container holding Vectors of Real data at centre of cell.
-            std::vector<VectorXr>   RealCellData;
-
-            /// Container holding names of Real data
-            std::vector<std::string> RealCellDataNames;
-
-            /// Container holding Vectors of Real data on edges.
-            std::vector<VectorXr>   RealEdgeData;
-
-            /// Container holding names of Real data on edges
-            std::vector<std::string> RealEdgeDataNames;
-
-            /// Container holding Vectors of Complex data on edges.
-            std::vector<VectorXcr>   ComplexEdgeData;
-
-            /// Container holding names of Real data on edges
-            std::vector<std::string> ComplexEdgeDataNames;
-
-            /// Container holding Vectors of Real properties.
-            std::vector<VectorXr>   RealCellProperties;
-
-            /// Container holding names of Real cell properties
-            std::vector<std::string> RealCellPropertyNames;
-
-            /// Container holding Vectors of Real data.
-            std::vector<VectorXcr>   ComplexCellData;
-
-            /// Container holding names of Real data
-            std::vector<std::string> ComplexCellDataNames;
-
-            /// Container holding Vectors of Complex properties.
-            std::vector<VectorXcr>   ComplexCellProperties;
-
-            /// Container holding names of Real cell properties
-            std::vector<std::string> ComplexCellPropertyNames;
-*/
         private:
 
-
-        /** ASCII string representation of the class name */
-        static constexpr auto CName = "RectilinearGrid";
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "RectilinearGrid";
 
     }; // -----  end of class  RectilinearGrid  -----
 
 }		// -----  end of Lemma  name  -----
 
 #endif   // ----- #ifndef RECTILINEARGRID_INC  -----
+
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp: */

LemmaCore/src/ASCIIParser.cpp

@@ -54,6 +54,30 @@ namespace Lemma {
 
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
+    //      Method:  Serialize
+    //--------------------------------------------------------------------------------------
+    YAML::Node  ASCIIParser::Serialize (  ) const {
+        YAML::Node node = LemmaObject::Serialize();;
+        node.SetTag( GetName() );
+        node["CommentString"] = CommentString;
+        node["BufferSize"] = BufferSize;
+        return node;
+    }		// -----  end of method ASCIIParser::Serialize  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  ASCIIParser
+    //      Method:  DeSerialize
+    //--------------------------------------------------------------------------------------
+    std::shared_ptr<ASCIIParser> ASCIIParser::DeSerialize ( const YAML::Node& node  ) {
+        if (node.Tag() != "ASCIIParser") {
+            throw  DeSerializeTypeMismatch( "ASCIIParser", node.Tag());
+        }
+        std::shared_ptr<ASCIIParser> Object(new  ASCIIParser(node), LemmaObjectDeleter() );
+        return Object ;
+    }		// -----  end of method ASCIIParser::DeSerialize  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  ASCIIParser
     //      Method:  ~ASCIIParser
     // Description:  destructor (protected)
     //--------------------------------------------------------------------------------------
@@ -63,6 +87,16 @@ namespace Lemma {
 
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
+    //      Method:  ASCIIParser
+    // Description:  DeSerializing constructor (protected)
+    //--------------------------------------------------------------------------------------
+    ASCIIParser::ASCIIParser (const YAML::Node& node) : LemmaObject(node) {
+        this->CommentString = node["CommentString"].as<std::string>();
+        this->BufferSize = node["BufferSize"].as<int>();
+    }  // -----  end of method ASCIIParser::ASCIIParser  (constructor)  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  ASCIIParser
     //      Method:  Release
     // Description:  destructor (protected)
     //--------------------------------------------------------------------------------------

LemmaCore/src/CubicSplineInterpolator.cpp

@@ -44,6 +44,13 @@ namespace Lemma {
 
     }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
+    //--------------------------------------------------------------------------------------
+    //       Class:  CubicSplineInterpolator
+    //      Method:  CubicSplineInterpolator
+    // Description:  DeSerializing constructor (protected)
+    //--------------------------------------------------------------------------------------
+    CubicSplineInterpolator::CubicSplineInterpolator (const YAML::Node& node) : LemmaObject(node) {
+    }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
     //--------------------------------------------------------------------------------------
     //       Class:  CubicSplineInterpolator
@@ -57,6 +64,29 @@ namespace Lemma {
 
     //--------------------------------------------------------------------------------------
     //       Class:  CubicSplineInterpolator
+    //      Method:  Serialize
+    //--------------------------------------------------------------------------------------
+    YAML::Node  CubicSplineInterpolator::Serialize (  ) const {
+        YAML::Node node = LemmaObject::Serialize();;
+        node.SetTag( GetName() );
+        // FILL IN CLASS SPECIFICS HERE
+        return node;
+    }		// -----  end of method CubicSplineInterpolator::Serialize  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  CubicSplineInterpolator
+    //      Method:  DeSerialize
+    //--------------------------------------------------------------------------------------
+    std::shared_ptr<CubicSplineInterpolator> CubicSplineInterpolator::DeSerialize ( const YAML::Node& node  ) {
+        if (node.Tag() != "CubicSplineInterpolator") {
+            throw  DeSerializeTypeMismatch( "CubicSplineInterpolator", node.Tag());
+        }
+        std::shared_ptr<CubicSplineInterpolator> Object(new  CubicSplineInterpolator(node), LemmaObjectDeleter() );
+        return Object ;
+    }
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  CubicSplineInterpolator
     //      Method:  ~CubicSplineInterpolator
     // Description:  destructor (protected)
     //--------------------------------------------------------------------------------------
@@ -320,3 +350,6 @@ namespace Lemma {
 
 
 }		// -----  end of Lemma  name  -----
+
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp: */

LemmaCore/src/RectilinearGrid.cpp

@@ -174,3 +174,6 @@ namespace Lemma {
     }		// -----  end of method RectilinearGrid::GetDz  -----
 
 }		// -----  end of Lemma  name  -----
+
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp: */

LemmaCore/testing/SerializeCheck.h

@@ -34,18 +34,25 @@ class MyTestSuite : public CxxTest::TestSuite
         TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
     }
 
+
+    void testCubicSplineInterpolator(void)
+    {
+        auto Obj = CubicSplineInterpolator::NewSP();
+        YAML::Node node = Obj->Serialize();
+        auto Obj2 = CubicSplineInterpolator::DeSerialize(node);
+        TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
+    }
+
+    void testRectilinearGrid( void )
+    {
+        auto Obj = RectilinearGrid::NewSP();
+        YAML::Node node = Obj->Serialize();
+        auto Obj2 = RectilinearGrid::DeSerialize(node);
+        TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
+    }
+
 // /*
-//     void testCubicSplineInterpolator(void)
-//     {
-//         auto Obj = CubicSplineInterpolator::NewSP();
-//         TS_ASSERT_EQUALS( Obj->GetName(), std::string("CubicSplineInterpolator") );
-//     }
-//
-//     void testRectilinearGrid( void )
-//     {
-//         auto Obj = RectilinearGrid::NewSP();
-//         TS_ASSERT_EQUALS( Obj->GetName(), std::string("RectilinearGrid") );
-//     }
+
 //
 //     void testRectilinearGridReader( void )
 //     {