Changeset 185:33ee25e05181

Timestamp:

04/30/2012 07:22:02 PM (13 months ago)

Author:

Andreas Schaefer <gentryx@…>

Branch:

default

Message:

stripped FixedCoord? from out of place ID

Location:

src

Files:

• misc/floatcoord.h (modified) (5 diffs)
• misc/meshlessadapter.h (modified) (6 diffs)
• misc/test/unit/meshlessadaptertest.h (modified) (2 diffs)
• testbed/testbed.cpp (modified) (2 diffs)

src/misc/floatcoord.h

@@ -9 +9 @@
 
 /**
- * A real valued coordinate class, which contains an optional ID.
+ * A real valued coordinate class. Can also be seen as a short,
+ * fixed-size vector.
  */
 template<int DIM>
@@ -27 +28 @@
 
     boost::array<double, DIM> c;
-    // fixme: get rid of this
-    int id;
 };
 
@@ -40 +39 @@
     explicit
     inline
-    FloatCoord(const double& x = 0, const int _id = 0) 
+    FloatCoord(const double& x = 0) 
     {
         c[0] = x;
-        id = _id;
     }
 
@@ -61 +59 @@
 template<>
 class FloatCoord<2> : public FloatCoordBase<2>
+{
+public:
+
+    explicit
+    inline
+    FloatCoord(
+        const double& x = 0, 
+        const double& y = 0) 
+    {
+        c[0] = x;
+        c[1] = y;
+    }
+
+    inline
+    double length() const
+    {
+        return sqrt(c[0] * c[0] + 
+                    c[1] * c[1]);
+    }
+
+    inline
+    double sum() const
+    {
+        return c[0] + c[1];
+    }
+};
+
+template<>
+class FloatCoord<3> : public FloatCoordBase<3>
 {
 public:
@@ -69 +96 @@
         const double& x = 0, 
         const double& y = 0, 
-        const int _id = 0) 
-    {
-        c[0] = x;
-        c[1] = y;
-        id = _id;
-    }
-
-    inline
-    double length() const
-    {
-        return sqrt(c[0] * c[0] + 
-                    c[1] * c[1]);
-    }
-
-    inline
-    double sum() const
-    {
-        return c[0] + c[1];
-    }
-};
-
-template<>
-class FloatCoord<3> : public FloatCoordBase<3>
-{
-public:
-
-    explicit
-    inline
-    FloatCoord(
-        const double& x = 0, 
-        const double& y = 0, 
-        const double& z = 0,
-        const int _id = 0) 
+        const double& z = 0)
     {
         c[0] = x;
         c[1] = y;
         c[2] = z;
-        id = _id;
     }
 

src/misc/meshlessadapter.h

@@ -24 +24 @@
     static const int MAX_SIZE = 300000;
 
-    typedef std::list<FloatCoord<DIM> > CoordList;
+    typedef std::list<std::pair<FloatCoord<DIM>, int> > CoordList;
     typedef Grid<CoordList, TOPOLOGY> CoordListGrid;
-    typedef SuperVector<FloatCoord<DIM> > CoordVec;
+    typedef SuperVector<std::pair<FloatCoord<DIM>, int> > CoordVec;
     typedef SuperVector<SuperVector<int> > Graph;
 
@@ -58 +58 @@
     }
 
-    inline void insert(CoordListGrid *grid, const FloatCoord<DIM>& pos) const
+    inline void insert(CoordListGrid *grid, const FloatCoord<DIM>& pos, const int& id) const
     {
         Coord<2> c = posToCoord(pos);
-        (*grid)[c].push_back(pos);
+        (*grid)[c].push_back(std::make_pair(pos, id));
     }
 
@@ -96 +96 @@
         CoordBoxSequence<DIM> s = box.sequence();
         while (s.hasNext()) {
-            const std::list<FloatCoord<DIM> >& list = positions[s.next()];
-            for (typename std::list<FloatCoord<DIM> >::const_iterator iter = list.begin();
+            const CoordList& list = positions[s.next()];
+            for (typename CoordList::const_iterator iter = list.begin();
                  iter != list.end();
                  ++iter) {
@@ -189 +189 @@
             for (SuperVector<int>::const_iterator n = graph[i].begin(); 
                  n != graph[i].end(); ++n) 
-                if (manhattanDistance(positions[i], positions[*n]) > 1)
+                if (manhattanDistance(positions[i].first, positions[*n].first) > 1)
                     return false;
 
@@ -267 +267 @@
 
     bool searchList(
-        const std::list<FloatCoord<DIM> >& list,
+        const CoordList& list,
         const FloatCoord<DIM>& pos,
         std::set<int> *coords = 0) const
@@ -273 +273 @@
         bool found = false;
 
-        for (typename std::list<FloatCoord<DIM> >::const_iterator iter = list.begin();
+        for (typename CoordList::const_iterator iter = list.begin();
              iter != list.end();
              ++iter) {
-            if (distance2(pos, *iter) < radius2) {
+            if (distance2(pos, iter->first) < radius2) {
                 found = true;
                 if (coords)
-                    coords->insert(iter->id);
+                    coords->insert(iter->second);
             }
         }

src/misc/test/unit/meshlessadaptertest.h

@@ -65 +65 @@
 
         for (int i = 0; i < 6; ++i) 
-            adapter.insert(&grid, FloatCoord<2>(i + 0.5, 0.5, i));
+            adapter.insert(&grid, FloatCoord<2>(i + 0.5, 0.5), i);
 
         std::set<int> coords;
@@ -124 +124 @@
         MyAdapter::Graph graph;
         for (int i = 0; i < width; ++i) {
-            positions.push_back(FloatCoord<2>(i * 0.5, 0.5, i));
+            positions.push_back(std::make_pair(FloatCoord<2>(i * 0.5, 0.5), i));
             SuperVector<int> neighbors;
             neighbors << ((i + width - 1) % width)

src/testbed/testbed.cpp

@@ -151 +151 @@
             coefficients, 
             source,
+            index +
             coord.x() +
             coord.y() * DIM_X + 
@@ -198 +199 @@
     operator[](FixedCoord<X, Y, Z> /*unused*/) const
     {
-        return FixedNeighborhood<DIM_X, DIM_Y, DIM_Z, X + Y * DIM_X + Z * DIM_X * DIM_Y>(coefficients, source);
+        return FixedNeighborhood<DIM_X, DIM_Y, DIM_Z, INDEX + X + Y * DIM_X + Z * DIM_X * DIM_Y>(coefficients, source);
+    }
+
+    Neighborhood<DIM_X, DIM_Y, DIM_Z>
+    operator[](Coord<3> coord) const
+    {
+        return Neighborhood<DIM_X, DIM_Y, DIM_Z>(
+            coefficients, 
+            source,
+            INDEX +
+            coord.x() +
+            coord.y() * DIM_X + 
+            coord.z() * DIM_X * DIM_Y);
     }