Changeset 175543

Timestamp:

May 23, 2017, 8:58:33 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_tocheck

Children:

4daa9c

Parents:

b03d7d

Message:

tempcommit: Merge with 060fc39

Location:

src/Graph

Files:

• BreadthFirstSearchGatherer.cpp (modified) (4 diffs)
• BreadthFirstSearchGatherer.hpp (modified) (1 diff)

src/Graph/BreadthFirstSearchGatherer.cpp

@@ -58 +58 @@
   distance_recorder(
       DistanceMap dist,
-      const size_t _max_distance) : d(dist), max_distance(_max_distance) {}
+      const int _max_distance) : d(dist), max_distance(_max_distance) {}
 
   template <typename Edge, typename Graph>
@@ -68 +68 @@
   template <typename Vertex, typename Graph>
   void discover_vertex(Vertex u, const Graph &g) const {
-    if ((max_distance > 0) && (d[u] >= max_distance))
+    if ((max_distance >= 0) && (d[u] >= max_distance))
       throw found_max_distance();
   }
@@ -74 +74 @@
 private:
   DistanceMap d;
-  const size_t max_distance;
+  const int max_distance;
 };
 
@@ -89 +89 @@
 std::vector<atomId_t> BreadthFirstSearchGatherer::operator()(
     const atomId_t &_discoverfrom,
-    const size_t &_max_distance)
+    const int &_max_distance)
 {
   std::vector<atomId_t> returnids;

src/Graph/BreadthFirstSearchGatherer.hpp

@@ -42 +42 @@
    *
    * \param _discoverfrom node to start BFS from
-   * \param _max_distance max distance to discover (0 means all)
+   * \param _max_distance max distance to discover (negative means all)
    */
   std::vector<atomId_t> operator()(
       const atomId_t &_discoverfrom,
-      const size_t &_max_distance = 0);
+      const int &_max_distance = -1);
 
   /** Getter to the internal map of distances of each atomic id.