LemmaCore is up to enhancement 3

Documentation/dox/tutorial.dox

@@ -73,11 +73,11 @@ wrappers for all of this would be a huge undertaking.
   to deliver expressive, fast code. Their benchmarks are right in line with 
   fast BLAS and LAPACK implementations. If you honestly feel that 
 \code
-DGEMM ( TRANSA, TRANSB, M, N, K, ALPHA, A, LDA, B, LDB, BETA, C, LDC )
+    DGEMM ( TRANSA, TRANSB, M, N, K, ALPHA, A, LDA, B, LDB, BETA, C, LDC )
 \endcode  
  is superior to
 \code
-  C = A*B.transpose(); 
+    C = A*B.transpose(); 
 \endcode 
  you are living in denial. Check out the benchmarks if you are still sceptical
 http://eigen.tuxfamily.org/index.php?title=Benchmark 

Modules/LemmaCore/include/ASCIIParser.h

@@ -56,7 +56,7 @@ class ASCIIParser : public LemmaObject {
      *       in c++-17, this curiosity may be resolved.
      * @see ASCIIParser::DeSerialize
      */
-    ASCIIParser ( const YAML::Node& node, const ctor_key& );
+    explicit ASCIIParser ( const YAML::Node& node, const ctor_key& );
 
     /** Default  destructor
      *  @note This should never be called explicitly, use NewSP
@@ -170,3 +170,6 @@ class ASCIIParser : public LemmaObject {
 }		// -----  end of Lemma  name  -----
 
 #endif   // ----- #ifndef ASCIIPARSER_INC  -----
+
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp syntax=cpp.doxygen: */

Modules/LemmaCore/include/CubicSplineInterpolator.h

@@ -71,7 +71,7 @@ class CubicSplineInterpolator : public LemmaObject {
     /** Default constructor */
     explicit CubicSplineInterpolator ( const ctor_key& );
 
-    /** DeSerializing constructor, usees factory DeSerialize  method*/
+    /** DeSerializing constructor, locked use factory DeSerialize  method*/
     CubicSplineInterpolator ( const YAML::Node& node, const ctor_key& );
 
     /** Destructor use smart pointers to auto delete */
@@ -189,4 +189,4 @@ class CubicSplineInterpolator : public LemmaObject {
 #endif   // ----- #ifndef CUBICSPLINEINTERPOLATOR_INC  -----
 
 /* vim: set tabstop=4 expandtab: */
-/* vim: set filetype=cpp: */
+/* vim: set filetype=cpp syntax=cpp.doxygen: */

Modules/LemmaCore/include/GridReader.h

@@ -65,6 +65,10 @@ namespace Lemma {
             GridReader ( ) : LemmaObject( ) {
             }
 
+            /** Default protected constructor, use New */
+            GridReader ( const YAML::Node& node ) : LemmaObject( node ) {
+            }
+
             /** Default protected constructor, use Delete */
             ~GridReader () {
             }

Modules/LemmaCore/include/RectilinearGrid.h

@@ -18,18 +18,14 @@
 
 namespace Lemma {
 
-    // ===================================================================
-    //  Class:  RectilinearGrid
     /**
-      @class
-      \ingroup LemmaCore
-      \brief   Impliments a rectilinear grid.
-      \details A rectilinear grid can vary regularily in space but must be
-               constant variation across each dimension. In this way three
-               vectors can define the entire grid, and each cell is right
-               aligned with all its neighbours.
+     * \ingroup LemmaCore
+     * \brief   Impliments a rectilinear grid.
+     * \details A rectilinear grid can vary regularily in space but must be
+     *         constant variation across each dimension. In this way three
+     *         vectors can define the entire grid, and each cell is right
+     *         aligned with all its neighbours.
      */
-    // ===================================================================
     class RectilinearGrid : public Grid {
 
         friend std::ostream &operator<<(std::ostream &stream,
@@ -45,11 +41,29 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /**
-             *  Factory method for generating concrete class.
-             *  @return a std::shared_ptr of type RectilinearGrid
+             * DeSerializing constructor.
+             * @note This method is locked, and cannot be called directly.
+             *       The reason that the method is public is to enable the use
+             *       of make_shared whilst enforcing the use of shared_ptr,
+             *       in c++-17, this curiosity may be resolved.
+             * @see RectilinearGrid::NewSP
              */
-            static std::shared_ptr<RectilinearGrid> NewSP();
+            explicit RectilinearGrid ( const ctor_key& );
 
+            /**
+             * DeSerializing constructor.
+             * @note This method is locked, and cannot be called directly.
+             *       The reason that the method is public is to enable the use
+             *       of make_shared whilst enforcing the use of shared_ptr,
+             *       in c++-17, this curiosity may be resolved.
+             * @see DeSerialize
+             */
+            explicit RectilinearGrid (const YAML::Node& node, const ctor_key& );
+
+            /** Default destructor.
+             *  @note This should never be called explicitly, use NewSP
+             */
+            virtual ~RectilinearGrid ();
 
             /**
              *  Uses YAML to serialize this object.
@@ -58,6 +72,12 @@ namespace Lemma {
             virtual YAML::Node Serialize() const;
 
             /**
+             *  Factory method for generating concrete class.
+             *  @return a std::shared_ptr of type RectilinearGrid
+             */
+            static std::shared_ptr<RectilinearGrid> NewSP();
+
+            /**
              *   Constructs an object from a YAML::Node.
              */
             static std::shared_ptr< RectilinearGrid > DeSerialize(const YAML::Node& node);
@@ -168,14 +188,10 @@ namespace Lemma {
 
             // ====================  LIFECYCLE     =======================
 
-            /** Default protected constructor. */
-            RectilinearGrid ( );
-
-            /** Protected DeDerializing constructor, use factory DeSerialize  method*/
-            RectilinearGrid (const YAML::Node& node);
+        private:
 
-            /** Default protected constructor. */
-            ~RectilinearGrid ();
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "RectilinearGrid";
 
             // ====================  DATA MEMBERS  =========================
 
@@ -206,11 +222,6 @@ namespace Lemma {
             /// Cell spacing in the z dimension
             VectorXr dz;
 
-        private:
-
-            /** ASCII string representation of the class name */
-            static constexpr auto CName = "RectilinearGrid";
-
     }; // -----  end of class  RectilinearGrid  -----
 
 }		// -----  end of Lemma  name  -----
@@ -218,4 +229,4 @@ namespace Lemma {
 #endif   // ----- #ifndef RECTILINEARGRID_INC  -----
 
 /* vim: set tabstop=4 expandtab: */
-/* vim: set filetype=cpp: */
+/* vim: set filetype=cpp syntax=cpp.doxygen: */

Modules/LemmaCore/include/RectilinearGridReader.h

@@ -36,16 +36,54 @@ namespace Lemma {
         friend std::ostream &operator<<(std::ostream &stream,
                 const RectilinearGridReader &ob);
 
+        /*
+         *  This key is used to lock the constructors
+         */
+        struct ctor_key {};
+
         public:
 
             // ====================  LIFECYCLE     =======================
 
+            /** Default constructor
+             * @note This method is locked
+             * @see NewSP
+             */
+            explicit RectilinearGridReader ( const ctor_key& );
+
+            /**
+             * DeSerializing constructor.
+             * @note This method is locked, and cannot be called directly.
+             *       The reason that the method is public is to enable the use
+             *       of make_shared whilst enforcing the use of shared_ptr,
+             *       in c++-17, this curiosity may be resolved.
+             * @see DeSerialize
+             */
+            explicit RectilinearGridReader ( const YAML::Node& node, const ctor_key& );
+
+            /** Default destructor.
+             *  @note This should never be called explicitly, use NewSP
+             */
+            ~RectilinearGridReader ( );
+
             /**
              *  Factory method for generating concrete class.
              *  @return a std::shared_ptr of type RectilinearGridReader
              */
             static std::shared_ptr< RectilinearGridReader > NewSP();
 
+            /**
+             *  Constructs an object from a YAML serialization
+             *  @return a std::shared_ptr of type RectilinearGridReader
+             */
+            static std::shared_ptr< RectilinearGridReader >  DeSerialize( const YAML::Node& node );
+
+            /**
+             *  Uses YAML to serialize this object.
+             *  @return a YAML::Node
+             */
+            virtual YAML::Node Serialize() const;
+
             // ====================  OPERATORS     =======================
 
             // ====================  OPERATIONS    =======================
@@ -84,12 +122,6 @@ namespace Lemma {
 
             // ====================  LIFECYCLE     =======================
 
-            /** Default protected constructor, use New */
-            RectilinearGridReader ( );
-
-            /** Default protected constructor, use Delete */
-            ~RectilinearGridReader ();
-
         private:
 
             // ====================  DATA MEMBERS  =========================
@@ -108,3 +140,7 @@ namespace Lemma {
 }		// -----  end of Lemma  name  -----
 
 #endif   // ----- #ifndef RECTILINEARGRIDREADER_INC  -----
+
+
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp syntax=cpp.doxygen: */

Modules/LemmaCore/include/RectilinearGridVTKExporter.h

@@ -45,22 +45,38 @@ class RectilinearGridVTKExporter : public LemmaObject {
     friend std::ostream &operator<<(std::ostream &stream,
             const RectilinearGridVTKExporter &ob);
 
+    struct ctor_key {};
+
     public:
 
     // ====================  LIFECYCLE     =======================
 
     /**
-     * @copybrief LemmaObject::New()
-     * @copydetails LemmaObject::New()
-     */
-    static RectilinearGridVTKExporter* New();
-
-    /**
      *  Factory method for generating concrete class.
      *  @return a std::shared_ptr of type RectilinearGridVTKExporter
      */
     static std::shared_ptr< RectilinearGridVTKExporter > NewSP();
 
+    /** Default constructor */
+    explicit RectilinearGridVTKExporter ( const ctor_key& );
+
+    /** Deserializing constructor */
+    explicit RectilinearGridVTKExporter ( const YAML::Node& node, const ctor_key& );
+
+    /** Default protected destructor, use Delete */
+    virtual ~RectilinearGridVTKExporter ();
+
+    /**
+     *  Uses YAML to serialize this object.
+     *  @return a YAML::Node
+     */
+    virtual YAML::Node Serialize() const;
+
+    /**
+     *   Constructs an object from a YAML::Node.
+     */
+    static std::shared_ptr< RectilinearGridVTKExporter > DeSerialize(const YAML::Node& node);
+
     // ====================  OPERATORS     =======================
 
     // ====================  OPERATIONS    =======================
@@ -93,12 +109,6 @@ class RectilinearGridVTKExporter : public LemmaObject {
 
     // ====================  LIFECYCLE     =======================
 
-    /** Default protected constructor, use New */
-    RectilinearGridVTKExporter ( );
-
-    /** Default protected destructor, use Delete */
-    ~RectilinearGridVTKExporter ();
-
     private:
 
     /** ASCII string representation of the class name */
@@ -122,3 +132,5 @@ class RectilinearGridVTKExporter : public LemmaObject {
 
 #endif   // ----- #ifndef RECTILINEARGRIDVTKEXPORTER_INC  -----
 
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp syntax=cpp.doxygen: */

Modules/LemmaCore/src/ASCIIParser.cpp

@@ -24,7 +24,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator << (std::ostream &stream, const ASCIIParser &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n---\n"; // End of doc
         return stream;
     }
 
@@ -33,7 +33,7 @@ namespace Lemma {
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
     //      Method:  ASCIIParser
-    // Description:  constructor (protected)
+    // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
     ASCIIParser::ASCIIParser ( const ctor_key& ) : LemmaObject( ), input(),
             CommentString("//"), BufferSize(255) {
@@ -217,4 +217,5 @@ namespace Lemma {
 
 }		// -----  end of Lemma  name  -----
 
-
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp syntax=cpp.doxygen: */

Modules/LemmaCore/src/CMakeLists.txt

@@ -5,9 +5,9 @@ set (SOURCE
 	${CMAKE_CURRENT_SOURCE_DIR}/ASCIIParser.cpp                # fixed, key 
 	${CMAKE_CURRENT_SOURCE_DIR}/CubicSplineInterpolator.cpp    # fixed, key 
 	${CMAKE_CURRENT_SOURCE_DIR}/Grid.cpp                       # ABC, no key 
-	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGrid.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGridReader.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGridVTKExporter.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGrid.cpp            # fixed, key
+	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGridReader.cpp      # fixed, key
+	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGridVTKExporter.cpp # fixed, key
 	${CMAKE_CURRENT_SOURCE_DIR}/Filter.cpp                     # ABC, no key
 	${CMAKE_CURRENT_SOURCE_DIR}/WindowFilter.cpp			   # fixed, key
 	${CMAKE_CURRENT_SOURCE_DIR}/EarthModel.cpp                 # ABC, no key

Modules/LemmaCore/src/RectilinearGrid.cpp

@@ -22,11 +22,11 @@ namespace Lemma {
 
     // ====================  LIFECYCLE     =======================
 
-    RectilinearGrid::RectilinearGrid( ) : Grid( ), nx(0), ny(0), nz(0) {
+    RectilinearGrid::RectilinearGrid( const ctor_key& ) : Grid( ), nx(0), ny(0), nz(0) {
 
     }
 
-    RectilinearGrid::RectilinearGrid( const YAML::Node& node ) : Grid(node) {
+    RectilinearGrid::RectilinearGrid( const YAML::Node& node, const ctor_key& ) : Grid(node) {
 
         nx = node["nx"].as<int>( );
         ny = node["ny"].as<int>( );
@@ -47,8 +47,7 @@ namespace Lemma {
     }
 
     std::shared_ptr< RectilinearGrid > RectilinearGrid::NewSP() {
-        std::shared_ptr<RectilinearGrid> sp(new  RectilinearGrid( ), LemmaObjectDeleter() );
-        return sp;
+        return std::make_shared< RectilinearGrid > ( ctor_key() );
     }
 
     YAML::Node RectilinearGrid::Serialize() const {
@@ -79,8 +78,7 @@ namespace Lemma {
         if (node.Tag() != "RectilinearGrid") {
             throw  DeSerializeTypeMismatch( "RectilinearGrid", node.Tag());
         }
-        std::shared_ptr<RectilinearGrid> Object(new  RectilinearGrid(node), LemmaObjectDeleter() );
-        return Object ;
+        return std::make_shared< RectilinearGrid > ( node, ctor_key() );
     }
 
 
@@ -212,4 +210,4 @@ namespace Lemma {
 }		// -----  end of Lemma  name  -----
 
 /* vim: set tabstop=4 expandtab: */
-/* vim: set filetype=cpp: */
+/* vim: set filetype=cpp: syntax=cpp.doxygen*/

Modules/LemmaCore/src/RectilinearGridReader.cpp

@@ -22,7 +22,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator << (std::ostream &stream, const RectilinearGridReader &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n---\n"; // End of doc
         return stream;
     }
 
@@ -31,13 +31,20 @@ namespace Lemma {
     //--------------------------------------------------------------------------------------
     //       Class:  RectilinearGridReader
     //      Method:  RectilinearGridReader
-    // Description:  constructor (protected)
+    // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
-    RectilinearGridReader::RectilinearGridReader ( ) : GridReader( ),
+    RectilinearGridReader::RectilinearGridReader ( const ctor_key& ) : GridReader( ),
         rGrid( nullptr ), Parser( nullptr ) {
 
     }  // -----  end of method RectilinearGridReader::RectilinearGridReader  (constructor)  -----
 
+    //--------------------------------------------------------------------------------------
+    //       Class:  RectilinearGridReader
+    //      Method:  RectilinearGridReader
+    // Description:  DeSerializing constructor (protected)
+    //--------------------------------------------------------------------------------------
+    RectilinearGridReader::RectilinearGridReader (const YAML::Node& node, const ctor_key&  key) : GridReader(node) {
+    }  // -----  end of method RectilinearGridReader::RectilinearGridReader  (constructor)  -----
 
     //--------------------------------------------------------------------------------------
     //       Class:  RectilinearGridReader
@@ -45,12 +52,9 @@ namespace Lemma {
     // Description:  constructor
     //--------------------------------------------------------------------------------------
     std::shared_ptr< RectilinearGridReader > RectilinearGridReader::NewSP() {
-        std::shared_ptr<RectilinearGridReader> sp(new  RectilinearGridReader( ), LemmaObjectDeleter() );
-        return sp;
+        return std::make_shared< RectilinearGridReader > ( ctor_key() );
     }
 
-
-
     //--------------------------------------------------------------------------------------
     //       Class:  RectilinearGridReader
     //      Method:  ~RectilinearGridReader
@@ -60,6 +64,29 @@ namespace Lemma {
     }  // -----  end of method RectilinearGridReader::~RectilinearGridReader  (destructor)  -----
 
     //--------------------------------------------------------------------------------------
+    //       Class:  ASCIIParser
+    //      Method:  Serialize
+    //--------------------------------------------------------------------------------------
+    YAML::Node  RectilinearGridReader::Serialize (  ) const {
+        YAML::Node node = GridReader::Serialize();;
+        node.SetTag( GetName() );
+        //node["CommentString"] = CommentString;
+        //node["BufferSize"] = BufferSize;
+        return node;
+    }		// -----  end of method ASCIIParser::Serialize  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  RectilinearGridReader
+    //      Method:  DeSerialize
+    //--------------------------------------------------------------------------------------
+    std::shared_ptr<RectilinearGridReader> RectilinearGridReader::DeSerialize ( const YAML::Node& node ) {
+        if (node.Tag() != "RectilinearGridReader") {
+            throw  DeSerializeTypeMismatch( "RectilinearGridReader", node.Tag());
+        }
+        return std::make_shared< RectilinearGridReader >( node, ctor_key() ); //, ctor_key() );
+    }		// -----  end of method ASCIIParser::DeSerialize  -----
+
+    //--------------------------------------------------------------------------------------
     //       Class:  RectilinearGridReader
     //      Method:  ReadASCIIGridFile
     //--------------------------------------------------------------------------------------

Modules/LemmaCore/src/RectilinearGridVTKExporter.cpp

@@ -12,7 +12,7 @@
  * @date      09/25/2013 08:20:14 AM
  * @version   $Id$
  * @author    Trevor Irons (ti)
- * @email     Trevor.Irons@xri-geo.com
+ * @email     tirons@egi.utah.edu
  * @copyright Copyright (c) 2013, Trevor Irons
  */
 
@@ -25,11 +25,10 @@ namespace Lemma {
 // ====================  FRIEND METHODS  =====================
 
 std::ostream &operator << (std::ostream &stream, const RectilinearGridVTKExporter &ob) {
-    stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+    stream << ob.Serialize()  << "\n---\n"; // End of doc
     return stream;
 }
 
-
 // ====================  LIFECYCLE     =======================
 
 //--------------------------------------------------------------------------------------
@@ -37,10 +36,20 @@ std::ostream &operator << (std::ostream &stream, const RectilinearGridVTKExporte
 //      Method:  RectilinearGridVTKExporter
 // Description:  constructor (protected)
 //--------------------------------------------------------------------------------------
-RectilinearGridVTKExporter::RectilinearGridVTKExporter ( ) : LemmaObject( ), Grid(nullptr), VTKGrid(nullptr) {
+RectilinearGridVTKExporter::RectilinearGridVTKExporter ( const ctor_key& ) : LemmaObject( ), Grid(nullptr), VTKGrid(nullptr) {
 
 }  // -----  end of method RectilinearGridVTKExporter::RectilinearGridVTKExporter  (constructor)  -----
 
+//--------------------------------------------------------------------------------------
+//       Class:  RectilinearGridVTKExporter
+//      Method:  RectilinearGridVTKExporter
+// Description:  DeSerializing constructor (protected)
+//--------------------------------------------------------------------------------------
+RectilinearGridVTKExporter::RectilinearGridVTKExporter (const YAML::Node& node, const ctor_key&  key) : LemmaObject(node) {
+    if (node["Grid"]) {
+        this->Grid = RectilinearGrid::DeSerialize( node["Grid"] );
+    }
+}  // -----  end of method RectilinearGridVTKExporter::RectilinearGridVTKExporter  (constructor)  -----
 
 //--------------------------------------------------------------------------------------
 //       Class:  RectilinearGridVTKExporter
@@ -48,12 +57,9 @@ RectilinearGridVTKExporter::RectilinearGridVTKExporter ( ) : LemmaObject( ), Gri
 // Description:  public constructor
 //--------------------------------------------------------------------------------------
 std::shared_ptr< RectilinearGridVTKExporter > RectilinearGridVTKExporter::NewSP() {
-    std::shared_ptr<RectilinearGridVTKExporter> sp(new  RectilinearGridVTKExporter( ), LemmaObjectDeleter() );
-    return sp;
+    return std::make_shared< RectilinearGridVTKExporter > ( ctor_key() );
 }
 
-
-
 //--------------------------------------------------------------------------------------
 //       Class:  RectilinearGridVTKExporter
 //      Method:  ~RectilinearGridVTKExporter
@@ -75,6 +81,30 @@ void RectilinearGridVTKExporter::SetGrid ( std::shared_ptr<RectilinearGrid> Grid
 
 //--------------------------------------------------------------------------------------
 //       Class:  RectilinearGridVTKExporter
+//      Method:  Serialize
+//--------------------------------------------------------------------------------------
+YAML::Node  RectilinearGridVTKExporter::Serialize (  ) const {
+    YAML::Node node = LemmaObject::Serialize();;
+    node.SetTag( GetName() );
+    if (Grid != nullptr) {
+        node["Grid"] = Grid->Serialize();
+    }
+    return node;
+}		// -----  end of method RectilinearGridVTKExporter::Serialize  -----
+
+//--------------------------------------------------------------------------------------
+//       Class:  RectilinearGridVTKExporter
+//      Method:  DeSerialize
+//--------------------------------------------------------------------------------------
+std::shared_ptr<RectilinearGridVTKExporter> RectilinearGridVTKExporter::DeSerialize ( const YAML::Node& node ) {
+    if (node.Tag() != "RectilinearGridVTKExporter") {
+        throw  DeSerializeTypeMismatch( "RectilinearGridVTKExporter", node.Tag());
+    }
+    return std::make_shared< RectilinearGridVTKExporter >( node, ctor_key() ); //, ctor_key() );
+}		// -----  end of method RectilinearGridVTKExporter::DeSerialize  -----
+
+//--------------------------------------------------------------------------------------
+//       Class:  RectilinearGridVTKExporter
 //      Method:  GetVTKRectilinearGrid
 //--------------------------------------------------------------------------------------
 vtkSmartPointer<vtkRectilinearGrid> RectilinearGridVTKExporter::GetVTKGrid (  ) {
@@ -140,8 +170,9 @@ void RectilinearGridVTKExporter::BuildVTKRectilinearGrid (  ) {
     return ;
 }		// -----  end of method RectilinearGridVTKExporter::BuildVTKRectilinearGrid  -----
 
-
-
 }		// -----  end of Lemma  name  -----
 
 #endif     // -----  not LEMMAUSEVTK  -----
+
+/* vim: set tabstop=4 expandtab: */
+/* vim: set filetype=cpp syntax=cpp.doxygen: */

Modules/LemmaCore/testing/SerializeCheck.h

@@ -26,6 +26,16 @@ class MyTestSuite : public CxxTest::TestSuite
 {
     public:
 
+//     void test_trace(void)
+//     {
+//         TS_TRACE("This is a test tracing message.");
+//     }
+//
+//     void test_warn(void)
+//     {
+//         TS_WARN("This is a test warning message.");
+//     }
+
     void testASCIIParser( void )
     {
         auto Obj = ASCIIParser::NewSP();
@@ -50,6 +60,14 @@ class MyTestSuite : public CxxTest::TestSuite
         TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
     }
 
+    void testRectilinearGridReader( void )
+    {
+        auto Obj = RectilinearGridReader::NewSP();
+        YAML::Node node = Obj->Serialize();
+        auto Obj2 = RectilinearGridReader::DeSerialize(node);
+        TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
+    }
+
     void testWindowFilter( void )
     {
         auto Obj = WindowFilter::NewSP();
@@ -58,21 +76,11 @@ class MyTestSuite : public CxxTest::TestSuite
         TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
     }
 
-// /*
-//     void testRectilinearGridReader( void )
-//     {
-//         auto Obj = RectilinearGridReader::NewSP();
-//         TS_ASSERT_EQUALS( Obj->GetName(), std::string("RectilinearGridReader") );
-//     }
-//
 //     void testRectilinearGridVTKExporter( void )
 //     {
 //         auto Obj = RectilinearGridVTKExporter::NewSP();
 //         TS_ASSERT_EQUALS( Obj->GetName(), std::string("RectilinearGridVTKExporter") );
 //     }
-//
-
-// */
 
 };
 

vim/c.vim

@@ -17,7 +17,7 @@ syn keyword nspace Lemma YAML Eigen
 
 " Lemma types
 highlight leType ctermfg=Yellow guifg=Yellow
-syn keyword leType HankelTransform KernelEm1D KernelEM1DManager DipoleSource EarthModel LayeredEarth LayeredEarthEM TEMSurvey TEMSurveyLine TEMSurveyLineRecord TEMInductiveReceiver PolygonalWireAntenna TEMTransmitter TEMReceiver Instrument InstrumentTem LemmaObject ReceiverPoints DCIPElectrode TEMSurveyData TEMSurveyLineData TEMSurveyLineRecordData  ASCIIParser CubicSplineInterpolator RectilinearGrid RectilinearGridReader RectilinearGridVTKExporter Filter WindowFilter DEMParticle DEMGrain Data DataReader
+syn keyword leType HankelTransform KernelEm1D KernelEM1DManager DipoleSource EarthModel LayeredEarth LayeredEarthEM TEMSurvey TEMSurveyLine TEMSurveyLineRecord TEMInductiveReceiver PolygonalWireAntenna TEMTransmitter TEMReceiver Instrument InstrumentTem LemmaObject ReceiverPoints DCIPElectrode TEMSurveyData TEMSurveyLineData TEMSurveyLineRecordData  ASCIIParser CubicSplineInterpolator RectilinearGrid GridReader RectilinearGridReader RectilinearGridVTKExporter Filter WindowFilter DEMParticle DEMGrain Data DataReader
 
 " Deprecated Lemma Types
 highlight dleType ctermfg=Blue guifg=Blue