Changeset 7c7696 for src

Timestamp:

May 8, 2017, 1:59:50 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

a5f2fa

Parents:

cdc2f5

git-author:

Frederik Heber <heber@…> (03/23/17 03:34:50)

git-committer:

Frederik Heber <frederik.heber@…> (05/08/17 13:59:50)

Message:

FIX: STATUS msg only pushed to GUI, now also always in log.

Location:

src/Actions

Files:

• Action.hpp (modified) (1 diff)
• PotentialAction/ParsePotentialsAction.cpp (modified) (1 diff)

src/Actions/Action.hpp

@@ -29 +29 @@
  */
 #ifndef STATUS
-#define STATUS(msg) pushStatus(msg)
+#define STATUS(msg) \
+  pushStatus(msg); \
+  LOG(0, "STATUS: " << msg)
 #endif
 

src/Actions/PotentialAction/ParsePotentialsAction.cpp

@@ -73 +73 @@
         deserialize();
       } catch (SerializerMissingValueException &e) {
-        if (const std::string *key = boost::get_error_info<SerializerKey>(e))
+        if (const std::string *key = boost::get_error_info<SerializerKey>(e)) {
           STATUS("Missing value when parsing information for potential "+*key+".");
-        else
+        } else
           STATUS("Missing value parsing information for potential with unknown key.");
         return Action::failure;
       } catch (SerializerIllegalKeyException &e) {
-        if (const std::string *key = boost::get_error_info<SerializerKey>(e))
+        if (const std::string *key = boost::get_error_info<SerializerKey>(e)) {
           STATUS("Illegal key parsing information for potential "+*key+".");
-        else
+        } else {
           STATUS("Illegal key parsing information for potential with unknown key.");
+        }
         return Action::failure;
       }