[mlpack-svn] r14262 - mlpack/trunk/src/mlpack/methods/neighbor_search

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2013-02-09 21:18:08 -0500 (Sat, 09 Feb 2013)
New Revision: 14262

Modified:
   mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp
Log:
Forgot to test-build allkfn...


Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp	2013-02-10 01:35:59 UTC (rev 14261)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp	2013-02-10 02:18:08 UTC (rev 14262)
@@ -12,6 +12,7 @@
 #include <iostream>
 
 #include "neighbor_search.hpp"
+#include "unmap.hpp"
 
 using namespace std;
 using namespace mlpack;
@@ -174,14 +175,14 @@
 
   // Map the points back to their original locations.
   if ((CLI::GetParam<string>("query_file") != "") && !singleMode)
-    Unmap(neighbors, distances, oldFromNewReferences, oldFromNewQueries,
-        neighborsOut, distancesOut, true);
+    Unmap(neighbors, distances, oldFromNewRefs, oldFromNewQueries, neighborsOut,
+        distancesOut, true);
   else if ((CLI::GetParam<string>("query_file") != "") && singleMode)
-    Unmap(neighbors, distances, oldFromNewReferences, neighborsOut,
+    Unmap(neighbors, distances, oldFromNewRefs, neighborsOut, distancesOut,
+        true);
+  else
+    Unmap(neighbors, distances, oldFromNewRefs, oldFromNewRefs, neighborsOut,
         distancesOut, true);
-  else
-    Unmap(neighbors, distances, oldFromNewReferences, oldFromNewReferences,
-        neighborsOut, distancesOut, true);
 
   // Clean up.
   if (queryTree)