Rebasing code for better C++-11 useage

LemmaCore/src/CMakeLists.txt

@@ -9,8 +9,8 @@ set (SOURCE
 	${CMAKE_CURRENT_SOURCE_DIR}/data.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/datafem.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/datareader.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/datareaderfem.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/datareaderfemubc.cpp
+#	${CMAKE_CURRENT_SOURCE_DIR}/datareaderfem.cpp
+#	${CMAKE_CURRENT_SOURCE_DIR}/datareaderfemubc.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/datareadertem.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/datatem.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/DCIPElectrode.cpp

LemmaCore/src/LemmaObject.cpp

@@ -15,87 +15,41 @@
 
 namespace Lemma {
 
-    std::ostream &operator<<(std::ostream &stream,
+    std::ostream &operator << (std::ostream &stream,
                 const LemmaObject &ob) {
-
       stream << "Class name= " << ob.Name  << "\n";
       return stream;
     }
 
     #ifdef HAVE_YAMLCPP
     YAML::Emitter& operator << (YAML::Emitter& out, const LemmaObject& ob) {
-    out << YAML::BeginMap;
-    out << YAML::Key <<"Class Name"    << YAML::Value << ob.Name;
-    return out;
+        out << YAML::BeginMap;
+        out << YAML::Key <<"Class Name"    << YAML::Value << ob.GetName();
+        return out;
     }
     #endif
 
     // ====================  LIFECYCLE     ==============================
 
     // Constructor
-    LemmaObject::LemmaObject(const std::string& name) :
-        NumberOfReferences(0), Name(name) {
+    LemmaObject::LemmaObject(const std::string& name) : Name(name) {
     }
 
     #ifdef HAVE_YAMLCPP
-    LemmaObject::LemmaObject(const YAML::Node &node) :
-        NumberOfReferences(0), Name(node.Tag()) {
-
+    LemmaObject::LemmaObject(const YAML::Node &node) : Name(node.Tag()) {
     }
     #endif
 
     // Destructor
     LemmaObject::~LemmaObject() {
-        if (this->NumberOfReferences != 0) {
-            throw DeleteObjectWithReferences(this);
-        }
+        std::cout << "~LemmaObject()" << std::endl;
     }
 
     // ====================  OPERATIONS    ==============================
 
-    void LemmaObject::AttachTo (LemmaObject* ptrIn) {
-        this->NumberOfReferences++;
-        this->RefPtrList.push_back(ptrIn);
-    }
-
-    void LemmaObject::DetachFrom (LemmaObject* ptrIn) {
-        bool found(false);
-        std::vector<LemmaObject*>::iterator iter = this->RefPtrList.begin();
-        while (iter != this->RefPtrList.end() ) {
-            if (*iter == ptrIn) {
-                this->RefPtrList.erase(iter);
-                this->NumberOfReferences--;
-                found = true;
-                break;
-            }
-            ++iter;
-        }
-        if (!found) {
-            std::cout << *this;
-            std::cerr << "Function call DetachFrom Failed \n"
-                      << "Caller name " << this->Name << " address=" << this <<
-                      " detaching from " <<  ptrIn->Name << " address= " << ptrIn<< "\n"
-                      <<  "This class was not listed as attached to this\n";
-            exit(EXIT_FAILURE);
-        }
-
-        // If there are no remaining references, free up memory.
-        if (NumberOfReferences == 0) {
-            this->Release();
-        }
-    }
-
     // ====================  INQUIRY       ==============================
 
-    unsigned int LemmaObject::GetNumberOfReferences() {
-        return this->NumberOfReferences;
-    }
-
-    std::vector<LemmaObject*> LemmaObject::GetReferences() {
-        return RefPtrList;
-    }
-
-    std::string LemmaObject::GetName() {
+    std::string LemmaObject::GetName() const {
         return Name;
     }
 
@@ -107,25 +61,6 @@ namespace Lemma {
 
     //////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////
-    // Exception classes
-    DeleteObjectWithReferences::DeleteObjectWithReferences() :
-        runtime_error("DELETED OBJECT WITH REFERENCES") {
-        }
-
-    DeleteObjectWithReferences::
-            DeleteObjectWithReferences(LemmaObject* ptr) :
-        runtime_error("DELETED OBJECT WITH REFERENCES") {
-            std::cerr << "DELETED OBJECT WITH REFERENCES THROWN BY INSTANCE OF  "
-                      << ptr->GetName() << std::endl;
-            std::cerr << ptr->RefPtrList.size() << " connection(s) remain\n";
-            for (unsigned int i=0; i<ptr->RefPtrList.size(); ++i) {
-                std::cerr << "\tConnection " << i << " is " << ptr->RefPtrList[i]->GetName();
-                if (ptr->RefPtrList[i]->GetName().empty())
-                    std::cerr << "a deleted object! PLEASE REPORT BUG!\n";
-                else
-                std::cerr << "\n" << *ptr->RefPtrList[i] << std::endl;
-            }
-        }
 
     DeSerializeTypeMismatch::DeSerializeTypeMismatch(LemmaObject *ptr, const std::string& got) :
         runtime_error("DESERIALIZE TYPE MISMATCH") {
@@ -135,7 +70,7 @@ namespace Lemma {
     RequestToReturnNullPointer::
         RequestToReturnNullPointer(LemmaObject *ptr) :
         runtime_error("REQUEST TO RETURN NULL POINTER"){
-            std::cout << "Thrown by instance of "
+            std::cerr << "Thrown by instance of "
                       << ptr->GetName() << std::endl;
         }
 
@@ -146,19 +81,19 @@ namespace Lemma {
     AssignmentOutOfBounds::
         AssignmentOutOfBounds(LemmaObject *ptr) :
         runtime_error("ASSIGNMENT OUT OF BOUNDS"){
-            std::cout << "Thrown by instance of "
+            std::cerr << "Thrown by instance of "
                       << ptr->GetName() << std::endl;
        }
 
 	GenericFileIOError::
 		GenericFileIOError(LemmaObject *ptr, const std::string &filename) : runtime_error("FILE I/O ERROR"){
-			std::cout << std::endl;
-			std::cout << "FILE I/O ERROR" << std::endl;
-			std::cout << std::endl;
-			std::cout << "Thrown by instance of "
+			std::cerr << std::endl;
+			std::cerr << "FILE I/O ERROR" << std::endl;
+			std::cerr << std::endl;
+			std::cerr << "Thrown by instance of "
 				<< ptr->GetName() << std::endl;
-			std::cout << "  while trying to access " << filename << std::endl;
-			std::cout << std::endl;
+			std::cerr << "  while trying to access " << filename << std::endl;
+			std::cerr << std::endl;
 		}
 
 } // end of namespace Lemma

LemmaCore/src/datafem.cpp

@@ -65,6 +65,8 @@ namespace Lemma {
 	}
 
 	void DataFEM::Release() {
+		if (this->NumberOfReferences != 0)
+			throw DeleteObjectWithReferences(this);
 		delete this;
 	}
 
@@ -85,8 +87,6 @@ namespace Lemma {
 	}
 
 	DataFEM::~DataFEM() {
-		if (this->NumberOfReferences != 0)
-			throw DeleteObjectWithReferences(this);
 	}
 
 	void DataFEM::Zero() {

LemmaCore/src/datareaderfem.cpp

@@ -19,9 +19,6 @@ namespace Lemma {
 	}
 
 	DataReaderFem::~DataReaderFem() {
-		if (NumberOfReferences != 0) {
-			throw DeleteObjectWithReferences(this);
-		}
 	}
 
 	DataReaderFem* DataReaderFem::New() {

Modules/FDEM1D/README

@@ -0,0 +1 @@
+Frequency Domain EM in 1D