Deciding on design changes wrt. allowing stack allocation?

Modules/LemmaCore/examples/CMakeLists.txt

@@ -27,7 +27,11 @@
 #add_executable( femforward  femforward.cpp )
 #target_link_libraries(femforward "lemmacore")
 
+add_executable( CubicSplineInterpolator  CubicSplineInterpolator.cpp )
+target_link_libraries(CubicSplineInterpolator "lemmacore")
+
 add_executable( filter  filter.cpp )
 target_link_libraries(filter "lemmacore")
 
 
+

Modules/LemmaCore/examples/CubicSplineInterpolator.cpp

@@ -0,0 +1,36 @@
+/* This file is part of Lemma, a geophysical modelling and inversion API.
+ * More information is available at http://lemmasoftware.org
+ */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/**
+ * @file
+ * @date      09/21/2016 10:24:57 AM
+ * @version   $Id$
+ * @author    Trevor Irons (ti)
+ * @email     tirons@egi.utah.edu
+ * @copyright Copyright (c) 2016, University of Utah
+ * @copyright Copyright (c) 2016, Trevor Irons & Lemma Software, LLC
+ */
+
+#include "CubicSplineInterpolator.h"
+#include "ASCIIParser.h"
+using namespace Lemma;
+
+int main() {
+    auto Spline = CubicSplineInterpolator::NewSP();
+    //auto Spline2 = CubicSplineInterpolator();
+    auto Parser = ASCIIParser::NewSP();
+    //ASCIIParser Parser2 = ASCIIParser();
+    //    Parser2.SetCommentString( "#");
+    //auto Parser3 = ASCIIParser(Parser2);
+
+    std::cout << *Parser << std::endl;
+    //std::cout << Parser2 << std::endl;
+    //std::cout << Parser3 << std::endl;
+}
+

Modules/LemmaCore/include/ASCIIParser.h

@@ -34,10 +34,21 @@ class ASCIIParser : public LemmaObject {
     friend std::ostream &operator<<(std::ostream &stream,
             const ASCIIParser &ob);
 
+    struct ctor_cookie {};
+
     public:
 
     // ====================  LIFECYCLE     =======================
 
+    /** Default constructor */
+    explicit ASCIIParser ( const ctor_cookie& );
+
+    /** Constructor using YAML::Node */
+    ASCIIParser ( const YAML::Node& node, const ctor_cookie& );
+
+    /** Default  destructor */
+    virtual ~ASCIIParser ();
+
     /**
      *  Factory method for generating concrete class.
      *  @return a std::shared_ptr of type ASCIIParser
@@ -121,22 +132,8 @@ class ASCIIParser : public LemmaObject {
 
     protected:
 
-    // ====================  LIFECYCLE     =======================
-
-    /** Default protected constructor, use New */
-    ASCIIParser ( );
-
-    /** Constructor using YAML::Node */
-    ASCIIParser ( const YAML::Node& node );
-
-    /** Default protected destructor, use Delete */
-    ~ASCIIParser ();
-
-    /**
-     *  @copybrief   LemmaObject::Release()
-     *  @copydetails LemmaObject::Release()
-     */
-    void Release();
+    /** Copy constructor */
+    ASCIIParser( const ASCIIParser& ) = delete;
 
     private:
 

Modules/LemmaCore/include/CubicSplineInterpolator.h

@@ -62,10 +62,21 @@ class CubicSplineInterpolator : public LemmaObject {
     friend std::ostream &operator<<(std::ostream &stream,
             const CubicSplineInterpolator &ob);
 
+    struct ctor_cookie {};
+
     public:
 
     // ====================  LIFECYCLE     =======================
 
+    /** Default constructor */
+    explicit CubicSplineInterpolator ( const ctor_cookie& );
+
+    /** DeSerializing constructor, usees factory DeSerialize  method*/
+    CubicSplineInterpolator ( const YAML::Node& node, const ctor_cookie& );
+
+    /** Destructor use smart pointers to auto delete */
+    virtual ~CubicSplineInterpolator ();
+
     /**
      *  Factory method for generating concrete class.
      *  @return a std::shared_ptr of type CubicSplineInterpolator
@@ -149,23 +160,6 @@ class CubicSplineInterpolator : public LemmaObject {
 
     protected:
 
-    // ====================  LIFECYCLE     =======================
-
-    /** 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 ();
-
-    /**
-     *  @copybrief   LemmaObject::Release()
-     *  @copydetails LemmaObject::Release()
-     */
-    void Release();
-
     // ====================  OPERATIONS    =======================
 
     /** Finds the interval of knots in spline to use for integration.

Modules/LemmaCore/include/LemmaObject.h

@@ -95,7 +95,7 @@ class LemmaObject {
          */
         LemmaObject ( );
 
-        /** Protected DeDerializing constructor, use factory DeSerialize  method*/
+        /** Protected DeSerializing constructor */
         LemmaObject (const YAML::Node& node);
 
         /** Protected default destructor. This is an abstract class and

Modules/LemmaCore/src/ASCIIParser.cpp

@@ -35,7 +35,7 @@ namespace Lemma {
     //      Method:  ASCIIParser
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    ASCIIParser::ASCIIParser ( ) : LemmaObject( ),
+    ASCIIParser::ASCIIParser ( const ctor_cookie& ) : LemmaObject( ), input(),
             CommentString("//"), BufferSize(255) {
 
     }  // -----  end of method ASCIIParser::ASCIIParser  (constructor)  -----
@@ -47,9 +47,9 @@ namespace Lemma {
     // Description:  public smart pointer factory constructor
     //--------------------------------------------------------------------------------------
     std::shared_ptr< ASCIIParser > ASCIIParser::NewSP() {
-        std::shared_ptr<ASCIIParser> sp(new  ASCIIParser( ), LemmaObjectDeleter() );
-        return sp;
-        //return  std::make_shared<ASCIIParser>();
+        //std::shared_ptr<ASCIIParser> sp(new  ASCIIParser( ), LemmaObjectDeleter() );
+        //return sp;
+        return  std::make_shared<ASCIIParser>( ctor_cookie() );
     }
 
     //--------------------------------------------------------------------------------------
@@ -68,12 +68,12 @@ namespace Lemma {
     //       Class:  ASCIIParser
     //      Method:  DeSerialize
     //--------------------------------------------------------------------------------------
-    std::shared_ptr<ASCIIParser> ASCIIParser::DeSerialize ( const YAML::Node& node  ) {
+    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 ;
+        //std::shared_ptr<ASCIIParser> Object(new  ASCIIParser(node), LemmaObjectDeleter() );
+        return std::make_shared< ASCIIParser >( node, ctor_cookie() );
     }		// -----  end of method ASCIIParser::DeSerialize  -----
 
     //--------------------------------------------------------------------------------------
@@ -85,27 +85,30 @@ namespace Lemma {
 
     }  // -----  end of method ASCIIParser::~ASCIIParser  (destructor)  -----
 
+/*
+    //--------------------------------------------------------------------------------------
+    //       Class:  ASCIIParser
+    //      Method:  ASCIIParser(ASCIIParser)
+    // Description:  copy
+    //--------------------------------------------------------------------------------------
+    ASCIIParser::ASCIIParser ( const ASCIIParser& cp ) {
+        //input = cp.input; // Problem line
+        CommentString = cp.CommentString;
+        BufferSize = cp.BufferSize;
+    }  // -----  end of method ASCIIParser::~ASCIIParser  (destructor)  -----
+*/
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
     //      Method:  ASCIIParser
     // Description:  DeSerializing constructor (protected)
     //--------------------------------------------------------------------------------------
-    ASCIIParser::ASCIIParser (const YAML::Node& node) : LemmaObject(node) {
+    ASCIIParser::ASCIIParser (const YAML::Node& node, const ctor_cookie& ) : 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)
-    //--------------------------------------------------------------------------------------
-    void ASCIIParser::Release() {
-        delete this;
-    }
-
-    //--------------------------------------------------------------------------------------
-    //       Class:  ASCIIParser
     //      Method:  Open
     //--------------------------------------------------------------------------------------
     void ASCIIParser::Open ( const std::string& fname ) {

Modules/LemmaCore/src/CMakeLists.txt

@@ -1,14 +1,14 @@
 set (SOURCE 
 	${SOURCE}
 	${CMAKE_CURRENT_SOURCE_DIR}/helper.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/ASCIIParser.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/CubicSplineInterpolator.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/LemmaObject.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/ASCIIParser.cpp                # fixed 
+	${CMAKE_CURRENT_SOURCE_DIR}/CubicSplineInterpolator.cpp    # fixed, cookie 
 	${CMAKE_CURRENT_SOURCE_DIR}/Data.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/DataReader.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/EarthModel.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/Instrument.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarth.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/LemmaObject.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/Grid.cpp       
 	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGrid.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/RectilinearGridReader.cpp

Modules/LemmaCore/src/CubicSplineInterpolator.cpp

@@ -40,7 +40,7 @@ namespace Lemma {
     //      Method:  CubicSplineInterpolator
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    CubicSplineInterpolator::CubicSplineInterpolator ( ) : LemmaObject( ) {
+    CubicSplineInterpolator::CubicSplineInterpolator ( const ctor_cookie& ) : LemmaObject( ) {
 
     }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
@@ -49,7 +49,7 @@ namespace Lemma {
     //      Method:  CubicSplineInterpolator
     // Description:  DeSerializing constructor (protected)
     //--------------------------------------------------------------------------------------
-    CubicSplineInterpolator::CubicSplineInterpolator (const YAML::Node& node) : LemmaObject(node) {
+    CubicSplineInterpolator::CubicSplineInterpolator (const YAML::Node& node, const ctor_cookie& ) : LemmaObject(node) {
     }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
     //--------------------------------------------------------------------------------------
@@ -58,8 +58,9 @@ namespace Lemma {
     // Description:  public constructor
     //--------------------------------------------------------------------------------------
     std::shared_ptr<CubicSplineInterpolator> CubicSplineInterpolator::NewSP() {
-        std::shared_ptr<CubicSplineInterpolator> sp(new  CubicSplineInterpolator( ), LemmaObjectDeleter() );
-        return sp;
+        //std::shared_ptr<CubicSplineInterpolator> sp(new  CubicSplineInterpolator( CubicSplineInterpolator::ctor_cookie ), LemmaObjectDeleter() );
+        //return sp;
+        return std::make_shared<CubicSplineInterpolator>( ctor_cookie() );
     }
 
     //--------------------------------------------------------------------------------------
@@ -81,8 +82,9 @@ namespace Lemma {
         if (node.Tag() != "CubicSplineInterpolator") {
             throw  DeSerializeTypeMismatch( "CubicSplineInterpolator", node.Tag());
         }
-        std::shared_ptr<CubicSplineInterpolator> Object(new  CubicSplineInterpolator(node), LemmaObjectDeleter() );
-        return Object ;
+        //std::shared_ptr<CubicSplineInterpolator> Object(new  CubicSplineInterpolator(node), LemmaObjectDeleter() );
+        //return Object ;
+        return std::make_shared<CubicSplineInterpolator>( node, ctor_cookie() );
     }
 
     //--------------------------------------------------------------------------------------
@@ -94,14 +96,6 @@ namespace Lemma {
 
     }  // -----  end of method CubicSplineInterpolator::~CubicSplineInterpolator  (destructor)  -----
 
-    //--------------------------------------------------------------------------------------
-    //       Class:  CubicSplineInterpolator
-    //      Method:  Release
-    // Description:  destructor (protected)
-    //--------------------------------------------------------------------------------------
-    void CubicSplineInterpolator::Release() {
-        delete this;
-    }
 
     // ====================  OPERATIONS    =======================