Changeset 871 for cpp/frams/model/similarity
- Timestamp:
- 05/04/19 21:12:41 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/model/similarity/simil_model.cpp
r869 r871 94 94 if (m_Gen[0] == NULL || m_Gen[1] == NULL) 95 95 { 96 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. 97 logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL genotype pointer(s)"); 96 logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL genotype pointer(s)"); 98 97 return 0.0; 99 98 } … … 105 104 if (m_Mod[0] == NULL || m_Mod[1] == NULL || !(m_Mod[0]->isValid()) || !(m_Mod[1]->isValid())) 106 105 { 107 DB(printf("ModelSimil::EvaluateDistanceGreedy - invalid model(s) pointers\n");)106 logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "NULL or invalid model pointer(s)"); 108 107 return 0.0; 109 108 } … … 140 139 if ((this->*pfMatchingFunction)() == 0) 141 140 { 142 DB(printf("ModelSimil::EvaluateDistanceGreedy - MatchParts() error\n");)141 logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "Matching function error"); 143 142 return 0.0; 144 143 } … … 152 151 if (CountPartsDistance() == 0) 153 152 { 154 DB(printf("ModelSimil::EvaluateDistanceGreedy - CountPartDistance() error\n");)153 logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "CountPartDistance() error"); 155 154 return 0.0; 156 155 } … … 601 600 else 602 601 { 603 DB(printf("ModelSimil::EvaluateDistance - nie ma pamieci na Degrees\n");)602 logPrintf("ModelSimil", "EvaluateDistanceGreedy", LOG_ERROR, "Memory error"); 604 603 return 0; 605 604 } … … 2079 2078 if (m_Gen[0] == NULL || m_Gen[1] == NULL) 2080 2079 { 2081 DB(printf("ModelSimil::EvaluateDistanceHungarian - invalid genotypes pointers\n");)2080 logPrintf("ModelSimil", "EvaluateDistanceHungarian", LOG_ERROR, "NULL genotype pointer(s)"); 2082 2081 return 0.0; 2083 2082 } … … 2089 2088 if (m_Mod[0] == NULL || m_Mod[1] == NULL || !(m_Mod[0]->isValid()) || !(m_Mod[1]->isValid())) 2090 2089 { 2091 DB(printf("ModelSimil::EvaluateDistanceHungarian - invalid models pointers\n");)2090 logPrintf("ModelSimil", "EvaluateDistanceHungarian", LOG_ERROR, "NULL or invalid model pointer(s)"); 2092 2091 return 0.0; 2093 2092 }
Note: See TracChangeset
for help on using the changeset viewer.