Cleaning up, more.

CMakeLists.txt

@@ -140,8 +140,8 @@ if ( LEMMA_VTK6_SUPPORT )
 	include(${VTK_USE_FILE}) 
 	add_compile_options(-DLEMMAUSEVTK) 
 	# Compile Matplot_vtk if VTK is present
-	add_subdirectory(Matplot_vtk)	
-	include_directories ("${PROJECT_SOURCE_DIR}/Matplot_vtk")
+	#add_subdirectory(Matplot_vtk)	
+	#include_directories ("${PROJECT_SOURCE_DIR}/Matplot_vtk")
 endif()
 
 option (LEMMA_VTK7_SUPPORT "VTK library for visualisation and grids" OFF)
@@ -154,8 +154,8 @@ if ( LEMMA_VTK7_SUPPORT )
 	include(${VTK_USE_FILE}) 
 	add_compile_options(-DLEMMAUSEVTK) 
 	# Compile Matplot_vtk if VTK is present
-	add_subdirectory(Matplot_vtk)	
-	include_directories ("${PROJECT_SOURCE_DIR}/Matplot_vtk")
+	#add_subdirectory(Matplot_vtk)	
+	#include_directories ("${PROJECT_SOURCE_DIR}/Matplot_vtk")
 endif()
 
 #####################

Modules/LemmaCore/CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 # Linking
 if ( LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT ) 
 	target_link_libraries(lemmacore ${VTK_LIBRARIES})
-	target_link_libraries(lemmacore "matplot")
+#	target_link_libraries(lemmacore "matplot")
 endif()
 
 target_link_libraries(lemmacore "yaml-cpp")

Modules/LemmaCore/examples/CubicSplineInterpolator.cpp

@@ -22,14 +22,26 @@
 using namespace Lemma;
 
 int main() {
-    auto Spline = CubicSplineInterpolator::NewSP();
+    //auto Spline = CubicSplineInterpolator::NewSP();
     //auto Spline2 = CubicSplineInterpolator();
     auto Parser = ASCIIParser::NewSP();
     //ASCIIParser Parser2 = ASCIIParser();
     //    Parser2.SetCommentString( "#");
     //auto Parser3 = ASCIIParser(Parser2);
+//    auto Parser3 = *Parser;
+
+    //std::cout << Parser3;
+
+    //std::cout << *Parser << std::endl;
+    //YAML::Node node = Parser->Serialize();
+    //std::cout << node << std::endl;
+    //auto Obj2 = ASCIIParser::DeSerialize(Parser->Serialize());
+    //std::cout << *Obj2 << std::endl;
+
+
+//    std::cout << "string " << Parser->GetName() << "\t" << Obj2->GetName() << "\n";
+//         TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
 
-    std::cout << *Parser << std::endl;
     //std::cout << Parser2 << std::endl;
     //std::cout << Parser3 << std::endl;
 }

Modules/LemmaCore/include/ASCIIParser.h

@@ -34,17 +34,17 @@ class ASCIIParser : public LemmaObject {
     friend std::ostream &operator<<(std::ostream &stream,
             const ASCIIParser &ob);
 
-    struct ctor_cookie {};
+    struct ctor_key {};
 
     public:
 
     // ====================  LIFECYCLE     =======================
 
     /** Default constructor */
-    explicit ASCIIParser ( const ctor_cookie& );
+    explicit ASCIIParser ( const ctor_key& );
 
     /** Constructor using YAML::Node */
-    ASCIIParser ( const YAML::Node& node, const ctor_cookie& );
+    ASCIIParser ( const YAML::Node& node, const ctor_key& );
 
     /** Default  destructor */
     virtual ~ASCIIParser ();
@@ -132,11 +132,11 @@ class ASCIIParser : public LemmaObject {
 
     protected:
 
+    private:
+
     /** Copy constructor */
     ASCIIParser( const ASCIIParser& ) = delete;
 
-    private:
-
     // ====================  DATA MEMBERS  =========================
 
     /** ASCII string representation of the class name */

Modules/LemmaCore/include/CubicSplineInterpolator.h

@@ -62,17 +62,17 @@ class CubicSplineInterpolator : public LemmaObject {
     friend std::ostream &operator<<(std::ostream &stream,
             const CubicSplineInterpolator &ob);
 
-    struct ctor_cookie {};
+    struct ctor_key {};
 
     public:
 
     // ====================  LIFECYCLE     =======================
 
     /** Default constructor */
-    explicit CubicSplineInterpolator ( const ctor_cookie& );
+    explicit CubicSplineInterpolator ( const ctor_key& );
 
     /** DeSerializing constructor, usees factory DeSerialize  method*/
-    CubicSplineInterpolator ( const YAML::Node& node, const ctor_cookie& );
+    CubicSplineInterpolator ( const YAML::Node& node, const ctor_key& );
 
     /** Destructor use smart pointers to auto delete */
     virtual ~CubicSplineInterpolator ();
@@ -168,6 +168,9 @@ class CubicSplineInterpolator : public LemmaObject {
 
     private:
 
+    /** Copy */
+    CubicSplineInterpolator( const CubicSplineInterpolator& ) = delete;
+
     /** ASCII string representation of the class name */
     static constexpr auto CName = "CubicSplineInterpolator";
 

Modules/LemmaCore/include/LemmaObject.h

@@ -98,6 +98,8 @@ class LemmaObject {
         /** Protected DeSerializing constructor */
         LemmaObject (const YAML::Node& node);
 
+        LemmaObject( const LemmaObject& ) = delete;
+
         /** Protected default destructor. This is an abstract class and
          *  cannot be instantiated. Virtual is necessary so that if base class destructor is
          *  called, we get the right behaviour.

Modules/LemmaCore/src/ASCIIParser.cpp

@@ -35,7 +35,7 @@ namespace Lemma {
     //      Method:  ASCIIParser
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    ASCIIParser::ASCIIParser ( const ctor_cookie& ) : LemmaObject( ), input(),
+    ASCIIParser::ASCIIParser ( const ctor_key& ) : LemmaObject( ), input(),
             CommentString("//"), BufferSize(255) {
 
     }  // -----  end of method ASCIIParser::ASCIIParser  (constructor)  -----
@@ -47,9 +47,7 @@ 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>( ctor_cookie() );
+        return  std::make_shared<ASCIIParser>( ctor_key() );
     }
 
     //--------------------------------------------------------------------------------------
@@ -72,8 +70,7 @@ namespace Lemma {
         if (node.Tag() != "ASCIIParser") {
             throw  DeSerializeTypeMismatch( "ASCIIParser", node.Tag());
         }
-        //std::shared_ptr<ASCIIParser> Object(new  ASCIIParser(node), LemmaObjectDeleter() );
-        return std::make_shared< ASCIIParser >( node, ctor_cookie() );
+        return std::make_shared< ASCIIParser >( node, ctor_key() ); //, ctor_key() );
     }		// -----  end of method ASCIIParser::DeSerialize  -----
 
     //--------------------------------------------------------------------------------------
@@ -85,24 +82,12 @@ 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, const ctor_cookie& ) : LemmaObject(node) {
+    ASCIIParser::ASCIIParser (const YAML::Node& node, const ctor_key&  key) : LemmaObject(node) {
         this->CommentString = node["CommentString"].as<std::string>();
         this->BufferSize = node["BufferSize"].as<int>();
     }  // -----  end of method ASCIIParser::ASCIIParser  (constructor)  -----
@@ -119,7 +104,6 @@ namespace Lemma {
         return ;
     }		// -----  end of method ASCIIParser::Open  -----
 
-
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
     //      Method:  Close
@@ -129,7 +113,6 @@ namespace Lemma {
         return ;
     }		// -----  end of method ASCIIParser::Close  -----
 
-
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
     //      Method:  ReadReals
@@ -171,7 +154,6 @@ namespace Lemma {
                 delete [] dump;
                 return vals;
             }
-
         }
         delete [] dump;
         return vals;
@@ -195,13 +177,11 @@ namespace Lemma {
                 delete [] dump;
                 return vals;
             }
-
         }
         delete [] dump;
         return vals;
     }		// -----  end of method ASCIIParser::ReadInts  -----
 
-
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
     //      Method:  SetCommentString
@@ -235,7 +215,6 @@ namespace Lemma {
         return ;
     }		// -----  end of method ASCIIParser::JumpToLocation  -----
 
-
 }		// -----  end of Lemma  name  -----
 
 

Modules/LemmaCore/src/CMakeLists.txt

@@ -2,8 +2,8 @@ set (SOURCE
 	${SOURCE}
 	${CMAKE_CURRENT_SOURCE_DIR}/helper.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}/ASCIIParser.cpp                # fixed, key 
+	${CMAKE_CURRENT_SOURCE_DIR}/CubicSplineInterpolator.cpp    # fixed, key 
 	${CMAKE_CURRENT_SOURCE_DIR}/Data.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/DataReader.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/EarthModel.cpp

Modules/LemmaCore/src/CubicSplineInterpolator.cpp

@@ -40,7 +40,7 @@ namespace Lemma {
     //      Method:  CubicSplineInterpolator
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    CubicSplineInterpolator::CubicSplineInterpolator ( const ctor_cookie& ) : LemmaObject( ) {
+    CubicSplineInterpolator::CubicSplineInterpolator ( const ctor_key& ) : 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, const ctor_cookie& ) : LemmaObject(node) {
+    CubicSplineInterpolator::CubicSplineInterpolator (const YAML::Node& node, const ctor_key& ) : LemmaObject(node) {
     }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
     //--------------------------------------------------------------------------------------
@@ -58,9 +58,9 @@ namespace Lemma {
     // Description:  public constructor
     //--------------------------------------------------------------------------------------
     std::shared_ptr<CubicSplineInterpolator> CubicSplineInterpolator::NewSP() {
-        //std::shared_ptr<CubicSplineInterpolator> sp(new  CubicSplineInterpolator( CubicSplineInterpolator::ctor_cookie ), LemmaObjectDeleter() );
+        //std::shared_ptr<CubicSplineInterpolator> sp(new  CubicSplineInterpolator( CubicSplineInterpolator::ctor_key ), LemmaObjectDeleter() );
         //return sp;
-        return std::make_shared<CubicSplineInterpolator>( ctor_cookie() );
+        return std::make_shared<CubicSplineInterpolator>( ctor_key() );
     }
 
     //--------------------------------------------------------------------------------------
@@ -84,7 +84,7 @@ namespace Lemma {
         }
         //std::shared_ptr<CubicSplineInterpolator> Object(new  CubicSplineInterpolator(node), LemmaObjectDeleter() );
         //return Object ;
-        return std::make_shared<CubicSplineInterpolator>( node, ctor_cookie() );
+        return std::make_shared<CubicSplineInterpolator>( node, ctor_key() );
     }
 
     //--------------------------------------------------------------------------------------

Modules/LemmaCore/testing/CMakeLists.txt

@@ -9,4 +9,7 @@ target_link_libraries(unittest_GetNameCheck "lemmacore")
 
 CXXTEST_ADD_TEST(unittest_SerializeCheck SerializeCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/SerializeCheck.h)
 target_link_libraries(unittest_SerializeCheck "lemmacore")
+
+CXXTEST_ADD_TEST(unittest_CopyDisableCheck CopyDisableCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/CopyDisableCheck.h)
+target_link_libraries(unittest_CopyDisableCheck "lemmacore")
  

Modules/LemmaCore/testing/CopyDisableCheck.h

@@ -0,0 +1,78 @@
+/* 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      06/16/2016 09:12:46 PM
+ * @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 <cxxtest/TestSuite.h>
+#include <LemmaCore>
+
+using namespace Lemma;
+
+class MyTestSuite : public CxxTest::TestSuite
+{
+    public:
+
+    void testASCIIParser( void )
+    {
+        auto Obj = ASCIIParser::NewSP();
+        //TS_ASSERT_THROWS_ANYTHING( auto Obj2 = Obj );
+        auto Obj2 = ASCIIParser::DeSerialize(Obj->Serialize());
+        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 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") );
+//     }
+//
+//     void testWindowFilter( void )
+//     {
+//         auto Obj = WindowFilter::NewSP();
+//         TS_ASSERT_EQUALS( Obj->GetName(), std::string("WindowFilter") );
+//     }
+// */
+
+};
+

Modules/LemmaCore/testing/SerializeCheck.h

@@ -26,13 +26,13 @@ class MyTestSuite : public CxxTest::TestSuite
 {
     public:
 
-    void testASCIIParser( void )
-    {
-        auto Obj = ASCIIParser::NewSP();
-        YAML::Node node = Obj->Serialize();
-        auto Obj2 = ASCIIParser::DeSerialize(node);
-        TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
-    }
+//     void testASCIIParser( void )
+//     {
+//         auto Obj = ASCIIParser::NewSP();
+//         YAML::Node node = Obj->Serialize();
+//         auto Obj2 = ASCIIParser::DeSerialize(node);
+//         TS_ASSERT_EQUALS( Obj->GetName(), Obj2->GetName() );
+//     }
 
 
     void testCubicSplineInterpolator(void)