Changes in src/boundary.hpp [6b5657:88b400]

File:

• src/boundary.hpp (modified) (5 diffs)

src/boundary.hpp

@@ -1 +1 @@
 #ifndef BOUNDARY_HPP_
 #define BOUNDARY_HPP_
+
+using namespace std;
 
 /*********************************************** includes ***********************************/
@@ -16 +18 @@
 
 #include "defs.hpp"
-#include "BoundaryMaps.hpp"
 
 /****************************************** forward declarations *****************************/
 
+class atom;
 class BoundaryPointSet;
 class BoundaryLineSet;
@@ -28 +30 @@
 class MoleculeListClass;
 class Tesselation;
-class TesselPoint;
 class Vector;
 
@@ -37 +38 @@
 enum { SingleStepWidth=10 };
 
+typedef std::pair < double, class atom* > DistancePair;
+typedef std::multimap < double, class atom* > DistanceMap;
+typedef std::pair < DistanceMap::iterator, bool> DistanceTestPair;
+
+typedef std::map <double, DistancePair > Boundaries;
+typedef std::pair<double, DistancePair > BoundariesPair;
+typedef std::pair< Boundaries::iterator, bool> BoundariesTestPair;
+
 /********************************************** declarations *******************************/
 
@@ -43 +52 @@
 void FindConvexBorder(const molecule* const mol, Boundaries *BoundaryPts, Tesselation *&TesselStruct, const LinkedCell *LCList, const char *filename);
 Vector* FindEmbeddingHole(MoleculeListClass *mols, molecule *srcmol);
+void FindNextSuitablePoint(class BoundaryTriangleSet *BaseTriangle, class BoundaryLineSet *BaseLine, atom*& OptCandidate, Vector *OptCandidateCenter, double *ShortestAngle, const double RADIUS, LinkedCell *LC);
 bool FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LC, const double RADIUS, const char *tempbasename);
 Boundaries *GetBoundaryPoints(const molecule *mol, Tesselation *&TesselStruct);