[mlpack-git] master,mlpack-1.0.x: Remove unused score variable; this fixes a lot of warnings. (07a4094)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 21:42:35 EST 2015
Repository : https://github.com/mlpack/mlpack
On branches: master,mlpack-1.0.x
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit 07a4094b4c0935bcf3519e6236768ffc0a795bd5
Author: Ryan Curtin <ryan at ratml.org>
Date: Thu Feb 6 23:01:10 2014 +0000
Remove unused score variable; this fixes a lot of warnings.
>---------------------------------------------------------------
07a4094b4c0935bcf3519e6236768ffc0a795bd5
.../tree/binary_space_tree/dual_tree_traverser.hpp | 7 ++--
.../binary_space_tree/dual_tree_traverser_impl.hpp | 39 +++++++++++-----------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp
index 222105f..2d3a0c1 100644
--- a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp
@@ -28,17 +28,14 @@ class BinarySpaceTree<BoundType, StatisticType, MatType>::DualTreeTraverser
DualTreeTraverser(RuleType& rule);
/**
- * Traverse the two trees. This does not reset the number of prunes. If you
- * are starting a traversal, the score for the parent node combination is
- * irrelevant and can be left as 0 and thus does not need to be specified.
+ * Traverse the two trees. This does not reset the number of prunes.
*
* @param queryNode The query node to be traversed.
* @param referenceNode The reference node to be traversed.
* @param score The score of the current node combination.
*/
void Traverse(BinarySpaceTree& queryNode,
- BinarySpaceTree& referenceNode,
- const double score = 0.0);
+ BinarySpaceTree& referenceNode);
//! Get the number of prunes.
size_t NumPrunes() const { return numPrunes; }
diff --git a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp
index de92ea5..d590e93 100644
--- a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp
@@ -31,8 +31,7 @@ template<typename RuleType>
void BinarySpaceTree<BoundType, StatisticType, MatType>::
DualTreeTraverser<RuleType>::Traverse(
BinarySpaceTree<BoundType, StatisticType, MatType>& queryNode,
- BinarySpaceTree<BoundType, StatisticType, MatType>& referenceNode,
- const double score /* = 0.0 */)
+ BinarySpaceTree<BoundType, StatisticType, MatType>& referenceNode)
{
// Increment the visit counter.
++numVisited;
@@ -69,7 +68,7 @@ DualTreeTraverser<RuleType>::Traverse(
++numScores;
if (leftScore != DBL_MAX)
- Traverse(*queryNode.Left(), referenceNode, leftScore);
+ Traverse(*queryNode.Left(), referenceNode);
else
++numPrunes;
@@ -79,7 +78,7 @@ DualTreeTraverser<RuleType>::Traverse(
++numScores;
if (rightScore != DBL_MAX)
- Traverse(*queryNode.Right(), referenceNode, rightScore);
+ Traverse(*queryNode.Right(), referenceNode);
else
++numPrunes;
}
@@ -100,7 +99,7 @@ DualTreeTraverser<RuleType>::Traverse(
// traversal info.
traversalInfo = rule.TraversalInfo();
rule.TraversalInfo() = leftInfo;
- Traverse(queryNode, *referenceNode.Left(), leftScore);
+ Traverse(queryNode, *referenceNode.Left());
// Is it still valid to recurse to the right?
rightScore = rule.Rescore(queryNode, *referenceNode.Right(), rightScore);
@@ -109,7 +108,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the right traversal info.
rule.TraversalInfo() = traversalInfo;
- Traverse(queryNode, *referenceNode.Right(), rightScore);
+ Traverse(queryNode, *referenceNode.Right());
}
else
++numPrunes;
@@ -117,7 +116,7 @@ DualTreeTraverser<RuleType>::Traverse(
else if (rightScore < leftScore)
{
// Recurse to the right.
- Traverse(queryNode, *referenceNode.Right(), rightScore);
+ Traverse(queryNode, *referenceNode.Right());
// Is it still valid to recurse to the left?
leftScore = rule.Rescore(queryNode, *referenceNode.Left(), leftScore);
@@ -126,7 +125,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the left traversal info.
rule.TraversalInfo() = leftInfo;
- Traverse(queryNode, *referenceNode.Left(), leftScore);
+ Traverse(queryNode, *referenceNode.Left());
}
else
++numPrunes;
@@ -143,7 +142,7 @@ DualTreeTraverser<RuleType>::Traverse(
// right traversal info.
traversalInfo = rule.TraversalInfo();
rule.TraversalInfo() = leftInfo;
- Traverse(queryNode, *referenceNode.Left(), leftScore);
+ Traverse(queryNode, *referenceNode.Left());
rightScore = rule.Rescore(queryNode, *referenceNode.Right(),
rightScore);
@@ -152,7 +151,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the right traversal info.
rule.TraversalInfo() = traversalInfo;
- Traverse(queryNode, *referenceNode.Right(), rightScore);
+ Traverse(queryNode, *referenceNode.Right());
}
else
++numPrunes;
@@ -178,7 +177,7 @@ DualTreeTraverser<RuleType>::Traverse(
// traversal info.
rightInfo = rule.TraversalInfo();
rule.TraversalInfo() = leftInfo;
- Traverse(*queryNode.Left(), *referenceNode.Left(), leftScore);
+ Traverse(*queryNode.Left(), *referenceNode.Left());
// Is it still valid to recurse to the right?
rightScore = rule.Rescore(*queryNode.Left(), *referenceNode.Right(),
@@ -188,7 +187,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the right traversal info.
rule.TraversalInfo() = rightInfo;
- Traverse(*queryNode.Left(), *referenceNode.Right(), rightScore);
+ Traverse(*queryNode.Left(), *referenceNode.Right());
}
else
++numPrunes;
@@ -196,7 +195,7 @@ DualTreeTraverser<RuleType>::Traverse(
else if (rightScore < leftScore)
{
// Recurse to the right.
- Traverse(*queryNode.Left(), *referenceNode.Right(), rightScore);
+ Traverse(*queryNode.Left(), *referenceNode.Right());
// Is it still valid to recurse to the left?
leftScore = rule.Rescore(*queryNode.Left(), *referenceNode.Left(),
@@ -206,7 +205,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the left traversal info.
rule.TraversalInfo() = leftInfo;
- Traverse(*queryNode.Left(), *referenceNode.Left(), leftScore);
+ Traverse(*queryNode.Left(), *referenceNode.Left());
}
else
++numPrunes;
@@ -256,7 +255,7 @@ DualTreeTraverser<RuleType>::Traverse(
// traversal info.
rightInfo = rule.TraversalInfo();
rule.TraversalInfo() = leftInfo;
- Traverse(*queryNode.Right(), *referenceNode.Left(), leftScore);
+ Traverse(*queryNode.Right(), *referenceNode.Left());
// Is it still valid to recurse to the right?
rightScore = rule.Rescore(*queryNode.Right(), *referenceNode.Right(),
@@ -266,7 +265,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the right traversal info.
rule.TraversalInfo() = rightInfo;
- Traverse(*queryNode.Right(), *referenceNode.Right(), rightScore);
+ Traverse(*queryNode.Right(), *referenceNode.Right());
}
else
++numPrunes;
@@ -274,7 +273,7 @@ DualTreeTraverser<RuleType>::Traverse(
else if (rightScore < leftScore)
{
// Recurse to the right.
- Traverse(*queryNode.Right(), *referenceNode.Right(), rightScore);
+ Traverse(*queryNode.Right(), *referenceNode.Right());
// Is it still valid to recurse to the left?
leftScore = rule.Rescore(*queryNode.Right(), *referenceNode.Left(),
@@ -284,7 +283,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the left traversal info.
rule.TraversalInfo() = leftInfo;
- Traverse(*queryNode.Right(), *referenceNode.Left(), leftScore);
+ Traverse(*queryNode.Right(), *referenceNode.Left());
}
else
++numPrunes;
@@ -301,7 +300,7 @@ DualTreeTraverser<RuleType>::Traverse(
// right traversal info.
rightInfo = rule.TraversalInfo();
rule.TraversalInfo() = leftInfo;
- Traverse(*queryNode.Right(), *referenceNode.Left(), leftScore);
+ Traverse(*queryNode.Right(), *referenceNode.Left());
// Is it still valid to recurse to the right?
rightScore = rule.Rescore(*queryNode.Right(), *referenceNode.Right(),
@@ -311,7 +310,7 @@ DualTreeTraverser<RuleType>::Traverse(
{
// Restore the right traversal info.
rule.TraversalInfo() = rightInfo;
- Traverse(*queryNode.Right(), *referenceNode.Right(), rightScore);
+ Traverse(*queryNode.Right(), *referenceNode.Right());
}
else
++numPrunes;
More information about the mlpack-git
mailing list