Changeset 375 for cpp/frams/genetics/f4

Timestamp:

04/26/15 00:59:09 (10 years ago)

Author:

Maciej Komosinski

Message:

Renamed logging functions to more intuitive and simple names

Location:

cpp/frams/genetics/f4

Files:

• conv_f4.cpp (modified) (3 diffs)
• f4_general.cpp (modified) (2 diffs)
• oper_f4.cpp (modified) (2 diffs)

cpp/frams/genetics/f4/conv_f4.cpp

@@ -6 +6 @@
 
 #include "conv_f4.h"
-#include <common/hmessage.h>
+#include <common/log.h>
 #include "../oper_fx.h" //for GENOPER_OK constant
 
@@ -110 +110 @@
                 if (res)
                 {
-                        Hmessage("f4_Model", "buildModelRec", "Error in building Model", 2);
+                        logMessage("f4_Model", "buildModelRec", 2, "Error in building Model");
                         error = res;
                         break;
@@ -134 +134 @@
                         return cells->C[i];
         // none!
-        Hmessage("f4_Model", "getStick", "Not a single stick", 2);
+        logMessage("f4_Model", "getStick", 2, "Not a single stick");
         return NULL;
 }

cpp/frams/genetics/f4/f4_general.cpp

@@ -7 +7 @@
 #include "f4_general.h"
 #include <common/nonstd_stl.h>
-#include <common/hmessage.h>
+#include <common/log.h>
 #include <frams/model/model.h> // for min and max attributes
 #include "../oper_fx.h" //for GENOPER_ constants
@@ -581 +581 @@
                         char buf[40];
                         sprintf(buf, "unknown code '%c'", gcur->name);
-                        Hmessage("f4_Cell", "onestep", buf, 2);
+                        logMessage("f4_Cell", "onestep", 2, buf);
                         // fix: delete it
                         org->setRepairRemove(gcur->pos, gcur);

cpp/frams/genetics/f4/oper_f4.cpp

@@ -8 +8 @@
 #include "oper_f4.h"
 #include <frams/util/sstring.h>
-#include <common/hmessage.h>
+#include <common/log.h>
 
 #include <stdio.h>
@@ -51 +51 @@
         mutation_method_names[index++] = "deleted a node";
         mutation_method_names[index++] = "modified a node";
-        if (index != F4_COUNT + F4_ADD_COUNT - 1) Hmessage("Geno_f4", "Constructor", "Mutation names init error", 3);
+        if (index != F4_COUNT + F4_ADD_COUNT - 1) logMessage("Geno_f4", "Constructor", 3, "Mutation names init error");
 }