Changeset 752 for cpp/frams/genetics/fn/conv_fn.cpp

Timestamp:

02/28/18 23:43:57 (6 years ago)

Author:

Maciej Komosinski

Message:

Mutation in the 'fn' encoding respects custom min,max,stddev for each variable

File:

• cpp/frams/genetics/fn/conv_fn.cpp (modified) (3 diffs)

cpp/frams/genetics/fn/conv_fn.cpp

@@ -29 +29 @@
 vector<double> GenoConv_fn0::stringToVector(const char *input) //returns empty vector on error
 {
-        vector<double> output;
+        vector<double> empty;
         ExtValue val;
         const char* after_des = val.deserialize(input);
-        if (after_des == NULL) // deserialization failed
+        if (after_des == NULL) //deserialization failed
         {
-                logPrintf("fn", "stringToVector", LOG_ERROR, "Unable to deserialize - expecting a vector of real values, got '%s'", input);
-                return output;
+                logPrintf("GenoConv_fn0", "stringToVector", LOG_ERROR, "Unable to deserialize - expecting a vector of real values, got '%s'", input);
+                return empty;
         }
-        if (after_des[0] != '\0') // not everything was consumed
+        if (after_des[0] != '\0') //not everything was consumed
         {
-                logPrintf("fn", "stringToVector", LOG_ERROR, "Extra characters after deserialized '%s'", input);
-                return output;
+                logPrintf("GenoConv_fn0", "stringToVector", LOG_ERROR, "Extra characters after deserialized '%s'", input);
+                return empty;
         }
 
@@ -46 +46 @@
         if (vec)
         {
+                vector<double> output;
                 for (int i = 0; i < vec->data.size(); i++)
                 {
@@ -51 +52 @@
                         if (val == NULL)
                         {
-                                logPrintf("fn", "stringToVector", LOG_ERROR, "Expecting a real value in a vector, got NULL");
+                                logPrintf("GenoConv_fn0", "stringToVector", LOG_ERROR, "Expecting a real value in a vector, got NULL");
+                                return empty;
                         }
                         else
                                 output.push_back(val->getDouble());
                 }
+                return output;
         }
         else
         {
-                logPrintf("fn", "stringToVector", LOG_ERROR, "Expecting a vector of real values, got '%s'", input);
+                logPrintf("GenoConv_fn0", "stringToVector", LOG_ERROR, "Expecting a vector of real values, got '%s'", input);
+                return empty;
         }
-        return output;
 }