Changeset 452 for cpp

Timestamp:

11/29/15 22:19:52 (9 years ago)

Author:

Maciej Komosinski

Message:

Validation of genotypes additionally prints genotype name when there are any problems

Location:

cpp

Files:

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

cpp/common/loggers/loggers.cpp

@@ -123 +123 @@
         }
 }
+
+string LoggerToMemory::getCountSummary() const
+{
+if (getInfoCount())
+        {
+        string msg;
+        if (getErrorCount())
+                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);
+        return msg;
+        }
+return string("");
+}
+

cpp/common/loggers/loggers.h

@@ -91 +91 @@
         };
 
-        int getErrorCount()       { return errcount; }
-        int getWarningCount()     { return warncount; }
-        int getInfoCount()        { return infocount; }
-        int getStoredCount()      { return storedcount; }
-        int getErrorLevel()       { return maxlevel; }
-        const string getMessages() { return msgs; }
+        int getErrorCount() const   { return errcount; }
+        int getWarningCount() const { return warncount; }
+        int getInfoCount() const    { return infocount; }
+        int getStoredCount() const  { return storedcount; }
+        int getErrorLevel() const   { return maxlevel; }
+        string getMessages() const  { return msgs; }
+        string getCountSummary() const; ///< return the standard "... error(s), ... warning(s), ... message(s)" text (or empty string if count==0)
 
         LoggerToMemory(int opts = 0, int minimal_level_to_store = LOG_ERROR) :LoggerBase(opts), minleveltostore(minimal_level_to_store)

cpp/frams/genetics/geno.cpp

@@ -5 +5 @@
 #include "geno.h"
 #include "genoconv.h"
+#include <common/loggers/loggers.h>
+#include <common/stl-util.h>
 #include <frams/model/model.h>
 
@@ -255 +257 @@
 bool Geno::isValid(void)
 {
-        if (isvalid<0) validate();
+        if (isvalid<0)
+                {
+                LoggerToMemory err(LoggerBase::Enable | LoggerToMemory::StoreAllMessages,LOG_INFO);
+                validate();
+                err.disable();
+                string msg=err.getCountSummary();
+                if (msg.size()>0)
+                        {
+                        msg+=ssprintf(" while checking validity of '%s'",getName().c_str());
+                        msg+="\n";
+                        msg+=err.getMessages();
+                        logMessage("Geno","isValid",err.getErrorLevel(),msg.c_str());
+                        }
+                }
         return isvalid>0;
 }