Changeset 877

Timestamp:

05/16/19 22:08:18 (6 years ago)

Author:

Maciej Komosinski

Message:

Introduced a shared function to avoid code duplication; more informative error message; frees memory in case of error

Location:

cpp/frams/model/similarity

Files:

• simil_model.cpp (modified) (6 diffs)
• simil_model.h (modified) (1 diff)

cpp/frams/model/similarity/simil_model.cpp

@@ -86 +86 @@
 double ModelSimil::EvaluateDistanceGreedy(const Geno *G0, const Geno *G1)
 {
-        double dResult = 0;
+        double dResult = 0.0;
 
         m_Gen[0] = G0;
         m_Gen[1] = G1;
 
-        // check whether pointers are not NULL
-        if (m_Gen[0] == NULL || m_Gen[1] == NULL)
-        {
-                logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL genotype pointer(s)");
+        // create models of objects to compare
+        m_Mod[0] = newModel(m_Gen[0]);
+        m_Mod[1] = newModel(m_Gen[1]);
+
+        if (m_Mod[0] == NULL || m_Mod[1] == NULL)
                 return 0.0;
-        }
-        // create models of objects to compare
-        m_Mod[0] = new Model(*(m_Gen[0]));
-        m_Mod[1] = new Model(*(m_Gen[1]));
-
-        // validate models
-        if (m_Mod[0] == NULL || m_Mod[1] == NULL || !(m_Mod[0]->isValid()) || !(m_Mod[1]->isValid()))
-        {
-                logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL or invalid model pointer(s)");
-                return 0.0;
-        }
 
         // difference in the number of vertices (Parts) - positive
@@ -537 +527 @@
 }
 
+Model* ModelSimil::newModel(const Geno *g)
+{
+        if (g == NULL)
+        {
+                logPrintf("ModelSimil", "newModel", LOG_ERROR, "NULL genotype pointer");
+                return NULL;
+        }
+        Model *m = new Model(*g);
+        if (!m->isValid())
+        {
+                logPrintf("ModelSimil", "newModel", LOG_ERROR, "Invalid model for the genotype of '%s'", g->getName().c_str());
+                delete m;
+                return NULL;
+        }
+        return m;
+}
+
+
 /** Creates arrays holding information about organisms' Parts (m_aDegrees) andm_Neigh
         fills them with initial data (original indices and zeros).
@@ -542 +550 @@
         - Models (m_Mod) are created and available.
         */
-int ModelSimil::CreatePartInfoTables()
+int ModelSimil::ModelSimil::CreatePartInfoTables()
 {
         // check assumptions about models
@@ -2070 +2078 @@
 double ModelSimil::EvaluateDistanceHungarian(const Geno *G0, const Geno *G1)
 {
-        double dResult = 0;
+        double dResult = 0.0;
 
         m_Gen[0] = G0;
         m_Gen[1] = G1;
 
-        // check whether pointers are not NULL
-        if (m_Gen[0] == NULL || m_Gen[1] == NULL)
-        {
-                logPrintf("ModelSimil", "EvaluateDistanceHungarian", LOG_ERROR, "NULL genotype pointer(s)");
+        // create models of objects to compare
+        m_Mod[0] = newModel(m_Gen[0]);
+        m_Mod[1] = newModel(m_Gen[1]);
+
+        if (m_Mod[0] == NULL || m_Mod[1] == NULL)
                 return 0.0;
-        }
-        // create models of objects to compare
-        m_Mod[0] = new Model(*(m_Gen[0]));
-        m_Mod[1] = new Model(*(m_Gen[1]));
-
-        // validate models
-        if (m_Mod[0] == NULL || m_Mod[1] == NULL || !(m_Mod[0]->isValid()) || !(m_Mod[1]->isValid()))
-        {
-                logPrintf("ModelSimil", "EvaluateDistanceHungarian", LOG_ERROR, "NULL or invalid model pointer(s)");
-                return 0.0;
-        }
 
         //Get information about vertex degrees, neurons and 3D location
         if (!CreatePartInfoTables())
-                return 0;
+                return 0.0;
         if (!CountPartDegrees())
-                return 0;
+                return 0.0;
         if (!GetPartPositions())
-                return 0;
+                return 0.0;
         if (!CountPartNeurons())
-                return 0;
+                return 0.0;
 
         m_iSmaller = m_Mod[0]->getPartCount() <= m_Mod[1]->getPartCount() ? 0 : 1;
@@ -2116 +2114 @@
                 if (!ComputePartsPositionsBySVD())
                 {
-                        return 0;
+                        return 0.0;
                 }
 
@@ -2177 +2175 @@
                         std::copy(minAssignment.begin(), minAssignment.end(), assignment);
         }
-
         else
         {

cpp/frams/model/similarity/simil_model.h

@@ -65 +65 @@
         void FuzzyOrder();
 
+        static Model* newModel(const Geno *g);
         int CreatePartInfoTables();
         void _PrintDegrees(int i);