Changeset 871 for cpp/frams

Timestamp:

05/04/19 21:12:41 (6 years ago)

Author:

oriona

Message:

Printfs replaced with error messages.

File:

• cpp/frams/model/similarity/simil_model.cpp (modified) (7 diffs)

cpp/frams/model/similarity/simil_model.cpp

@@ -94 +94 @@
         if (m_Gen[0] == NULL || m_Gen[1] == NULL)
         {
-                DB(printf("ModelSimil::EvaluateDistanceGreedy - invalid genotype(s) pointers\n");) //TODO convert all such error printfs to legacy error messages, since if's are not in DB(). Example below.
-                        logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL genotype pointer(s)");
+                logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL genotype pointer(s)");
                 return 0.0;
         }
@@ -105 +104 @@
         if (m_Mod[0] == NULL || m_Mod[1] == NULL || !(m_Mod[0]->isValid()) || !(m_Mod[1]->isValid()))
         {
-                DB(printf("ModelSimil::EvaluateDistanceGreedy - invalid model(s) pointers\n");)
+                logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL or invalid model pointer(s)");
                         return 0.0;
         }
@@ -140 +139 @@
         if ((this->*pfMatchingFunction)() == 0)
         {
-                DB(printf("ModelSimil::EvaluateDistanceGreedy - MatchParts() error\n");)
+                logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "Matching function error");
                         return 0.0;
         }
@@ -152 +151 @@
                 if (CountPartsDistance() == 0)
                 {
-                        DB(printf("ModelSimil::EvaluateDistanceGreedy - CountPartDistance() error\n");)
+                        logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "CountPartDistance() error");
                                 return 0.0;
                 }
@@ -601 +600 @@
                 else
                 {
-                        DB(printf("ModelSimil::EvaluateDistance - nie ma pamieci na Degrees\n");)
+                        logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "Memory error");
                                 return 0;
                 }
@@ -2079 +2078 @@
         if (m_Gen[0] == NULL || m_Gen[1] == NULL)
         {
-                DB(printf("ModelSimil::EvaluateDistanceHungarian - invalid genotypes pointers\n");)
+                logPrintf("ModelSimil", "EvaluateDistanceHungarian", LOG_ERROR, "NULL genotype pointer(s)");
                         return 0.0;
         }
@@ -2089 +2088 @@
         if (m_Mod[0] == NULL || m_Mod[1] == NULL || !(m_Mod[0]->isValid()) || !(m_Mod[1]->isValid()))
         {
-                DB(printf("ModelSimil::EvaluateDistanceHungarian - invalid models pointers\n");)
+                logPrintf("ModelSimil", "EvaluateDistanceHungarian", LOG_ERROR, "NULL or invalid model pointer(s)");
                         return 0.0;
         }