From ee57f9abef3dff9d02c043bdd20ce3b180dd91a8 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Wed, 5 Apr 2017 16:29:40 +0200
Subject: [PATCH] Renamed ConstDistanceFinder =>
 ConstantWeightShortestPathFinder

---
 arangod/Aql/ShortestPathBlock.cpp                | 6 +++---
 arangod/Graph/ConstantWeightShortestPathFinder.h | 6 +++---
 arangod/VocBase/Traverser.h                      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arangod/Aql/ShortestPathBlock.cpp b/arangod/Aql/ShortestPathBlock.cpp
index e116ca5f51..6897fd4edf 100644
--- a/arangod/Aql/ShortestPathBlock.cpp
+++ b/arangod/Aql/ShortestPathBlock.cpp
@@ -41,7 +41,7 @@ typedef arangodb::graph::AttributeWeightShortestPathFinder<
     arangodb::traverser::ShortestPath>
     ArangoDBPathFinder;
 
-typedef arangodb::graph::ConstDistanceFinder<
+typedef arangodb::graph::ConstantWeightShortestPathFinder<
     arangodb::velocypack::Slice, arangodb::velocypack::Slice,
     arangodb::basics::VelocyPackHelper::VPackStringHash,
     arangodb::basics::VelocyPackHelper::VPackStringEqual,
@@ -366,7 +366,7 @@ ShortestPathBlock::ShortestPathBlock(ExecutionEngine* engine,
           EdgeWeightExpanderCluster(this, false),
           EdgeWeightExpanderCluster(this, true), _opts.bidirectional));
     } else {
-      _finder.reset(new arangodb::graph::ConstDistanceFinder<
+      _finder.reset(new arangodb::graph::ConstantWeightShortestPathFinder<
                     arangodb::velocypack::Slice, arangodb::velocypack::Slice,
                     arangodb::basics::VelocyPackHelper::VPackStringHash,
                     arangodb::basics::VelocyPackHelper::VPackStringEqual,
@@ -382,7 +382,7 @@ ShortestPathBlock::ShortestPathBlock(ExecutionEngine* engine,
           EdgeWeightExpanderLocal(this, false),
           EdgeWeightExpanderLocal(this, true), _opts.bidirectional));
     } else {
-      _finder.reset(new arangodb::graph::ConstDistanceFinder<
+      _finder.reset(new arangodb::graph::ConstantWeightShortestPathFinder<
                     arangodb::velocypack::Slice, arangodb::velocypack::Slice,
                     arangodb::basics::VelocyPackHelper::VPackStringHash,
                     arangodb::basics::VelocyPackHelper::VPackStringEqual,
diff --git a/arangod/Graph/ConstantWeightShortestPathFinder.h b/arangod/Graph/ConstantWeightShortestPathFinder.h
index 82099b81a8..b19b51190f 100644
--- a/arangod/Graph/ConstantWeightShortestPathFinder.h
+++ b/arangod/Graph/ConstantWeightShortestPathFinder.h
@@ -30,7 +30,7 @@ namespace arangodb {
 namespace graph {
 
 template <typename VertexId, typename EdgeId, typename HashFuncType, typename EqualFuncType, typename Path>
-class ConstDistanceFinder : public ShortestPathFinder<VertexId, Path> {
+class ConstantWeightShortestPathFinder : public ShortestPathFinder<VertexId, Path> {
  public:
 
   //////////////////////////////////////////////////////////////////////////////
@@ -59,10 +59,10 @@ class ConstDistanceFinder : public ShortestPathFinder<VertexId, Path> {
   ExpanderFunction _rightNeighborExpander;
 
  public:
-  ConstDistanceFinder(ExpanderFunction left, ExpanderFunction right)
+  ConstantWeightShortestPathFinder(ExpanderFunction left, ExpanderFunction right)
       : _leftNeighborExpander(left), _rightNeighborExpander(right) {}
 
-  ~ConstDistanceFinder() {
+  ~ConstantWeightShortestPathFinder() {
     clearVisited();
   }
 
diff --git a/arangod/VocBase/Traverser.h b/arangod/VocBase/Traverser.h
index 3533a28537..ce4a8041e2 100644
--- a/arangod/VocBase/Traverser.h
+++ b/arangod/VocBase/Traverser.h
@@ -71,7 +71,7 @@ class ShortestPath {
   friend class arangodb::graph::AttributeWeightShortestPathFinder<
       arangodb::velocypack::Slice, arangodb::velocypack::Slice, double,
       ShortestPath>;
-  friend class arangodb::graph::ConstDistanceFinder<
+  friend class arangodb::graph::ConstantWeightShortestPathFinder<
       arangodb::velocypack::Slice, arangodb::velocypack::Slice,
       arangodb::basics::VelocyPackHelper::VPackStringHash,
       arangodb::basics::VelocyPackHelper::VPackStringEqual, ShortestPath>;