Changeset 375 for cpp/frams/genetics/genman.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

Renamed logging functions to more intuitive and simple names

File:

• cpp/frams/genetics/genman.cpp (modified) (9 diffs)

cpp/frams/genetics/genman.cpp

@@ -6 +6 @@
 #include <frams/vm/classes/genoobj.h>
 #include GEN_CONFIG_FILE //configuration of active genetic operators
-#include "common/hmessage.h"
+#include "common/log.h"
 #include "common/nonstd_math.h"
 #include "common/stl-util.h"
-#include <frams/mhandlers/mhandlers.h>
+#include <frams/loggers/loggers.h>
 
 
@@ -267 +267 @@
                 if (gf->mutate(gn, chg, method) == GENOPER_OK)
                 {
-                        MessageHandlerToMemory eh(MessageHandlerBase::Enable | MessageHandlerToMemory::StoreFirstMessage); //mute testValidity()
+                        LoggerToMemory eh(LoggerBase::Enable | LoggerToMemory::StoreFirstMessage); //mute testValidity()
                         Geno G(gn, gv.getFormat(), "", "");
                         canvalidate = true;
@@ -284 +284 @@
                 if (!ok && (count - pcount > 100))
                 {
-                        Hprintf("GenMan", "Mutate", 2, "Tried 100x and failed: %s", g.getGene().c_str());
+                        logPrintf("GenMan", "Mutate", 2, "Tried 100x and failed: %s", g.getGene().c_str());
                         return Geno("", -1, "", "GENOPER_OPFAIL: Mutate() tried 100x and failed");
                 }
@@ -308 +308 @@
 
         {
-                MessageHandlerToMemory eh(MessageHandlerBase::Enable | MessageHandlerToMemory::StoreFirstMessage); //mute testValidity()
+                LoggerToMemory eh(LoggerBase::Enable | LoggerToMemory::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; }
-                        MessageHandlerToMemory eh(MessageHandlerBase::Enable | MessageHandlerToMemory::StoreFirstMessage); //mute testValidity()
+                        LoggerToMemory eh(LoggerBase::Enable | LoggerToMemory::StoreFirstMessage); //mute testValidity()
                         Geno G(gn, g1v.getFormat(), "", "");
                         bool canvalidate = true;
@@ -351 +351 @@
                 if (!ok && (count - pcount > 100))
                 {
-                        Hprintf("GenMan", "CrossOver", 2, "Tried 100x and failed: %s and %s", g1.getGene().c_str(), g2.getGene().c_str());
+                        logPrintf("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
-        //Hprintf("GenMan","saveLink",0,"#%d: [%d] '%s' + '%s' -> '%s'",GenoLinkList.size(),count,parent1.c_str(),parent2.c_str(),child.c_str());
+        //logPrintf("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;
-        Hmessage("GenMan", "Report", "The following genetic operators are available:", 0);
+        logMessage("GenMan", "Report", 0, "The following genetic operators are available:");
         for (unsigned int i = 0; i < oper_fx_list.size(); i++)
         {
@@ -549 +549 @@
                 }
                 //      if (oper_fx_list[i]->similarity("","")!=GENOPER_NOOPER) l+=" similarity";
-                Hprintf("GenMan", "Report", 0, "format f%c (%s):%s",
+                logPrintf("GenMan", "Report", 0, "format f%c (%s):%s",
                         oper_fx_list[i]->supported_format, oper_fx_list[i]->name.c_str(), l.c_str());
         }