Changeset dfc1c7 for molecuilder

Timestamp:

Sep 5, 2008, 5:02:18 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

5887ed

Parents:

0f508c

Message:

moved all definitions from boundary.hpp to molecules.hpp, and renamed DistanceNrPair to DistancePair.

Location:

molecuilder/src

Files:

• boundary.cpp (modified) (1 diff)
• boundary.hpp (modified) (1 diff)
• molecules.hpp (modified) (1 diff)

molecuilder/src/boundary.cpp

@@ -252 +252 @@
       //ProjectedVector.Output(out);
       //*out << endl;
-      BoundaryTestPair = BoundaryPoints[axis].insert( BoundariesPair (angle, DistanceNrPair (radius, Walker) ) );
+      BoundaryTestPair = BoundaryPoints[axis].insert( BoundariesPair (angle, DistancePair (radius, Walker) ) );
       if (BoundaryTestPair.second) { // successfully inserted
       } else { // same point exists, check first r, then distance of original vectors to center of gravity

molecuilder/src/boundary.hpp

@@ -19 +19 @@
 
 #include "molecules.hpp"
-
-#define DistanceNrPair pair < double, atom* >
-#define DistanceMap multimap < double, atom* >
-#define DistanceTestPair pair < DistanceMap::iterator, bool>
-
-#define Boundaries map <double, DistanceNrPair >
-#define BoundariesPair pair<double, DistanceNrPair >
-#define BoundariesTestPair pair< Boundaries::iterator, bool>
-
-#define PointMap map < int, class BoundaryPointSet * > 
-#define PointPair pair < int, class BoundaryPointSet * > 
-#define PointTestPair pair < PointMap::iterator, bool > 
-
-#define LineMap map < int, class BoundaryLineSet * > 
-#define LinePair pair < int, class BoundaryLineSet * > 
-#define LineTestPair pair < LinePair::iterator, bool > 
-
-#define TriangleMap map < int, class BoundaryTriangleSet * > 
-#define TrianglePair pair < int, class BoundaryTriangleSet * > 
-#define TriangleTestPair pair < TrianglePair::iterator, bool > 
-
-#define DistanceMultiMap multimap <double, pair < PointMap::iterator, PointMap::iterator> >
-#define DistanceMultiMapPair pair <double, pair < PointMap::iterator, PointMap::iterator> >
 
 template <typename T> void SetEndpointsOrdered(T endpoints[2], T endpoint1, T endpoint2)

molecuilder/src/molecules.hpp

@@ -45 +45 @@
 #define KeySetTestPair pair<KeySet::iterator, bool>
 #define GraphTestPair pair<Graph::iterator, bool>
+
+#define DistancePair pair < double, atom* >
+#define DistanceMap multimap < double, atom* >
+#define DistanceTestPair pair < DistanceMap::iterator, bool>
+
+#define Boundaries map <double, DistancePair >
+#define BoundariesPair pair<double, DistancePair >
+#define BoundariesTestPair pair< Boundaries::iterator, bool>
+
+#define PointMap map < int, class BoundaryPointSet * > 
+#define PointPair pair < int, class BoundaryPointSet * > 
+#define PointTestPair pair < PointMap::iterator, bool > 
+
+#define LineMap map < int, class BoundaryLineSet * > 
+#define LinePair pair < int, class BoundaryLineSet * > 
+#define LineTestPair pair < LinePair::iterator, bool > 
+
+#define TriangleMap map < int, class BoundaryTriangleSet * > 
+#define TrianglePair pair < int, class BoundaryTriangleSet * > 
+#define TriangleTestPair pair < TrianglePair::iterator, bool > 
+
+#define DistanceMultiMap multimap <double, pair < PointMap::iterator, PointMap::iterator> >
+#define DistanceMultiMapPair pair <double, pair < PointMap::iterator, PointMap::iterator> >
+
+/******************************** Some small functions and/or structures **********************************/
 
 struct KeyCompare