Changeset eb167d

Timestamp:

Aug 3, 2009, 3:26:32 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

f4a346

Parents:

4dca8e

Message:

Some minor fixes with regards to what needs to be included where and not more.

Location:

molecuilder/src

Files:

• bond.cpp (modified) (1 diff)
• bond.hpp (modified) (1 diff)
• boundary.cpp (modified) (1 diff)
• boundary.hpp (modified) (3 diffs)
• config.hpp (modified) (1 diff)
• helpers.hpp (modified) (1 diff)
• linkedcell.cpp (modified) (1 diff)
• molecules.hpp (modified) (3 diffs)
• vector.cpp (modified) (1 diff)

molecuilder/src/bond.cpp

@@ -6 +6 @@
 
 #include "bond.hpp"
-
 
 /***************************************** Functions for class bond ********************************/

molecuilder/src/bond.hpp

@@ -15 +15 @@
 #include <config.h>
 #endif
-
 
 #include "atom.hpp"

molecuilder/src/boundary.cpp

@@ +1 @@
+/** \file boundary.hpp
+ *
+ * Implementations and super-function for envelopes
+ */
+
+
 #include "boundary.hpp"
 

molecuilder/src/boundary.hpp

@@ -9 +9 @@
 // STL headers
 #include <map>
-#include <set>
-#include <deque>
 
 #include "config.hpp"
@@ -16 +14 @@
 #include "molecules.hpp"
 #include "tesselation.hpp"
-#include "tesselationhelpers.hpp"
 
 #define DEBUG 1
@@ -26 +23 @@
 #define Raster3DSuffix ".r3d"
 #define VRMLSUffix ".wrl"
+
+#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>
 
 double VolumeOfConvexEnvelope(ofstream *out, class Tesselation *TesselStruct, class config *configuration);

molecuilder/src/config.hpp

@@ -15 +15 @@
 #include <config.h>
 #endif
-
 
 #include "molecules.hpp"

molecuilder/src/helpers.hpp

@@ -20 +20 @@
 #include <math.h>
 #include <string>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
 
 #include "defs.hpp"

molecuilder/src/linkedcell.cpp

@@ +1 @@
+/** \file linkedcell.cpp
+ *
+ * Function implementations for the class LinkedCell.
+ *
+ */
+
+
 #include "linkedcell.hpp"
 #include "molecules.hpp"

molecuilder/src/molecules.hpp

@@ -18 +18 @@
 #include <gsl/gsl_randist.h>
 
-// STL headers
+//// STL headers
 #include <map>
 #include <set>
@@ -28 +28 @@
 #include "bond.hpp"
 #include "element.hpp"
-#include "helpers.hpp"
 #include "linkedcell.hpp"
 #include "parser.hpp"
@@ -50 +49 @@
 #define GraphTestPair pair<Graph::iterator, bool>
 
+#define MoleculeList list <molecule *>
+#define MoleculeListTest pair <MoleculeList::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 MoleculeList list <molecule *>
-#define MoleculeListTest pair <MoleculeList::iterator, bool>
-
-#define LinkedAtoms list <atom *>
+
+//#define LinkedAtoms list <atom *>
 
 /******************************** Some small functions and/or structures **********************************/

molecuilder/src/vector.cpp

@@ -4 +4 @@
  *
  */
+
 
 #include "molecules.hpp"