[mlpack-svn] r10860 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Dec 16 13:43:39 EST 2011
Author: vlad321
Date: 2011-12-16 13:43:39 -0500 (Fri, 16 Dec 2011)
New Revision: 10860
Modified:
mlpack/trunk/src/mlpack/tests/range_search_test.cpp
Log:
Correction for the range test.
Modified: mlpack/trunk/src/mlpack/tests/range_search_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/range_search_test.cpp 2011-12-16 18:33:43 UTC (rev 10859)
+++ mlpack/trunk/src/mlpack/tests/range_search_test.cpp 2011-12-16 18:43:39 UTC (rev 10860)
@@ -445,16 +445,16 @@
RangeSearch<> naive(naiveQuery, naiveReferences, true);
- vector<vector<size_t>> neighborsTree;
- vector<vector<double>> distancesTree;
+ vector<vector<size_t> > neighborsTree;
+ vector<vector<double> > distancesTree;
rs.Search(Range(0.25, 1.05), neighborsTree, distancesTree);
- vector<vector<pair<double, size_t>>> sortedTree;
+ vector<vector<pair<double, size_t> > > sortedTree;
SortResults(neighborsTree, distancesTree, sortedTree);
- vector<vector<size_t>> neighborsNaive;
- vector<vector<double>> distancesNaive;
+ vector<vector<size_t> > neighborsNaive;
+ vector<vector<double> > distancesNaive;
naive.Search(Range(0.25, 1.05), neighborsNaive, distancesNaive);
- vector<vector<pair<double, size_t>>> sortedNaive;
+ vector<vector<pair<double, size_t> > > sortedNaive;
SortResults(neighborsNaive, distancesNaive, sortedNaive);
for (size_t i = 0; i < sortedTree.size(); i++)
@@ -494,16 +494,16 @@
// Set naive mode.
RangeSearch<> naive(naiveQuery, true);
- vector<vector<size_t>> neighborsTree;
- vector<vector<double>> distancesTree;
+ vector<vector<size_t> > neighborsTree;
+ vector<vector<double> > distancesTree;
rs.Search(Range(0.25, 1.05), neighborsTree, distancesTree);
- vector<vector<pair<double, size_t>>> sortedTree;
+ vector<vector<pair<double, size_t> > > sortedTree;
SortResults(neighborsTree, distancesTree, sortedTree);
- vector<vector<size_t>> neighborsNaive;
- vector<vector<double>> distancesNaive;
+ vector<vector<size_t> > neighborsNaive;
+ vector<vector<double> > distancesNaive;
naive.Search(Range(0.25, 1.05), neighborsNaive, distancesNaive);
- vector<vector<pair<double, size_t>>> sortedNaive;
+ vector<vector<pair<double, size_t> > > sortedNaive;
SortResults(neighborsNaive, distancesNaive, sortedNaive);
for (size_t i = 0; i < sortedTree.size(); i++)
@@ -543,16 +543,16 @@
// Set up computation for naive mode.
RangeSearch<> naive(naiveQuery, true);
- vector<vector<size_t>> neighborsSingle;
- vector<vector<double>> distancesSingle;
+ vector<vector<size_t> > neighborsSingle;
+ vector<vector<double> > distancesSingle;
single.Search(Range(0.25, 1.05), neighborsSingle, distancesSingle);
- vector<vector<pair<double, size_t>>> sortedTree;
+ vector<vector<pair<double, size_t> > > sortedTree;
SortResults(neighborsSingle, distancesSingle, sortedTree);
- vector<vector<size_t>> neighborsNaive;
- vector<vector<double>> distancesNaive;
+ vector<vector<size_t> > neighborsNaive;
+ vector<vector<double> > distancesNaive;
naive.Search(Range(0.25, 1.05), neighborsNaive, distancesNaive);
- vector<vector<pair<double, size_t>>> sortedNaive;
+ vector<vector<pair<double, size_t> > > sortedNaive;
SortResults(neighborsNaive, distancesNaive, sortedNaive);
for (size_t i = 0; i < sortedTree.size(); i++)
More information about the mlpack-svn
mailing list