Changeset d40b96

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

dcbdf2

Parents:

4bc937

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:

molecuilder/src

Files:

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

molecuilder/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 );
 

molecuilder/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);
 };