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

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

Author: rcurtin
Date: 2012-05-01 15:14:15 -0400 (Tue, 01 May 2012)
New Revision: 12592

Modified:
   mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp
   mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp
Log:
Give better debugging output.


Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp	2012-05-01 16:32:08 UTC (rev 12591)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cpp	2012-05-01 19:14:15 UTC (rev 12592)
@@ -72,10 +72,10 @@
 
   arma::mat referenceData;
   arma::mat queryData; // So it doesn't go out of scope.
-  if (!data::Load(referenceFile.c_str(), referenceData))
-    Log::Fatal << "Reference file " << referenceFile << "not found." << endl;
+  data::Load(referenceFile.c_str(), referenceData, true);
 
-  Log::Info << "Loaded reference data from '" << referenceFile << "'." << endl;
+  Log::Info << "Loaded reference data from '" << referenceFile << "' ("
+      << referenceData.n_rows << " x " << referenceData.n_cols << ")." << endl;
 
   // Sanity check on k value: must be greater than 0, must be less than the
   // number of reference points.
@@ -128,10 +128,10 @@
   {
     string queryFile = CLI::GetParam<string>("query_file");
 
-    if (!data::Load(queryFile.c_str(), queryData))
-      Log::Fatal << "Query file " << queryFile << " not found." << endl;
+    data::Load(queryFile.c_str(), queryData, true);
 
-    Log::Info << "Loaded query data from '" << queryFile << "'." << endl;
+    Log::Info << "Loaded query data from '" << queryFile << "' ("
+        << queryData.n_rows << " x " << queryData.n_cols << ")." << endl;
 
     Log::Info << "Building query tree..." << endl;
 

Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp	2012-05-01 16:32:08 UTC (rev 12591)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp	2012-05-01 19:14:15 UTC (rev 12592)
@@ -73,10 +73,10 @@
 
   arma::mat referenceData;
   arma::mat queryData; // So it doesn't go out of scope.
-  if (!data::Load(referenceFile.c_str(), referenceData))
-    Log::Fatal << "Reference file " << referenceFile << "not found." << endl;
+  data::Load(referenceFile.c_str(), referenceData, true);
 
-  Log::Info << "Loaded reference data from '" << referenceFile << "'." << endl;
+  Log::Info << "Loaded reference data from '" << referenceFile << "' ("
+      << referenceData.n_rows << " x " << referenceData.n_cols << ")." << endl;
 
   // Sanity check on k value: must be greater than 0, must be less than the
   // number of reference points.
@@ -131,13 +131,13 @@
   {
     string queryFile = CLI::GetParam<string>("query_file");
 
-    if (!data::Load(queryFile.c_str(), queryData))
-      Log::Fatal << "Query file " << queryFile << " not found" << endl;
+    data::Load(queryFile.c_str(), queryData, true);
 
     if (naive && leafSize < queryData.n_cols)
       leafSize = queryData.n_cols;
 
-    Log::Info << "Loaded query data from '" << queryFile << "'." << endl;
+    Log::Info << "Loaded query data from '" << queryFile << "' ("
+        << queryData.n_rows << " x " << queryData.n_cols << ")." << endl;
 
     Log::Info << "Building query tree..." << endl;