Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed ConstDistanceFinder => ConstantWeightShortestPathFinder

This commit is contained in:
Michael Hackstein 2017-04-05 16:29:40 +02:00
parent 30095556e9
commit ee57f9abef
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Aql/ShortestPathBlock.cpp
View File

@ -41,7 +41,7 @@ typedef arangodb::graph::AttributeWeightShortestPathFinder<
arangodb::traverser::ShortestPath> arangodb::traverser::ShortestPath>
ArangoDBPathFinder; ArangoDBPathFinder;
typedef arangodb::graph::ConstDistanceFinder< typedef arangodb::graph::ConstantWeightShortestPathFinder<
arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice,
arangodb::basics::VelocyPackHelper::VPackStringHash, arangodb::basics::VelocyPackHelper::VPackStringHash,
arangodb::basics::VelocyPackHelper::VPackStringEqual, arangodb::basics::VelocyPackHelper::VPackStringEqual,
@ -366,7 +366,7 @@ ShortestPathBlock::ShortestPathBlock(ExecutionEngine* engine,
EdgeWeightExpanderCluster(this, false), EdgeWeightExpanderCluster(this, false),
EdgeWeightExpanderCluster(this, true), _opts.bidirectional)); EdgeWeightExpanderCluster(this, true), _opts.bidirectional));
} else { } else {
_finder.reset(new arangodb::graph::ConstDistanceFinder< _finder.reset(new arangodb::graph::ConstantWeightShortestPathFinder<
arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice,
arangodb::basics::VelocyPackHelper::VPackStringHash, arangodb::basics::VelocyPackHelper::VPackStringHash,
arangodb::basics::VelocyPackHelper::VPackStringEqual, arangodb::basics::VelocyPackHelper::VPackStringEqual,
@ -382,7 +382,7 @@ ShortestPathBlock::ShortestPathBlock(ExecutionEngine* engine,
EdgeWeightExpanderLocal(this, false), EdgeWeightExpanderLocal(this, false),
EdgeWeightExpanderLocal(this, true), _opts.bidirectional)); EdgeWeightExpanderLocal(this, true), _opts.bidirectional));
} else { } else {
_finder.reset(new arangodb::graph::ConstDistanceFinder< _finder.reset(new arangodb::graph::ConstantWeightShortestPathFinder<
arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice,
arangodb::basics::VelocyPackHelper::VPackStringHash, arangodb::basics::VelocyPackHelper::VPackStringHash,
arangodb::basics::VelocyPackHelper::VPackStringEqual, arangodb::basics::VelocyPackHelper::VPackStringEqual,

6
arangod/Graph/ConstantWeightShortestPathFinder.h
View File

@ -30,7 +30,7 @@ namespace arangodb {
namespace graph { namespace graph {
template <typename VertexId, typename EdgeId, typename HashFuncType, typename EqualFuncType, typename Path> template <typename VertexId, typename EdgeId, typename HashFuncType, typename EqualFuncType, typename Path>
class ConstDistanceFinder : public ShortestPathFinder<VertexId, Path> { class ConstantWeightShortestPathFinder : public ShortestPathFinder<VertexId, Path> {
public: public:
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -59,10 +59,10 @@ class ConstDistanceFinder : public ShortestPathFinder<VertexId, Path> {
ExpanderFunction _rightNeighborExpander; ExpanderFunction _rightNeighborExpander;
public: public:
ConstDistanceFinder(ExpanderFunction left, ExpanderFunction right) ConstantWeightShortestPathFinder(ExpanderFunction left, ExpanderFunction right)
: _leftNeighborExpander(left), _rightNeighborExpander(right) {} : _leftNeighborExpander(left), _rightNeighborExpander(right) {}
~ConstDistanceFinder() { ~ConstantWeightShortestPathFinder() {
clearVisited(); clearVisited();
} }

2
arangod/VocBase/Traverser.h
View File

@ -71,7 +71,7 @@ class ShortestPath {
friend class arangodb::graph::AttributeWeightShortestPathFinder< friend class arangodb::graph::AttributeWeightShortestPathFinder<
arangodb::velocypack::Slice, arangodb::velocypack::Slice, double, arangodb::velocypack::Slice, arangodb::velocypack::Slice, double,
ShortestPath>; ShortestPath>;
friend class arangodb::graph::ConstDistanceFinder< friend class arangodb::graph::ConstantWeightShortestPathFinder<
arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice, arangodb::velocypack::Slice,
arangodb::basics::VelocyPackHelper::VPackStringHash, arangodb::basics::VelocyPackHelper::VPackStringHash,
arangodb::basics::VelocyPackHelper::VPackStringEqual, ShortestPath>; arangodb::basics::VelocyPackHelper::VPackStringEqual, ShortestPath>;