Cleaned up class identifiers, removing explicit storage of class name which will help objects with huge counts.

LemmaCore/include/ASCIIParser.h

@@ -13,7 +13,6 @@
  * @version   $Id$
  * @author    Trevor Irons (ti)
  * @email     Trevor.Irons@xri-geo.com
- * @copyright Copyright (c) 2013, XRI Geophysics, LLC
  * @copyright Copyright (c) 2013, Trevor Irons
  */
 
@@ -100,6 +99,11 @@ class ASCIIParser : public LemmaObject {
      */
     int GetFileLocation();
 
+    /** Returns the name of the underlying class, similiar to Python's type */
+    virtual inline std::string GetName() const {
+        return CName;
+    }
+
     // ====================  INQUIRY       =======================
 
     protected:
@@ -107,7 +111,7 @@ class ASCIIParser : public LemmaObject {
     // ====================  LIFECYCLE     =======================
 
     /** Default protected constructor, use New */
-    ASCIIParser (const std::string& name);
+    ASCIIParser ( );
 
     /** Default protected destructor, use Delete */
     ~ASCIIParser ();
@@ -122,6 +126,9 @@ class ASCIIParser : public LemmaObject {
 
     // ====================  DATA MEMBERS  =========================
 
+    /** ASCII string representation of the class name */
+    static constexpr auto CName = "ASCIIParser";
+
     /** c++ style file IO */
     std::fstream input;
 

LemmaCore/include/CubicSplineInterpolator.h

@@ -131,12 +131,17 @@ class CubicSplineInterpolator : public LemmaObject {
 
     // ====================  INQUIRY       =======================
 
+    /** Returns the name of the underlying class, similiar to Python's type */
+    virtual inline std::string GetName() const {
+        return CName;
+    }
+
     protected:
 
     // ====================  LIFECYCLE     =======================
 
     /** Default protected constructor, use New */
-    CubicSplineInterpolator (const std::string& name);
+    CubicSplineInterpolator ( );
 
     /** Default protected destructor, smart pointers auto delete */
     ~CubicSplineInterpolator ();
@@ -161,6 +166,9 @@ class CubicSplineInterpolator : public LemmaObject {
 
     private:
 
+    /** ASCII string representation of the class name */
+    static constexpr auto CName = "CubicSplineInterpolator";
+
     SplineSet Spline;
 
     int ilo;

LemmaCore/include/Data.h

@@ -60,13 +60,17 @@ namespace Lemma {
 
             // ====================  INQUIRY       =======================
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return CName;
+            }
 
         protected:
 
             // ====================  LIFECYCLE     =======================
 
             /** Default protected constructor. */
-            Data (const std::string &name);
+            Data (  );
 
             /** Default protected constructor. */
             ~Data ();
@@ -75,6 +79,9 @@ namespace Lemma {
 
         private:
 
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "Data";
+
     }; // -----  end of class  Data  -----
 
 }       // -----  end of Lemma  name  -----

LemmaCore/include/DataReader.h

@@ -42,21 +42,28 @@ class DataReader : public LemmaObject {
         virtual Data* GetData()=0;
 
         // ====================  INQUIRY       =======================
+        /** Returns the name of the underlying class, similiar to Python's type */
+        virtual inline std::string GetName() const {
+            return CName;
+        }
 
     protected:
 
         // ====================  LIFECYCLE     =======================
 
         /// Default protected constructor.
-        DataReader (const std::string &name);
+        DataReader ( );
 
         /// Default protected constructor.
-        ~DataReader ();
+        ~DataReader ( );
 
         // ====================  DATA MEMBERS  =========================
 
     private:
 
+        /** ASCII string representation of the class name */
+        static constexpr auto CName = "DataReader";
+
 }; // -----  end of class  DataReader  -----
 
 }       // -----  end of Lemma  name  -----

LemmaCore/include/EarthModel.h

@@ -95,7 +95,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            EarthModel (const std::string& name);
+            EarthModel ( );
 
             /** Deserialize constructor */
             EarthModel (const YAML::Node& node);
@@ -105,6 +105,11 @@ namespace Lemma {
 
             // ====================  DATA MEMBERS  =========================
 
+        private:
+
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "EarthModel";
+
             /// Magnetic field, in units of nT
             Vector3r          BField;
 

LemmaCore/include/Filter.h

@@ -44,7 +44,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            Filter (const std::string& name);
+            Filter ( );
 
             /// Default protected constructor.
             ~Filter ();
@@ -53,6 +53,9 @@ namespace Lemma {
 
         private:
 
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "Filter";
+
     }; // -----  end of class  Filter  -----
 
 

LemmaCore/include/Grid.h

@@ -47,7 +47,7 @@ class Grid : public LemmaObject {
         // ====================  LIFECYCLE     ===================================
 
         /// Default protected constructor.
-        Grid (const std::string &name);
+        Grid ( );
 
         /// Default protected constructor.
         ~Grid ();
@@ -56,6 +56,9 @@ class Grid : public LemmaObject {
 
     private:
 
+        /** ASCII string representation of the class name */
+        static constexpr auto CName = "Grid";
+
 }; // -----  end of class  Grid  -----
 
 } // namespace Lemma

LemmaCore/include/GridReader.h

@@ -56,7 +56,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /** Default protected constructor, use New */
-            GridReader (const std::string& name) : LemmaObject(name) {
+            GridReader ( ) : LemmaObject( ) {
             }
 
             /** Default protected constructor, use Delete */

LemmaCore/include/Instrument.h

@@ -48,13 +48,16 @@ namespace Lemma {
 			// ====================  LIFECYCLE     ===========================
 
 			/// Default protected constructor.
-			Instrument (const std::string &name);
+			Instrument ( );
 
 			/// Default protected constructor.
 			~Instrument ();
 
 		private:
 
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "Instrument";
+
 	}; // -----  end of class  Instrument  -----
 
 }		// -----  end of Lemma  name  -----

LemmaCore/include/LayeredEarth.h

@@ -90,7 +90,7 @@ namespace Lemma {
 			// ====================  LIFECYCLE     ===========================
 
 			/** Default protected constructor. */
-			LayeredEarth (const std::string& name);
+			LayeredEarth ( );
 
             /** Default protected constructor. */
 			LayeredEarth (const YAML::Node& node);
@@ -100,6 +100,10 @@ namespace Lemma {
 
 			// ====================  DATA MEMBERS  ===========================
 
+        private:
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "LayeredEarth";
+
 			/** Number of layers in the model, including the air layer,
 			 * and counting from 0
              */

LemmaCore/include/LemmaObject.h

@@ -57,8 +57,10 @@ class LemmaObject {
 
         // ====================  INQUIRY       ==============================
 
-        /** Returns the name of the class, similiar to Python's type */
-        std::string GetName() const;
+        /** Returns the name of the underlying class, similiar to Python's type */
+        virtual inline std::string GetName() const {
+            return this->CName;
+        }
 
         /**
          *  Uses YAML to serialize this object.
@@ -73,6 +75,7 @@ class LemmaObject {
          */
         virtual YAML::Node Serialize() const {
             YAML::Node node = YAML::Node();
+            node.SetTag( GetName() );
             std::time_t now = std::chrono::system_clock::to_time_t( std::chrono::system_clock::now() );
             node["Serialized"] = std::ctime(&now);
             return node;
@@ -85,7 +88,7 @@ class LemmaObject {
         /** Protected default constructor. This is an abstract class and
          *  cannot be instantiated.
          */
-        LemmaObject (const std::string &name);
+        LemmaObject ( );
 
         /** Protected DeDerializing constructor, use factory DeSerialize  method*/
         LemmaObject (const YAML::Node& node);
@@ -99,10 +102,8 @@ class LemmaObject {
 
         // ====================  DATA MEMBERS  ==============================
 
-        static const std::string  CName;
-
-        /** Stores an ASCII string representation of the class name */
-        std::string Name;
+        /** ASCII string representation of the class name */
+        static constexpr auto CName = "LemmaObject";
 
 }; // -----  end of class  LemmaObject  -----
 
@@ -112,13 +113,6 @@ class LemmaObjectDeleter
         void operator()(LemmaObject* p) { delete p; }
 };
 
-//     /////////////////////////////////////////////////////////////////
-//     // BOILERPLATE MACROS
-//     #define DESERIALIZECHECK( node, Object ) { \
-//         if (node.Tag() != Object->GetName()) {  \
-//             throw  DeSerializeTypeMismatch(Object, node.Tag()) ; \
-//         } } \
-
     /////////////////////////////////////////////////////////////////
     // Error Classes
 

LemmaCore/include/RectilinearGrid.h

@@ -146,7 +146,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            RectilinearGrid (const std::string &name);
+            RectilinearGrid ( );
 
             /// Default protected constructor.
             ~RectilinearGrid ();
@@ -219,6 +219,10 @@ namespace Lemma {
 */
         private:
 
+
+        /** ASCII string representation of the class name */
+        static constexpr auto CName = "RectilinearGrid";
+
     }; // -----  end of class  RectilinearGrid  -----
 
 }		// -----  end of Lemma  name  -----

LemmaCore/include/RectilinearGridReader.h

@@ -78,7 +78,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /** Default protected constructor, use New */
-            RectilinearGridReader (const std::string& name);
+            RectilinearGridReader ( );
 
             /** Default protected constructor, use Delete */
             ~RectilinearGridReader ();
@@ -87,6 +87,9 @@ namespace Lemma {
 
             // ====================  DATA MEMBERS  =========================
 
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "RectilinearGridReader";
+
             /** Object holding constructed Grid */
             std::shared_ptr<RectilinearGrid> rGrid;
 

LemmaCore/include/RectilinearGridVTKExporter.h

@@ -88,13 +88,16 @@ class RectilinearGridVTKExporter : public LemmaObject {
     // ====================  LIFECYCLE     =======================
 
     /** Default protected constructor, use New */
-    RectilinearGridVTKExporter (const std::string& name);
+    RectilinearGridVTKExporter ( );
 
     /** Default protected destructor, use Delete */
     ~RectilinearGridVTKExporter ();
 
     private:
 
+    /** ASCII string representation of the class name */
+    static constexpr auto CName = "VTKRectilinearGridVTKExporter";
+
     void BuildVTKRectilinearGrid();
 
     // ====================  DATA MEMBERS  =========================

LemmaCore/include/WindowFilter.h

@@ -81,10 +81,10 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            WindowFilter (const std::string& name);
+            WindowFilter ( );
 
             /// Default protected constructor.
-            ~WindowFilter ();
+            ~WindowFilter ( );
 
             // ====================  DATA MEMBERS  =========================
 
@@ -111,6 +111,9 @@ namespace Lemma {
 
         private:
 
+        /** ASCII string representation of the class name */
+        static constexpr auto CName = "WindowFilter";
+
     }; // -----  end of class  WindowFilter  -----
 
 }       // -----  end of Lemma  name  -----

LemmaCore/src/ASCIIParser.cpp

@@ -13,7 +13,6 @@
  * @version   $Id$
  * @author    Trevor Irons (ti)
  * @email     Trevor.Irons@xri-geo.com
- * @copyright Copyright (c) 2013, XRI Geophysics, LLC
  * @copyright Copyright (c) 2013, Trevor Irons
  */
 
@@ -36,7 +35,7 @@ namespace Lemma {
     //      Method:  ASCIIParser
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    ASCIIParser::ASCIIParser (const std::string& name) : LemmaObject(name),
+    ASCIIParser::ASCIIParser ( ) : LemmaObject( ),
             CommentString("//"), BufferSize(255) {
 
     }  // -----  end of method ASCIIParser::ASCIIParser  (constructor)  -----
@@ -48,8 +47,9 @@ namespace Lemma {
     // Description:  public smart pointer factory constructor
     //--------------------------------------------------------------------------------------
     std::shared_ptr< ASCIIParser > ASCIIParser::NewSP() {
-        std::shared_ptr<ASCIIParser> sp(new  ASCIIParser("ASCIIParser"), LemmaObjectDeleter() );
+        std::shared_ptr<ASCIIParser> sp(new  ASCIIParser( ), LemmaObjectDeleter() );
         return sp;
+        //return  std::make_shared<ASCIIParser>();
     }
 
     //--------------------------------------------------------------------------------------

LemmaCore/src/CubicSplineInterpolator.cpp

@@ -13,7 +13,6 @@
  * @version   $Id$
  * @author    Trevor Irons (ti)
  * @email     Trevor.Irons@xri-geo.com
- * @copyright Copyright (c) 2014, XRI GeophysiSpline, LLC
  * @copyright Copyright (c) 2014, Trevor Irons
  */
 
@@ -41,7 +40,7 @@ namespace Lemma {
     //      Method:  CubicSplineInterpolator
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    CubicSplineInterpolator::CubicSplineInterpolator (const std::string& name) : LemmaObject(name) {
+    CubicSplineInterpolator::CubicSplineInterpolator ( ) : LemmaObject( ) {
 
     }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
@@ -52,7 +51,7 @@ namespace Lemma {
     // Description:  public constructor
     //--------------------------------------------------------------------------------------
     std::shared_ptr<CubicSplineInterpolator> CubicSplineInterpolator::NewSP() {
-        std::shared_ptr<CubicSplineInterpolator> sp(new  CubicSplineInterpolator("CubicSplineInterpolator"), LemmaObjectDeleter() );
+        std::shared_ptr<CubicSplineInterpolator> sp(new  CubicSplineInterpolator( ), LemmaObjectDeleter() );
         return sp;
     }
 

LemmaCore/src/Data.cpp

@@ -20,7 +20,7 @@ namespace Lemma {
         return stream;
     }
 
-	Data::Data(const std::string &name) : LemmaObject(name) {
+	Data::Data(  ) : LemmaObject( ) {
 	}
 
 

LemmaCore/src/DataReader.cpp

@@ -20,8 +20,7 @@ namespace Lemma {
         return stream;
     }
 
-	DataReader::DataReader(const std::string &name) :
-			LemmaObject(name) {
+	DataReader::DataReader( ) : LemmaObject( ) {
 	}
 
 	DataReader::~DataReader() {

LemmaCore/src/EarthModel.cpp

@@ -22,8 +22,8 @@ namespace Lemma {
 
 	// ====================  LIFECYCLE     =======================
 
-	EarthModel::EarthModel(const std::string&name) :
-			LemmaObject(name), BField(0,0,0), BFieldUnit(0,0,0), BInc(0), BDec(0), BMag(0) {
+	EarthModel::EarthModel() : LemmaObject( ),
+        BField(0,0,0), BFieldUnit(0,0,0), BInc(0), BDec(0), BMag(0) {
 	}
 
     EarthModel::EarthModel(const YAML::Node& node) : LemmaObject(node) {

LemmaCore/src/Filter.cpp

@@ -15,7 +15,7 @@
 
 namespace Lemma {
 
-    Filter::Filter(const std::string& name) : LemmaObject(name) { }
+    Filter::Filter( ) : LemmaObject( ) { }
 
     Filter::~Filter( ) { }
 

LemmaCore/src/Grid.cpp

@@ -21,7 +21,7 @@ namespace Lemma {
     }
 
 
-	Grid::Grid  ( const std::string& name ) : LemmaObject(name) {
+	Grid::Grid( ) : LemmaObject( ) {
 	}
 
 	Grid::~Grid  ( ) {

LemmaCore/src/Instrument.cpp

@@ -20,8 +20,7 @@ namespace Lemma {
         return stream;
     }
 
-	Instrument::Instrument(const std::string &name) :
-			LemmaObject(name) {
+	Instrument::Instrument( ) : LemmaObject() {
 	}
 
 	Instrument::~Instrument() {

LemmaCore/src/LayeredEarth.cpp

@@ -34,8 +34,7 @@ namespace Lemma {
 
 	// ====================  LIFECYCLE     ===================================
 
-	LayeredEarth::LayeredEarth(const std::string&name) :
-		EarthModel(name),
+	LayeredEarth::LayeredEarth( ) : EarthModel( ),
 		NumberOfLayers(0), 	NumberOfInterfaces(0) {
 	}
 

LemmaCore/src/LemmaObject.cpp

@@ -15,8 +15,6 @@
 
 namespace Lemma {
 
-    //LemmaObject::CName = std::string("LemmaObject");
-
     YAML::Emitter& operator << (YAML::Emitter& out, const LemmaObject& ob) {
         out << YAML::BeginMap;
         out << YAML::Key <<"Class Name"    << YAML::Value << ob.GetName();
@@ -26,10 +24,12 @@ namespace Lemma {
     // ====================  LIFECYCLE     ==============================
 
     // Constructor
-    LemmaObject::LemmaObject(const std::string& name) : Name(name) {
+    LemmaObject::LemmaObject(  ) {
+
     }
 
-    LemmaObject::LemmaObject(const YAML::Node &node) : Name(node.Tag()) {
+    LemmaObject::LemmaObject(const YAML::Node &node) {
+
     }
 
     // Destructor
@@ -40,10 +40,6 @@ namespace Lemma {
 
     // ====================  INQUIRY       ==============================
 
-    std::string LemmaObject::GetName() const {
-        return Name;
-    }
-
     // ====================  ACCESS        ==============================
 
     // ====================  ACCESS        ==============================

LemmaCore/src/RectilinearGrid.cpp

@@ -35,8 +35,7 @@ namespace Lemma {
 
     // ====================  LIFECYCLE     =======================
 
-    RectilinearGrid::RectilinearGrid(const std::string& name) :
-        Grid(name), nx(0), ny(0), nz(0) {
+    RectilinearGrid::RectilinearGrid( ) : Grid( ), nx(0), ny(0), nz(0) {
 
     }
 
@@ -45,7 +44,7 @@ namespace Lemma {
     }
 
     std::shared_ptr< RectilinearGrid > RectilinearGrid::NewSP() {
-        std::shared_ptr<RectilinearGrid> sp(new  RectilinearGrid("RectilinearGrid"), LemmaObjectDeleter() );
+        std::shared_ptr<RectilinearGrid> sp(new  RectilinearGrid( ), LemmaObjectDeleter() );
         return sp;
     }
 

LemmaCore/src/RectilinearGridReader.cpp

@@ -33,7 +33,7 @@ namespace Lemma {
     //      Method:  RectilinearGridReader
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    RectilinearGridReader::RectilinearGridReader (const std::string& name) : GridReader(name),
+    RectilinearGridReader::RectilinearGridReader ( ) : GridReader( ),
         rGrid( nullptr ), Parser( nullptr ) {
 
     }  // -----  end of method RectilinearGridReader::RectilinearGridReader  (constructor)  -----
@@ -45,7 +45,7 @@ namespace Lemma {
     // Description:  constructor
     //--------------------------------------------------------------------------------------
     std::shared_ptr< RectilinearGridReader > RectilinearGridReader::NewSP() {
-        std::shared_ptr<RectilinearGridReader> sp(new  RectilinearGridReader("RectilinearGridReader"), LemmaObjectDeleter() );
+        std::shared_ptr<RectilinearGridReader> sp(new  RectilinearGridReader( ), LemmaObjectDeleter() );
         return sp;
     }
 

LemmaCore/src/RectilinearGridVTKExporter.cpp

@@ -13,7 +13,6 @@
  * @version   $Id$
  * @author    Trevor Irons (ti)
  * @email     Trevor.Irons@xri-geo.com
- * @copyright Copyright (c) 2013, XRI Geophysics, LLC
  * @copyright Copyright (c) 2013, Trevor Irons
  */
 
@@ -38,8 +37,7 @@ std::ostream &operator << (std::ostream &stream, const RectilinearGridVTKExporte
 //      Method:  RectilinearGridVTKExporter
 // Description:  constructor (protected)
 //--------------------------------------------------------------------------------------
-RectilinearGridVTKExporter::RectilinearGridVTKExporter (const std::string& name) :
-    LemmaObject(name), Grid(nullptr), VTKGrid(nullptr) {
+RectilinearGridVTKExporter::RectilinearGridVTKExporter ( ) : LemmaObject( ), Grid(nullptr), VTKGrid(nullptr) {
 
 }  // -----  end of method RectilinearGridVTKExporter::RectilinearGridVTKExporter  (constructor)  -----
 
@@ -50,7 +48,7 @@ RectilinearGridVTKExporter::RectilinearGridVTKExporter (const std::string& name)
 // Description:  public constructor
 //--------------------------------------------------------------------------------------
 std::shared_ptr< RectilinearGridVTKExporter > RectilinearGridVTKExporter::NewSP() {
-    std::shared_ptr<RectilinearGridVTKExporter> sp(new  RectilinearGridVTKExporter("RectilinearGridVTKExporter"), LemmaObjectDeleter() );
+    std::shared_ptr<RectilinearGridVTKExporter> sp(new  RectilinearGridVTKExporter( ), LemmaObjectDeleter() );
     return sp;
 }
 

LemmaCore/src/WindowFilter.cpp

@@ -17,12 +17,12 @@ namespace Lemma {
 
     // ====================  LIFECYCLE     =======================
 
-    WindowFilter::WindowFilter(const std::string& name) : Filter(name),
+    WindowFilter::WindowFilter( ) : Filter( ),
         Width(0), SamplingRate(0), Bandwidth(0), Coefficients(),
         Type(RECTANGULAR) {}
 
     std::shared_ptr< WindowFilter > WindowFilter::NewSP() {
-        std::shared_ptr<WindowFilter> sp(new  WindowFilter("WindowFilter"), LemmaObjectDeleter() );
+        std::shared_ptr<WindowFilter> sp(new  WindowFilter( ), LemmaObjectDeleter() );
         return sp;
     }