Changeset 5be0eb for src

Timestamp:

Mar 19, 2010, 4:30:57 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

052b8d0

Parents:

229e3c

git-author:

Tillmann Crueger <crueger@…> (03/19/10 10:50:06)

git-committer:

Tillmann Crueger <crueger@…> (03/19/10 16:30:57)

Message:

Added more functionality to custom asserts.

• Asserts allow now setting any choice as default behaviour
• Asserts allow setting of hooks that have to be performed before the exit is done

Location:

src

Files:

• Helpers/Assert.cpp (modified) (4 diffs)
• Helpers/Assert.hpp (modified) (3 diffs)
• unittests/AnalysisCorrelationToSurfaceUnitTest.cpp (modified) (2 diffs)

src/Helpers/Assert.cpp

@@ -11 +11 @@
 using namespace std;
 
-bool _my_assert::always_throw = false;
+namespace Assert{
+  AssertionFailure::AssertionFailure(std::string _condition,
+                                     std::string _file,
+                                     int _line,
+                                     std::string _message) :
+    condition(_condition),
+    file(_file),
+    line(_line),
+    message(_message)
+  {}
+
+  std::string AssertionFailure::getFile(){
+    return file;
+  }
+
+  int AssertionFailure::getLine(){
+    return line;
+  }
+
+  std::string AssertionFailure::getMessage(){
+    return message;
+  }
+
+  std::ostream& AssertionFailure::operator<<(std::ostream& out){
+    out << "Assertion \"" << condition << "\" failed in file " << file << " at line " << line << endl;
+    out << "Assertion Message: " << message << std::endl;
+    return out;
+  }
+
+  const char  ActionKeys[]  = {'\0','a','t','i'};
+  const char* ActionNames[] = {"Ask","Abort","Throw","Ignore"};
+}
+
+using namespace Assert;
+
+Action _my_assert::defaultAction = Ask;
+std::vector<Assert::hook_t> _my_assert::hooks;
 
 bool _my_assert::check(const bool res,
@@ -23 +59 @@
     cout << "Assertion " << condition << " failed in file " << filename << " at line " << line << endl;
     cout << "Assertion Message: " << message << std::endl;
-    if(always_throw){
-      throw AssertException(filename,line);
-    }
     while(true){
-      cout << "Please choose: (a)bbort, (t)hrow execption, (i)gnore, al(w)ays ignore" << endl;
       char choice;
-      cin >> choice;
+      if(defaultAction==Ask) {
+        cout << "Please choose: (a)bort, (t)hrow execption, (i)gnore, al(w)ays ignore" << endl;
+        cin >> choice;
+      }
+      else{
+        choice = ActionKeys[defaultAction];
+      }
       switch(choice){
         case 'a':
@@ -35 +73 @@
           break;
         case 't':
-          throw AssertException(filename,line);
+          throw AssertionFailure(condition,filename,line,message);
           break;
         case 'w':
@@ -48 +86 @@
   return false;
 }
+
+void _my_assert::doHooks(){
+  for(vector<hook_t>::reverse_iterator iter = hooks.rbegin(); iter!=hooks.rend(); ++iter ){
+    (*iter)();
+  }
+}
+
+void _my_assert::addHook(hook_t hook){
+  hooks.push_back(hook);
+}
+
+void _my_assert::removeHook(Assert::hook_t hook){
+  for(vector<hook_t>::iterator iter = hooks.begin(); iter!=hooks.end();){
+    if((*iter)==hook){
+      iter = hooks.erase(iter);
+    }
+    else{
+      ++iter;
+    }
+  }
+}
+
+void _my_assert::setDefault(Assert::Action action){
+  defaultAction = action;
+}
+Assert::Action _my_assert::getDefault(){
+  return defaultAction;
+}
+std::string _my_assert::printDefault(){
+  return ActionNames[defaultAction];
+}

src/Helpers/Assert.hpp

@@ -10 +10 @@
 
 #include<string>
+#include<vector>
 
-class AssertException{
-public:
-  AssertException(std::string _file, int _line) :
-    file(_file),
-    line(_line)
-    {}
-  std::string getFile(){
-      return file;
-    }
-  int getLine(){
-    return line;
-  }
-private:
-  std::string file;
-  int line;
-};
+namespace Assert{
+
+  typedef void (*hook_t)(void);
+
+
+  enum Action {Ask,Abort,Throw,Ignore,MAX_ACTION};
+  extern const char  ActionKeys[MAX_ACTION];
+  extern const char* ActionNames[MAX_ACTION];
+
+  class AssertionFailure{
+  public:
+    AssertionFailure(std::string _condition, std::string _file, int _line, std::string _message);
+    std::string getFile();
+    int getLine();
+    std::string getMessage();
+
+    std::ostream& operator<<(std::ostream&);
+  private:
+    std::string condition;
+    std::string file;
+    int line;
+    std::string message;
+  };
+}
 
 #ifndef NDEBUG
@@ -44 +53 @@
       static bool ignore = false;\
       if(!ignore){\
-        if(_my_assert::check((condition),STRINGIFY(condition),(message),__FILE__,__LINE__,ignore))\
+        if(_my_assert::check((condition),STRINGIFY(condition),(message),__FILE__,__LINE__,ignore)){\
+          _my_assert::doHooks();\
           DEBUG_BREAK;\
+        }\
       } \
     }while(0)
 
-  #define ASSERT_DO_THROW     do{_my_assert::always_throw=true;}while(0)
-  #define ASSERT_DONT_THROW   do{_my_assert::always_throw=false;}while(0)
+  #define ASSERT_DO(action)    do{_my_assert::setDefault(action);}while(0)
+  #define ASSERT_HOOK(hook)    do{_my_assert::addHook(hook);}while(0)
+  #define ASSERT_UNHOOK(hook)  do{_my_assert::removeHook(hook);}while(0)
+  #define ASSERT_DEFAULT       (_myAssert::printDefault())
 #else
   // we need to do something, so this is the usual solution (e.g. assert.h)
   #define ASSERT(condition,message) (void)(0)
-  #define ASSERT_DO_THROW           (void)(0)
-  #define ASSERT_DONT_THROW         (void)(0)
+  #define ASSERT_DO(action)         (void)(0)
+  #define ASSERT_HOOK(hook)         (void)(0)
+  #define ASSERT_UNHOOK(hook)       (void)(0)
+  #define ASSERT_DEFAULT            std::string("Deactivated")
 #endif
 
@@ -67 +82 @@
                     const int line,
                     bool& ignore);
-  static bool always_throw;
+  static void addHook(Assert::hook_t hook);
+  static void removeHook(Assert::hook_t hook);
+  static void doHooks();
+  static void setDefault(Assert::Action);
+  static Assert::Action getDefault();
+  static std::string printDefault();
+private:
+  static Assert::Action defaultAction;
+  static std::vector<Assert::hook_t> hooks;
 };
 //! @endcond

src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

@@ -27 +27 @@
 #include "World.hpp"
 
+#include "Helpers/Assert.hpp"
+
 #ifdef HAVE_TESTRUNNER
 #include "UnitTestMain.hpp"
@@ -38 +40 @@
 void AnalysisCorrelationToSurfaceUnitTest::setUp()
 {
+  ASSERT_DO(Assert::Throw);
+
   atom *Walker = NULL;