Changeset 2ba827

Timestamp:

Feb 3, 2010, 4:42:06 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:

50fc88c

Parents:

317df8

Message:

Changed all observed places to new observer structure

Location:

src

Files:

• Patterns/Observer.hpp (modified) (1 diff)
• molecule.cpp (modified) (11 diffs)
• moleculelist.cpp (modified) (2 diffs)
• unittests/CacheableTest.cpp (modified) (1 diff)

src/Patterns/Observer.hpp

@@ -87 +87 @@
 
 #define OBSERVE Observable::_Observable_protector _scope_obs_protector(this)
-#define START_OBSERVER Observable::start_observer_internal(this);do{do{}while(0)
-#define FINISH_OBSERVER }while(0);Observable::finish_observer_internal(this)
-#define RETURN_OBSERVER( retval ) do{Observable::finish_observer_internal(this); return (retval);}while(0)
+// deprecated macros from before RAII was used
+//#define START_OBSERVER Observable::start_observer_internal(this);do{do{}while(0)
+//#define FINISH_OBSERVER }while(0);Observable::finish_observer_internal(this)
+//#define RETURN_OBSERVER( retval ) do{Observable::finish_observer_internal(this); return (retval);}while(0)
 #endif /* OBSERVER_HPP_ */

src/molecule.cpp

@@ -71 +71 @@
 
 void molecule::setName(const std::string _name){
-  START_OBSERVER;
+  OBSERVE;
   strncpy(name,_name.c_str(),MAXSTRINGSIZE);
-  FINISH_OBSERVER;
 }
 
@@ -104 +103 @@
 {
   bool retval = false;
-  START_OBSERVER;
+  OBSERVE;
   if (pointer != NULL) {
     pointer->sort = &pointer->nr;
@@ -123 +122 @@
     retval = add(pointer, end);
   }
-  FINISH_OBSERVER;
   return retval;
 };
@@ -135 +133 @@
 {
   atom *retval = NULL;
-  START_OBSERVER;
+  OBSERVE;
   if (pointer != NULL) {
     atom *walker = new atom(pointer);
@@ -147 +145 @@
     retval=walker;
   }
-  FINISH_OBSERVER;
   return retval;
 };
@@ -188 +185 @@
 {
   bool AllWentWell = true;    // flag gathering the boolean return value of molecule::AddAtom and other functions, as return value on exit
-  START_OBSERVER;
+  OBSERVE;
   double bondlength;  // bond length of the bond to be replaced/cut
   double bondangle;  // bond angle of the bond to be replaced/cut
@@ -235 +232 @@
   if (BondRescale == -1) {
     eLog() << Verbose(1) << "There is no typical hydrogen bond distance in replacing bond (" << TopOrigin->Name << "<->" << TopReplacement->Name << ") of degree " << TopBond->BondDegree << "!" << endl;
-    RETURN_OBSERVER(false);
+    return false;
     BondRescale = bondlength;
   } else {
@@ -315 +312 @@
       if (bondangle == -1) {
         eLog() << Verbose(1) << "There is no typical hydrogen bond angle in replacing bond (" << TopOrigin->Name << "<->" << TopReplacement->Name << ") of degree " << TopBond->BondDegree << "!" << endl;
-        RETURN_OBSERVER(false);
+        return false;
         bondangle = 0;
       }
@@ -442 +439 @@
   Free(&matrix);
 
-  FINISH_OBSERVER;
 //  Log() << Verbose(3) << "End of AddHydrogenReplacementAtom." << endl;
   return AllWentWell;
@@ -468 +464 @@
     return false;
 
-  START_OBSERVER;
+  OBSERVE;
   getline(xyzfile,line,'\n'); // Read numer of atoms in file
   input = new istringstream(line);
@@ -509 +505 @@
   xyzfile.close();
   delete(input);
-  FINISH_OBSERVER;
   return true;
 };

src/moleculelist.cpp

@@ -50 +50 @@
 void MoleculeListClass::insert(molecule *mol)
 {
-  START_OBSERVER;
+  OBSERVE;
   mol->IndexNr = MaxIndex++;
   ListOfMolecules.push_back(mol);
   mol->signOn(this);
-  FINISH_OBSERVER;
 };
 
@@ -892 +891 @@
 
 void MoleculeListClass::createNewMolecule(periodentafel *periode) {
-  START_OBSERVER;
+  OBSERVE;
   molecule *mol = NULL;
   mol = new molecule(periode);
   insert(mol);
-  FINISH_OBSERVER;
 };
 

src/unittests/CacheableTest.cpp

@@ -27 +27 @@
 
   void setX(int _x){
-    START_OBSERVER;;
+    OBSERVE;
     x = _x;
-    FINISH_OBSERVER;
   }
 
   void setY
   (int _y){
-    START_OBSERVER;;
+    OBSERVE;
     y = _y;
-    FINISH_OBSERVER;
   }
 
   void setZ(int _z){
-    START_OBSERVER;;
+    OBSERVE;
     z = _z;
-    FINISH_OBSERVER;
   }