Changeset 1215 for cpp

Timestamp:

04/17/23 00:04:28 (21 months ago)

Author:

Maciej Komosinski

Message:

Less ambiguous names of counting functions in loggers: warning -> error_warning, info -> error_warning_info

Location:

cpp

Files:

• common/loggers/loggers.cpp (modified) (2 diffs)
• common/loggers/loggers.h (modified) (1 diff)
• frams/genetics/fH/fH_oper.cpp (modified) (1 diff)
• frams/model/model.cpp (modified) (1 diff)

cpp/common/loggers/loggers.cpp

@@ -156 +156 @@
 string LoggerToMemory::getCountSummary() const
 {
-        if (getInfoCount())
+        if (getErrorWarningInfoCount())
         {
                 string msg;
@@ -162 +162 @@
                         msg = ssprintf("%d error(s)", getErrorCount());
                 int w;
-                if ((w = getWarningCount() - getErrorCount()))
-                        msg += ssprintf("%s%d warning(s)", (getErrorCount() ? ", " : ""), w);
-                if ((w = getInfoCount() - getWarningCount()))
-                        msg += ssprintf("%s%d message(s)", (getWarningCount() ? ", " : ""), w);
+                if ((w = getWarningCount()))
+                        msg += ssprintf("%s%d warning(s)", (msg.size()>0 ? ", " : ""), w);
+                if ((w = getInfoCount()))
+                        msg += ssprintf("%s%d message(s)", (msg.size()>0 ? ", " : ""), w);
                 return msg;
         }

cpp/common/loggers/loggers.h

@@ -95 +95 @@
 
         int getErrorCount() const   { return errcount; }
-        int getWarningCount() const { return warncount; }
-        int getInfoCount() const    { return infocount; }
+        int getErrorWarningCount() const   { return warncount; } //previously: getWarningCount()
+        int getErrorWarningInfoCount() const   { return infocount; } //previously: getInfoCount()
+        int getWarningCount() const { return warncount-errcount; }
+        int getInfoCount() const    { return infocount-warncount; }
         int getStoredCount() const  { return storedcount; }
         int getErrorLevel() const   { return maxlevel; }

cpp/frams/genetics/fH/fH_oper.cpp

@@ -71 +71 @@
         int amount = builder.removeNeuronsWithInvalidClasses();
         // if there were any warnings, then rewrite genotype
-        if (eh.getWarningCount() > 0 || amount > 0)
+        if (eh.getErrorWarningCount() > 0 || amount > 0)
         {
                 free(geno);

cpp/frams/model/model.cpp

@@ -406 +406 @@
                         return;
                 }
-                if (mh.getWarningCount())
+                if (mh.getErrorWarningCount())
                 {
                         if (f0warnposition < 0) f0warnposition = lastpos;