Changeset 6dd8d3 for molecuilder/src/linkedcell.hpp

Timestamp:

Apr 9, 2010, 9:55:39 AM (16 years ago)

Author:

heber <heber@…>

Children:

bd8561

Parents:

6250e5

Message:

LinkedNodes is now declared inside LinkedCell and some new functions.

• as prepraratory measure we placed LinkedNodes as typedef into LinkedCell class. This caused same namespace changes elsewhere where LinkedNodes is used.
• new function GetallNeighbours() which performs going through linked cells.
• new function GetPointsInsideaSphere() which performs going through linked cells and returns all neighbours up to a given distance to a given center.

Note: New functions are not yet used elsewhere. Unit test has to be written beforehand.

Signed-off-by: heber <heber@…>

File:

• molecuilder/src/linkedcell.hpp (modified) (4 diffs)

molecuilder/src/linkedcell.hpp

@@ -33 +33 @@
 /********************************************** definitions *********************************/
 
-#define LinkedNodes list<TesselPoint *>
 
 /********************************************** declarations *******************************/
@@ -40 +39 @@
  */
 class LinkedCell {
-  public:
+private:
+
+public:
+  typedef list<TesselPoint *> LinkedNodes;
+
+
     Vector max;       // upper boundary
     Vector min;       // lower boundary
@@ -53 +57 @@
     LinkedCell(LinkedNodes *set, const double radius);
     ~LinkedCell();
-    const LinkedNodes* GetCurrentCell()const ;
-    const LinkedNodes* GetRelativeToCurrentCell(const int relative[NDIM])const ;
+    const LinkedCell::LinkedNodes* GetCurrentCell()const ;
+    const LinkedCell::LinkedNodes* GetRelativeToCurrentCell(const int relative[NDIM])const ;
     bool SetIndexToNode(const TesselPoint * const Walker)const ;
     bool SetIndexToVector(const Vector * const x)const ;
@@ -60 +64 @@
     bool CheckBounds(const int relative[NDIM])const ;
     void GetNeighbourBounds(int lower[NDIM], int upper[NDIM])const ;
+
+    LinkedCell::LinkedNodes* GetallNeighbours(const double distance) const;
+    LinkedCell::LinkedNodes* GetPointsInsideSphere(const double radius, const Vector * const center) const;
 
     // not implemented yet