Changeset 372 for cpp/frams/genetics

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

Files:

• f1/conv_f1.cpp (modified) (3 diffs)
• f4/conv_f4.cpp (modified) (3 diffs)
• f4/f4_general.cpp (modified) (2 diffs)
• f4/oper_f4.cpp (modified) (2 diffs)
• genman.cpp (modified) (9 diffs)
• geno.cpp (modified) (1 diff)
• oper_fx.cpp (modified) (3 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -5 +5 @@
 #include "conv_f1.h"
 #include <common/nonstd_stl.h>
-#include <common/framsg.h>
+#include <common/hmessage.h>
 #include <frams/util/multirange.h>
 #include <frams/util/multimap.h>
@@ -63 +63 @@
                 if ((n1<0) || (n2<0) || (n1>=neuro_f1_to_f0.size()) || (n2>=neuro_f1_to_f0.size()))
                         {
-                        if (final) FMprintf("GenoConvF1","addInput",FMLV_WARN,
+                        if (final) Hprintf("GenoConvF1","addInput",HMLV_WARN,
                                             "illegal neuron connection %d <- %d (ignored)",n1,n2);
                         return 0;
@@ -178 +178 @@
                 else
                         {
-                        FramMessage("GenoConv_F1","grow","Illegal neuron position (ignored)",1);
+                        Hmessage("GenoConv_F1","grow","Illegal neuron position (ignored)",1);
                         g=skipNeuro(g+1);
                         }

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);
 }
 

cpp/frams/genetics/genman.cpp

@@ -6 +6 @@
 #include <frams/vm/classes/genoobj.h>
 #include GEN_CONFIG_FILE //configuration of active genetic operators
-#include "common/framsg.h"
+#include "common/hmessage.h"
 #include "common/nonstd_math.h"
 #include "common/stl-util.h"
-#include <frams/errmgr/errmanager.h>
+#include <frams/mhandlers/mhandlers.h>
 
 
@@ -267 +267 @@
                 if (gf->mutate(gn, chg, method) == GENOPER_OK)
                 {
-                        ErrorHandler eh(ErrorHandler::StoreFirstMessage); //mute testValidity()
+                        MessageHandlerToMemory eh(MessageHandlerBase::Enable | MessageHandlerToMemory::StoreFirstMessage); //mute testValidity()
                         Geno G(gn, gv.getFormat(), "", "");
                         canvalidate = true;
@@ -284 +284 @@
                 if (!ok && (count - pcount > 100))
                 {
-                        FMprintf("GenMan", "Mutate", 2, "Tried 100x and failed: %s", g.getGene().c_str());
+                        Hprintf("GenMan", "Mutate", 2, "Tried 100x and failed: %s", g.getGene().c_str());
                         return Geno("", -1, "", "GENOPER_OPFAIL: Mutate() tried 100x and failed");
                 }
@@ -308 +308 @@
 
         {
-                ErrorHandler eh(ErrorHandler::StoreFirstMessage); //mute testValidity()
+                MessageHandlerToMemory eh(MessageHandlerBase::Enable | MessageHandlerToMemory::StoreFirstMessage); //mute testValidity()
                 bool canvalidate = true;
                 if (testValidity(g1v, canvalidate) > 0 && canvalidate == false)
@@ -333 +333 @@
                         if (g1n[0]) { gn = g1n; chg = chg1; }
                         else { gn = g2n; chg = chg2; }
-                        ErrorHandler eh(ErrorHandler::StoreFirstMessage); //mute testValidity()
+                        MessageHandlerToMemory eh(MessageHandlerBase::Enable | MessageHandlerToMemory::StoreFirstMessage); //mute testValidity()
                         Geno G(gn, g1v.getFormat(), "", "");
                         bool canvalidate = true;
@@ -351 +351 @@
                 if (!ok && (count - pcount > 100))
                 {
-                        FMprintf("GenMan", "CrossOver", 2, "Tried 100x and failed: %s and %s", g1.getGene().c_str(), g2.getGene().c_str());
+                        Hprintf("GenMan", "CrossOver", 2, "Tried 100x and failed: %s and %s", g1.getGene().c_str(), g2.getGene().c_str());
                         return Geno("", -1, "", "GENOPER_OPFAIL: CrossOver() tried 100x and failed");
                 }
@@ -500 +500 @@
         l.chg = chg;
         l.fit = 0; //temporarily. Will be set when the genotype dies
-        //FMprintf("GenMan","saveLink",0,"#%d: [%d] '%s' + '%s' -> '%s'",GenoLinkList.size(),count,parent1.c_str(),parent2.c_str(),child.c_str());
+        //Hprintf("GenMan","saveLink",0,"#%d: [%d] '%s' + '%s' -> '%s'",GenoLinkList.size(),count,parent1.c_str(),parent2.c_str(),child.c_str());
         GenoLinkList.push_back(l);
 }
@@ -533 +533 @@
         float f1, f2;
         int m;
-        FramMessage("GenMan", "Report", "The following genetic operators are available:", 0);
+        Hmessage("GenMan", "Report", "The following genetic operators are available:", 0);
         for (unsigned int i = 0; i < oper_fx_list.size(); i++)
         {
@@ -549 +549 @@
                 }
                 //      if (oper_fx_list[i]->similarity("","")!=GENOPER_NOOPER) l+=" similarity";
-                FMprintf("GenMan", "Report", 0, "format f%c (%s):%s",
+                Hprintf("GenMan", "Report", 0, "format f%c (%s):%s",
                         oper_fx_list[i]->supported_format, oper_fx_list[i]->name.c_str(), l.c_str());
         }

cpp/frams/genetics/geno.cpp

@@ -250 +250 @@
                 }
         isvalid = 0;
-        FMprintf("Geno", "validate", FMLV_WARN, "Wrong configuration? No genotype validators defined for genetic format f%c.", format);
+        Hprintf("Geno", "validate", HMLV_WARN, "Wrong configuration? No genotype validators defined for genetic format f%c.", format);
 }
 

cpp/frams/genetics/oper_fx.cpp

@@ -5 +5 @@
 #include <ctype.h>  //isupper()
 #include "oper_fx.h"
-#include <common/framsg.h>
+#include <common/hmessage.h>
 #include <common/nonstd_math.h>
 #include <frams/util/rndutil.h>
@@ -173 +173 @@
                 }
                 else
-                        FMprintf("GenoOperators", "linearMix", FMLV_WARN, "Cannot mix values of types '%c' and '%c'", type1, type2);
+                        Hprintf("GenoOperators", "linearMix", HMLV_WARN, "Cannot mix values of types '%c' and '%c'", type1, type2);
 }
 
@@ -250 +250 @@
 {
         if (s == NULL)
-                FramMessage("GenoOperators", "skipWS", "NULL reference!", FMLV_WARN);
+                Hmessage("GenoOperators", "skipWS", "NULL reference!", HMLV_WARN);
         else
         while (isWS(*s)) s++;