Changeset eaee7f for src

Timestamp:

Oct 5, 2009, 9:14:28 PM (15 years ago)

Author:

Frederik Heber <heber@…>

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:

e65246

Parents:

33f9f7

Message:

even the class of the member function can be templated, see ActOnAllUnitTest.

Note however that specializations of templated member functions are not allowed.

Location:

src

Files:

• ActOnAllUnitTest.cpp (modified) (5 diffs)
• ActOnAlltest.hpp (modified) (2 diffs)

src/ActOnAllUnitTest.cpp

@@ -40 +40 @@
 };
 
-/** UnitTest for VectorList::ActOnAllVectors() and Vector::AddVector(), Vector::SubtractVector(),
+/** UnitTest for VectorList::ActOnAll() and Vector::AddVector(), Vector::SubtractVector(),
  */
 void ActOnAllTest::AddSubtractTest()
@@ -47 +47 @@
 
   // adding, subtracting
-  VL.ActOnAllVectors( &Vector::AddVector, &test );
+  VL.ActOnAll( &Vector::AddVector, &test );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
-  VL.ActOnAllVectors( &Vector::SubtractVector, &test );
+  VL.ActOnAll( &Vector::SubtractVector, &test );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , true );
 };
 
-/** UnitTest for VectorList::ActOnAllVectors()
+/** UnitTest for VectorList::ActOnAll()
  */
 void ActOnAllTest::ScaleTest()
@@ -61 +61 @@
 
   // scaling by value
-  VL.ActOnAllVectors( (void (Vector::*)(double)) &Vector::Scale, 2. );
+  VL.ActOnAll( (void (Vector::*)(double)) &Vector::Scale, 2. );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
 
-  VL.ActOnAllVectors( (void (Vector::*)(double)) &Vector::Scale, 0.5 );
+  VL.ActOnAll( (void (Vector::*)(double)) &Vector::Scale, 0.5 );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , true );
 
   // scaling by ref
-  VL.ActOnAllVectors( (void (Vector::*)(double *)) &Vector::Scale, &factor );
+  VL.ActOnAll( (void (Vector::*)(double *)) &Vector::Scale, &factor );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
 
-  VL.ActOnAllVectors( (void (Vector::*)(double *)) &Vector::Scale, &inverse );
+  VL.ActOnAll( (void (Vector::*)(double *)) &Vector::Scale, &inverse );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , true );
 
@@ -81 +81 @@
     inverses[i] = 1./factors[i];
   }
-  VL.ActOnAllVectors( (void (Vector::*)(double **)) &Vector::Scale, &factors );
+  VL.ActOnAll( (void (Vector::*)(double **)) &Vector::Scale, &factors );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
 
-  VL.ActOnAllVectors( (void (Vector::*)(double **)) &Vector::Scale, &inverses );
+  VL.ActOnAll( (void (Vector::*)(double **)) &Vector::Scale, &inverses );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , true );
 };
 
-/** UnitTest for VectorList::ActOnAllVectors() and Vector::MakeNormalVector()
+/** UnitTest for VectorList::ActOnAll() and Vector::MakeNormalVector()
  */
 void ActOnAllTest::NormalizeTest()
@@ -97 +97 @@
   // normalize with respect to x and y axis
   bool (Vector::*f)(const Vector *, const Vector *) = &Vector::MakeNormalVector;
-  VL.ActOnAllVectors( f, &xaxis, &yaxis );
+  VL.ActOnAll( f, &xaxis, &yaxis );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
 

src/ActOnAlltest.hpp

@@ -26 +26 @@
   void EmptyList();
 
-  template <typename res, typename T> void ActOnAllVectors( res (Vector::*f)(T), T t );
-  template <typename res, typename T, typename U> void ActOnAllVectors( res (Vector::*f)(T, U), T t, U u );
-  template <typename res, typename T, typename U, typename V> void ActOnAllVectors( res (Vector::*f)(T, U, V), T t, U u, V v);
+  template <typename klasse, typename res, typename T> void ActOnAll( res (klasse::*f)(T), T t );
+  template <typename klasse, typename res, typename T, typename U> void ActOnAll( res (klasse::*f)(T, U), T t, U u );
+  template <typename klasse, typename res, typename T, typename U, typename V> void ActOnAll( res (klasse::*f)(T, U, V), T t, U u, V v);
 
   bool operator == (VectorList &rhs);
@@ -70 +70 @@
 VectorList::~VectorList() { };
 
-template <typename res, typename T> void VectorList::ActOnAllVectors( res (Vector::*f)(T), T t )
+template <typename klasse, typename res, typename T> void VectorList::ActOnAll( res (klasse::*f)(T), T t )
 {
-  Vector *test = NULL;
-  for (ListOfVectors::iterator Runner = Vectors.begin(); Runner != Vectors.end(); Runner++) {
-    test = *Runner;
-    (test->*f)(t);
-  }
+  for (ListOfVectors::iterator Runner = Vectors.begin(); Runner != Vectors.end(); Runner++)
+    ((*Runner)->*f)(t);
 };
 
-template <typename res, typename T, typename U> void VectorList::ActOnAllVectors( res (Vector::*f)(T, U), T t, U u )
+template <typename klasse, typename res, typename T, typename U> void VectorList::ActOnAll( res (klasse::*f)(T, U), T t, U u )
 {
-  Vector *test = NULL;
-  for (ListOfVectors::iterator Runner = Vectors.begin(); Runner != Vectors.end(); Runner++) {
-    test = *Runner;
-    (test->*f)(t, u);
-  }
+  for (ListOfVectors::iterator Runner = Vectors.begin(); Runner != Vectors.end(); Runner++)
+    ((*Runner)->*f)(t, u);
 };
 
-template <typename res, typename T, typename U, typename V> void VectorList::ActOnAllVectors( res (Vector::*f)(T, U, V), T t, U u, V v)
+template <typename klasse, typename res, typename T, typename U, typename V> void VectorList::ActOnAll( res (klasse::*f)(T, U, V), T t, U u, V v)
 {
-  Vector *test = NULL;
-  for (ListOfVectors::iterator Runner = Vectors.begin(); Runner != Vectors.end(); Runner++) {
-    test = *Runner;
-    (test->*f)(t, u, v);
-  }
+  for (ListOfVectors::iterator Runner = Vectors.begin(); Runner != Vectors.end(); Runner++)
+    ((*Runner)->*f)(t, u, v);
 };