Changeset 372 for cpp/frams/genetics/f4

Timestamp:

04/22/15 04:14:59 (10 years ago)

Author:

sz

Message:

Renamed some classes and functions to make their purpose more obvious:

• FramMessage?, FMprintf, etc. become Hmessage, Hprintf, etc... (H for handled message).
• ErrorManager? (and its family) becomes MessageHandler?. Handler names reflect their function better, e.g. MessageHandlerToStdout?.

All MessageHandlers? must now be given the explicit "Enable" argument if you want them to automatically become active. This makes side effects clearly visible.

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

cpp/frams/genetics/f4/f4_general.cpp

@@ -7 +7 @@
 #include "f4_general.h"
 #include <common/nonstd_stl.h>
-#include <common/framsg.h>
+#include <common/hmessage.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);
-                        FramMessage("f4_Cell", "onestep", buf, 2);
+                        Hmessage("f4_Cell", "onestep", buf, 2);
                         // 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/framsg.h>
+#include <common/hmessage.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) FramMessage("Geno_f4", "Constructor", "Mutation names init error", 3);
+        if (index != F4_COUNT + F4_ADD_COUNT - 1) Hmessage("Geno_f4", "Constructor", "Mutation names init error", 3);
 }