Changeset 921097 for molecuilder/src

Timestamp:

Oct 17, 2009, 4:49:59 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

d70bf6

Parents:

25e34b

Message:

Templated version of flip now operates with references instead of pointers.

• vector::SolveSystem() was changed accordingly.

Location:

molecuilder/src

Files:

• helpers.hpp (modified) (1 diff, 1 prop)
• vector.cpp (modified) (2 diffs, 1 prop)

molecuilder/src/helpers.hpp

@@ -55 +55 @@
 
 /** Flips two values.
- * \param *x pointer to first value
- * \param *y pointer to second value
+ * \param x first value
+ * \param y second value
  */
-template <typename T> void flip(T *x, T *y)
+template <typename T> void flip(T &x, T &y)
 {
   T tmp;
-  tmp = *x;
-  *x = *y;
-  *y = tmp;
+  tmp = x;
+  x = y;
+  y = tmp;
 };
 

molecuilder/src/vector.cpp

@@ -1139 +1139 @@
       break;
     case 2:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      //flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      //flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      //flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      //flip(x[1],x[2]);
     case 1:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      //flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      //flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      //flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      //flip(x[1],x[2]);
       break;
   }
@@ -1224 +1224 @@
       break;
     case 2:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      flip(x[1],x[2]);
     case 1:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      //flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      //flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      flip(x[1],x[2]);
       break;
   }