[mlpack-git] master: Remove tab characters; use spaces. (845367e)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Apr 2 16:55:51 EDT 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/a23e498013dac6a99185fd8fd24ec859c3501975...845367e2ffee785ba5a2b39613650ec6b122466d
>---------------------------------------------------------------
commit 845367e2ffee785ba5a2b39613650ec6b122466d
Author: Ryan Curtin <ryan at ratml.org>
Date: Thu Apr 2 16:55:39 2015 -0400
Remove tab characters; use spaces.
>---------------------------------------------------------------
845367e2ffee785ba5a2b39613650ec6b122466d
src/mlpack/methods/neighbor_search/allknn_main.cpp | 60 +++++++++++-----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/mlpack/methods/neighbor_search/allknn_main.cpp b/src/mlpack/methods/neighbor_search/allknn_main.cpp
index 0828017..06ebc28 100644
--- a/src/mlpack/methods/neighbor_search/allknn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/allknn_main.cpp
@@ -190,11 +190,11 @@ int main(int argc, char *argv[])
Timer::Start("tree_building");
BinarySpaceTree<bound::HRectBound<2>,
- NeighborSearchStat<NearestNeighborSort> >
- refTree(referenceData, oldFromNewRefs, leafSize);
+ NeighborSearchStat<NearestNeighborSort> >
+ refTree(referenceData, oldFromNewRefs, leafSize);
BinarySpaceTree<bound::HRectBound<2>,
- NeighborSearchStat<NearestNeighborSort> >*
- queryTree = NULL; // Empty for now.
+ NeighborSearchStat<NearestNeighborSort> >*
+ queryTree = NULL; // Empty for now.
Timer::Stop("tree_building");
@@ -202,37 +202,37 @@ int main(int argc, char *argv[])
if (CLI::GetParam<string>("query_file") != "")
{
- if (naive && leafSize < queryData.n_cols)
- leafSize = queryData.n_cols;
+ if (naive && leafSize < queryData.n_cols)
+ leafSize = queryData.n_cols;
- Log::Info << "Loaded query data from '" << queryFile << "' ("
- << queryData.n_rows << " x " << queryData.n_cols << ")." << endl;
+ Log::Info << "Loaded query data from '" << queryFile << "' ("
+ << queryData.n_rows << " x " << queryData.n_cols << ")." << endl;
- Log::Info << "Building query tree..." << endl;
+ Log::Info << "Building query tree..." << endl;
- // Build trees by hand, so we can save memory: if we pass a tree to
- // NeighborSearch, it does not copy the matrix.
- if (!singleMode)
- {
- Timer::Start("tree_building");
+ // Build trees by hand, so we can save memory: if we pass a tree to
+ // NeighborSearch, it does not copy the matrix.
+ if (!singleMode)
+ {
+ Timer::Start("tree_building");
- queryTree = new BinarySpaceTree<bound::HRectBound<2>,
- NeighborSearchStat<NearestNeighborSort> >(queryData,
- oldFromNewQueries, leafSize);
+ queryTree = new BinarySpaceTree<bound::HRectBound<2>,
+ NeighborSearchStat<NearestNeighborSort> >(queryData,
+ oldFromNewQueries, leafSize);
- Timer::Stop("tree_building");
- }
+ Timer::Stop("tree_building");
+ }
- allknn = new AllkNN(&refTree, queryTree, referenceData, queryData,
- singleMode);
+ allknn = new AllkNN(&refTree, queryTree, referenceData, queryData,
+ singleMode);
- Log::Info << "Tree built." << endl;
+ Log::Info << "Tree built." << endl;
}
else
{
- allknn = new AllkNN(&refTree, referenceData, singleMode);
+ allknn = new AllkNN(&refTree, referenceData, singleMode);
- Log::Info << "Trees built." << endl;
+ Log::Info << "Trees built." << endl;
}
arma::mat distancesOut;
@@ -249,17 +249,17 @@ int main(int argc, char *argv[])
// Map the results back to the correct places.
if ((CLI::GetParam<string>("query_file") != "") && !singleMode)
- Unmap(neighborsOut, distancesOut, oldFromNewRefs, oldFromNewQueries,
- neighbors, distances);
+ Unmap(neighborsOut, distancesOut, oldFromNewRefs, oldFromNewQueries,
+ neighbors, distances);
else if ((CLI::GetParam<string>("query_file") != "") && singleMode)
- Unmap(neighborsOut, distancesOut, oldFromNewRefs, neighbors, distances);
+ Unmap(neighborsOut, distancesOut, oldFromNewRefs, neighbors, distances);
else
- Unmap(neighborsOut, distancesOut, oldFromNewRefs, oldFromNewRefs,
- neighbors, distances);
+ Unmap(neighborsOut, distancesOut, oldFromNewRefs, oldFromNewRefs,
+ neighbors, distances);
// Clean up.
if (queryTree)
- delete queryTree;
+ delete queryTree;
delete allknn;
} else { // R tree.
More information about the mlpack-git
mailing list