AEM survey added back

CMakeLists.txt

@@ -79,6 +79,7 @@ find_package(CxxTest)
 if (CXXTEST_FOUND)
 	# Do nothing
 else()
+	message( STATUS "CxxTest will be built and installed along with Lemma, override if desired in GUI."  )
 	ExternalProject_Add(CxxTest
 		GIT_REPOSITORY "https://github.com/CxxTest/cxxtest.git"
 		GIT_TAG "master"
@@ -91,8 +92,10 @@ else()
     	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} /
 			-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 	)
-	set (CXXTEST_INCLUDE_DIR  "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/")
-	set (CXXTEST_PYTHON_TESTGEN_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen" )
+	# The values "CACHE PATH "" FORCE" makes the GUI show the values of the local CxxTest, but this can cause issues 
+	# with users wanting to specify their own path, its not recommended  
+	set (CXXTEST_INCLUDE_DIR  "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/") # CACHE  PATH "" FORCE )
+	set (CXXTEST_PYTHON_TESTGEN_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen") # CACHE PATH "" FORCE )
 	find_package(CxxTest REQUIRED)
 endif()
 

Modules/FDEM1D/include/AEMSurvey.h

@@ -12,9 +12,9 @@
  * @date      09/24/2013 04:06:42 PM
  * @version   $Id$
  * @author    Trevor Irons (ti)
- * @email     Trevor.Irons@xri-geo.com
+ * @email     Trevor.Irons@lemmasoftware.org
  * @copyright Copyright (c) 2013, XRI Geophysics, LLC
- * @copyright Copyright (c) 2013, Trevor Irons
+ * @copyright Copyright (c) 2013,2018 Trevor Irons
  */
 
 #ifndef  AEMSURVEY_INC
@@ -48,13 +48,13 @@ class AEMSurvey : public LemmaObject {
      * @copybrief LemmaObject::New()
      * @copydetails LemmaObject::New()
      */
-    static AEMSurvey* New();
+    static std::shared_ptr<AEMSurvey> NewSP();
 
-    /**
-     *  @copybrief   LemmaObject::Delete()
-     *  @copydetails LemmaObject::Delete()
-     */
-    void Delete();
+    /** Default protected constructor, use New */
+    AEMSurvey (const ctor_key&);
+
+    /** Default protected destructor, use Delete */
+    ~AEMSurvey ();
 
     // ====================  OPERATORS     =======================
 
@@ -66,7 +66,7 @@ class AEMSurvey : public LemmaObject {
      *  general loops int the new future.
      *  @param[in] isource is the source fiducial to return
      */
-    DipoleSource* GetSource(const int& isource);
+    std::shared_ptr<DipoleSource> GetSource(const int& isource);
 
     /** @return the total number of sources
      */
@@ -79,30 +79,24 @@ class AEMSurvey : public LemmaObject {
 
     // ====================  INQUIRY       =======================
 
+    /** Returns the name of the underlying class, similiar to Python's type */
+    virtual std::string GetName() const {
+        return this->CName;
+    }
+
     protected:
 
     // ====================  LIFECYCLE     =======================
 
-    /** Default protected constructor, use New */
-    AEMSurvey (const std::string& name);
-
-    /** Default protected destructor, use Delete */
-    ~AEMSurvey ();
-
-    /**
-     *  @copybrief   LemmaObject::Release()
-     *  @copydetails LemmaObject::Release()
-     */
-    void Release();
-
     private:
 
     // ====================  DATA MEMBERS  =========================
 
-    std::vector<DipoleSource*>  Sources;
+    std::vector< std::shared_ptr<DipoleSource> >  Sources;
 
     VectorXr Freqs;
 
+    static constexpr auto CName = "AEMSurvey";
 
 }; // -----  end of class  AEMSurvey  -----
 

Modules/FDEM1D/include/AEMSurveyReader.h

@@ -12,7 +12,7 @@
  * @date      09/24/2013 04:29:27 PM
  * @version   $Id$
  * @author    Trevor Irons (ti)
- * @email     Trevor.Irons@xri-geo.com
+ * @email     Trevor.Irons@lemmasoftware.org
  * @copyright Copyright (c) 2013, XRI Geophysics, LLC
  * @copyright Copyright (c) 2013, Trevor Irons
  */
@@ -39,17 +39,17 @@ namespace Lemma {
 
         // ====================  LIFECYCLE     =======================
 
-        /*c
-         * @copybrief LemmaObject::New()
-         * @copydetails LemmaObject::New()
-         */
-        static AEMSurveyReader* New();
-
         /**
-         *  @copybrief   LemmaObject::Delete()
-         *  @copydetails LemmaObject::Delete()
+         * @copybrief LemmaObject::NewSP()
+         * @copydetails LemmaObject::NewSP()
          */
-        void Delete();
+        static std::shared_ptr<AEMSurveyReader> NewSP();
+
+        /** Default protected constructor, use New */
+        AEMSurveyReader (const ctor_key&);
+
+        /** Default protected destructor, use Delete */
+        ~AEMSurveyReader ();
 
         // ====================  OPERATORS     =======================
 
@@ -103,31 +103,25 @@ MD        // Source 5 type
         /**
          * @return the AEMSurvey based on the file read
          */
-        AEMSurvey* GetSurvey();
+        std::shared_ptr<AEMSurvey> GetSurvey();
 
         // ====================  INQUIRY       =======================
+        /** Returns the name of the underlying class, similiar to Python's type */
+        virtual std::string GetName() const {
+            return this->CName;
+        }
 
         protected:
 
         // ====================  LIFECYCLE     =======================
 
-        /** Default protected constructor, use New */
-        AEMSurveyReader (const std::string& name);
-
-        /** Default protected destructor, use Delete */
-        ~AEMSurveyReader ();
-
-        /**
-         *  @copybrief   LemmaObject::Release()
-         *  @copydetails LemmaObject::Release()
-         */
-        void Release();
-
         private:
 
         // ====================  DATA MEMBERS  =========================
 
-        AEMSurvey*  Survey;
+        std::shared_ptr<AEMSurvey>  Survey;
+
+        static constexpr auto CName = "AEMSurveyReader";
 
     }; // -----  end of class  AEMSurveyReader  -----
 

Modules/FDEM1D/include/FDEM1D

@@ -10,7 +10,8 @@
 
 #include "EMEarth1D.h"
 
-//#include "AEMSurvey.h"
+#include "AEMSurvey.h"
+#include "AEMSurveyReader.h"
 
 // internal
 //#include "KernelEM1DManager.h"

Modules/FDEM1D/src/AEMSurvey.cpp

@@ -12,9 +12,10 @@
  * @date      09/24/2013 04:09:04 PM
  * @version   $Id$
  * @author    Trevor Irons (ti)
- * @email     Trevor.Irons@xri-geo.com
+ * @email     Trevor.Irons@lemmasoftware.org
  * @copyright Copyright (c) 2013, XRI Geophysics, LLC
  * @copyright Copyright (c) 2013, Trevor Irons
+ * @copyright Copyright (c) 2018, Trevor Irons
  */
 
 #include "AEMSurvey.h"
@@ -24,9 +25,7 @@ namespace Lemma {
 // ====================  FRIEND METHODS  =====================
 
 std::ostream &operator<<(std::ostream &stream, const AEMSurvey &ob) {
-
-    stream << *(LemmaObject*)(&ob);
-
+    stream << ob.Serialize() << "\n";
     return stream;
 }
 
@@ -37,20 +36,18 @@ std::ostream &operator<<(std::ostream &stream, const AEMSurvey &ob) {
 //      Method:  AEMSurvey
 // Description:  constructor (protected)
 //--------------------------------------------------------------------------------------
-AEMSurvey::AEMSurvey (const std::string& name) : LemmaObject(name) {
+AEMSurvey::AEMSurvey (const ctor_key& key) : LemmaObject(key) {
 
 }  // -----  end of method AEMSurvey::AEMSurvey  (constructor)  -----
 
 
 //--------------------------------------------------------------------------------------
 //       Class:  AEMSurvey
-//      Method:  New()
+//      Method:  NewSP()
 // Description:  public constructor
 //--------------------------------------------------------------------------------------
-AEMSurvey* AEMSurvey::New() {
-    AEMSurvey*  Obj = new AEMSurvey("AEMSurvey");
-    Obj->AttachTo(Obj);
-    return Obj;
+std::shared_ptr<AEMSurvey> AEMSurvey::NewSP() {
+    return std::make_shared<AEMSurvey>(ctor_key());
 }
 
 //--------------------------------------------------------------------------------------
@@ -60,33 +57,13 @@ AEMSurvey* AEMSurvey::New() {
 //--------------------------------------------------------------------------------------
 AEMSurvey::~AEMSurvey () {
 
-    for (unsigned int isc=0; isc<Sources.size(); ++isc) Sources[isc]->Delete();
-
 }  // -----  end of method AEMSurvey::~AEMSurvey  (destructor)  -----
 
 //--------------------------------------------------------------------------------------
 //       Class:  AEMSurvey
-//      Method:  Delete
-// Description:  public destructor
-//--------------------------------------------------------------------------------------
-void AEMSurvey::Delete() {
-    this->DetachFrom(this);
-}
-
-//--------------------------------------------------------------------------------------
-//       Class:  AEMSurvey
-//      Method:  Release
-// Description:  destructor (protected)
-//--------------------------------------------------------------------------------------
-void AEMSurvey::Release() {
-    delete this;
-}
-
-//--------------------------------------------------------------------------------------
-//       Class:  AEMSurvey
 //      Method:  GetSource
 //--------------------------------------------------------------------------------------
-DipoleSource* AEMSurvey::GetSource ( const int& isource ) {
+std::shared_ptr<DipoleSource> AEMSurvey::GetSource ( const int& isource ) {
     return Sources[isource] ;
 }		// -----  end of method AEMSurvey::GetSource  -----
 

Modules/FDEM1D/src/AEMSurveyReader.cpp

@@ -24,9 +24,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator<<(std::ostream &stream, const AEMSurveyReader &ob) {
-
-        stream << *(LemmaObject*)(&ob);
-
+        stream << ob.Serialize() << "\n";
         return stream;
     }
 
@@ -37,8 +35,7 @@ namespace Lemma {
     //      Method:  AEMSurveyReader
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    AEMSurveyReader::AEMSurveyReader (const std::string& name) :
-        LemmaObject(name), Survey(NULL) {
+    AEMSurveyReader::AEMSurveyReader (const ctor_key& key) : LemmaObject(key), Survey(nullptr) {
 
     }  // -----  end of method AEMSurveyReader::AEMSurveyReader  (constructor)  -----
 
@@ -48,10 +45,8 @@ namespace Lemma {
     //      Method:  New()
     // Description:  public constructor
     //--------------------------------------------------------------------------------------
-    AEMSurveyReader* AEMSurveyReader::New() {
-        AEMSurveyReader*  Obj = new AEMSurveyReader("AEMSurveyReader");
-        Obj->AttachTo(Obj);
-        return Obj;
+    std::shared_ptr<AEMSurveyReader> AEMSurveyReader::NewSP() {
+        return std::make_shared<AEMSurveyReader>(ctor_key());
     }
 
     //--------------------------------------------------------------------------------------
@@ -60,33 +55,13 @@ namespace Lemma {
     // Description:  destructor (protected)
     //--------------------------------------------------------------------------------------
     AEMSurveyReader::~AEMSurveyReader () {
-        if (Survey) Survey->Delete();
     }  // -----  end of method AEMSurveyReader::~AEMSurveyReader  (destructor)  -----
 
     //--------------------------------------------------------------------------------------
     //       Class:  AEMSurveyReader
-    //      Method:  Delete
-    // Description:  public destructor
-    //--------------------------------------------------------------------------------------
-    void AEMSurveyReader::Delete() {
-        this->DetachFrom(this);
-    }
-
-    //--------------------------------------------------------------------------------------
-    //       Class:  AEMSurveyReader
-    //      Method:  Release
-    // Description:  destructor (protected)
-    //--------------------------------------------------------------------------------------
-    void AEMSurveyReader::Release() {
-        delete this;
-    }
-
-
-    //--------------------------------------------------------------------------------------
-    //       Class:  AEMSurveyReader
     //      Method:  GetSurvey
     //--------------------------------------------------------------------------------------
-    AEMSurvey* AEMSurveyReader::GetSurvey (  ) {
+    std::shared_ptr<AEMSurvey> AEMSurveyReader::GetSurvey (  ) {
         return Survey;
     }		// -----  end of method AEMSurveyReader::GetSurvey  -----
 
@@ -97,9 +72,8 @@ namespace Lemma {
     //--------------------------------------------------------------------------------------
     void AEMSurveyReader::ReadASCIIAEMFile (  const std::string& fname ) {
 
-        if (Survey) Survey->Delete();
-        Survey = AEMSurvey::New();
-        ASCIIParser* Parser = ASCIIParser::New();
+        Survey = AEMSurvey::NewSP();
+        auto Parser = ASCIIParser::NewSP();
         Parser->SetCommentString("//");
         Parser->Open(fname);
 
@@ -136,7 +110,7 @@ namespace Lemma {
             //std::vector<int> ivals = Parser->ReadInts(1);   // number of frequencies
             int nf = Parser->ReadInts(1)[0];   // number of frequencies
             for (int isc=0; isc<nf; ++isc) {
-                Survey->Sources.push_back(DipoleSource::New());
+                Survey->Sources.push_back(DipoleSource::NewSP());
                 int cnt = Survey->Sources.size() - 1; //
                 // and now set it
                 Survey->Sources[cnt]->SetNumberOfFrequencies(1);
@@ -159,9 +133,6 @@ namespace Lemma {
             }
             Parser->JumpToLocation(bp);
         }
-
-        Parser->Delete();
-
         return ;
     }		// -----  end of method AEMSurveyReader::ReadASCIIAEMFile  -----
 

Modules/FDEM1D/testing/CMakeLists.txt

@@ -1,7 +1,7 @@
 include_directories(${CXXTEST_INCLUDE_DIR})
 
-CXXTEST_ADD_TEST(unittestFEM1D_GetNameCheck GetNameCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/GetNameCheck.h)
-target_link_libraries(unittestFEM1D_GetNameCheck "lemmacore" "fdem1d" "yaml-cpp")
+CXXTEST_ADD_TEST(unittest_FEM1D_GetNameCheck GetNameCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/GetNameCheck.h)
+target_link_libraries(unittest_FEM1D_GetNameCheck "lemmacore" "fdem1d" "yaml-cpp")
 
-CXXTEST_ADD_TEST(unittestFEM1D_SerializeCheck SerializeCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/SerializeCheck.h)
-target_link_libraries(unittestFEM1D_SerializeCheck "lemmacore" "fdem1d" "yaml-cpp")
+CXXTEST_ADD_TEST(unittest_FEM1D_SerializeCheck SerializeCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/SerializeCheck.h)
+target_link_libraries(unittest_FEM1D_SerializeCheck "lemmacore" "fdem1d" "yaml-cpp")

Modules/FDEM1D/testing/GetNameCheck.h

@@ -33,22 +33,52 @@ class MyTestSuite : public CxxTest::TestSuite
         TS_ASSERT_EQUALS( Obj->GetName(), std::string("LayeredEarthEM") );
     }
 
+    void testLayeredEarthEMReader( void )
+    {
+        auto Obj = LayeredEarthEMReader::NewSP();
+        TS_ASSERT_EQUALS( Obj->GetName(), std::string("LayeredEarthEMReader") );
+    }
+
     void testFieldPoints( void )
     {
         auto Obj = FieldPoints::NewSP();
         TS_ASSERT_EQUALS( Obj->GetName(), std::string("FieldPoints") );
     }
 
+    void testWireAntenna( void )
+    {
+        auto Obj = WireAntenna::NewSP();
+        TS_ASSERT_EQUALS( Obj->GetName(), std::string("WireAntenna") );
+    }
+
+    void testPolygonalWireAntenna( void )
+    {
+        auto Obj = PolygonalWireAntenna::NewSP();
+        TS_ASSERT_EQUALS( Obj->GetName(), std::string("PolygonalWireAntenna") );
+    }
+
     void testDipoleSource( void )
     {
         auto Obj = DipoleSource::NewSP();
         TS_ASSERT_EQUALS( Obj->GetName(), std::string("DipoleSource") );
     }
 
-    void testWireAntenna( void )
+    void testEMEarth1D( void )
     {
-        auto Obj = WireAntenna::NewSP();
-        TS_ASSERT_EQUALS( Obj->GetName(), std::string("WireAntenna") );
+        auto Obj = EMEarth1D::NewSP();
+        TS_ASSERT_EQUALS( Obj->GetName(), std::string("EMEarth1D") );
+    }
+
+    void testAEMSurvey( void )
+    {
+        auto Obj = AEMSurvey::NewSP();
+        TS_ASSERT_EQUALS( Obj->GetName(), std::string("AEMSurvey") );
+    }
+
+    void testAEMSurveyReader( void )
+    {
+        auto Obj = AEMSurveyReader::NewSP();
+        TS_ASSERT_EQUALS( Obj->GetName(), std::string("AEMSurveyReader") );
     }
 
 //     void testKernelEM1DManager( void )

Modules/LemmaCore/testing/CMakeLists.txt

@@ -4,12 +4,12 @@
 #add_test( testLemmaCoreTwo testTwo )
     	
 include_directories(${CXXTEST_INCLUDE_DIR})
-CXXTEST_ADD_TEST(unittest_GetNameCheck GetNameCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/GetNameCheck.h)
-target_link_libraries(unittest_GetNameCheck "lemmacore")
+CXXTEST_ADD_TEST(unittest_LemmaCore_GetNameCheck GetNameCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/GetNameCheck.h)
+target_link_libraries(unittest_LemmaCore_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_LemmaCore_SerializeCheck SerializeCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/SerializeCheck.h)
+target_link_libraries(unittest_LemmaCore_SerializeCheck "lemmacore")
 
-CXXTEST_ADD_TEST(unittest_CopyDisableCheck CopyDisableCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/CopyDisableCheck.h)
-target_link_libraries(unittest_CopyDisableCheck "lemmacore")
+CXXTEST_ADD_TEST(unittest_LemmaCore_CopyDisableCheck CopyDisableCheck.cc ${CMAKE_CURRENT_SOURCE_DIR}/CopyDisableCheck.h)
+target_link_libraries(unittest_LemmaCore_CopyDisableCheck "lemmacore")