[mlpack-svn] r10098 - mlpack/trunk/src/contrib/march/n_point

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

Author: march
Date: 2011-10-31 15:29:32 -0400 (Mon, 31 Oct 2011)
New Revision: 10098

Modified:
   mlpack/trunk/src/contrib/march/n_point/angle_results.cc
   mlpack/trunk/src/contrib/march/n_point/generate_random_problem.h
Log:
fixed small bug in angle results, made random generation stuff backwards compatible with boost (hopefully)

Modified: mlpack/trunk/src/contrib/march/n_point/angle_results.cc
===================================================================
--- mlpack/trunk/src/contrib/march/n_point/angle_results.cc	2011-10-31 18:51:24 UTC (rev 10097)
+++ mlpack/trunk/src/contrib/march/n_point/angle_results.cc	2011-10-31 19:29:32 UTC (rev 10098)
@@ -62,8 +62,9 @@
         }
       } // check the invalid region ids
       
-      AddResult_(i, num_random, matcher.results());
-      
+      if (!skip_me) {
+        AddResult_(i, num_random, matcher.results());
+      }
     } // for i
     
   }

Modified: mlpack/trunk/src/contrib/march/n_point/generate_random_problem.h
===================================================================
--- mlpack/trunk/src/contrib/march/n_point/generate_random_problem.h	2011-10-31 18:51:24 UTC (rev 10097)
+++ mlpack/trunk/src/contrib/march/n_point/generate_random_problem.h	2011-10-31 19:29:32 UTC (rev 10098)
@@ -10,11 +10,12 @@
 #ifndef GENERATE_RANDOM_PROBLEM_H
 #define GENERATE_RANDOM_PROBLEM_H
 
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int_distribution.hpp>
-#include <boost/random/uniform_real_distribution.hpp>
-#include <boost/random/uniform_01.hpp>
-#include <boost/random/variate_generator.hpp>
+//#include <boost/random/mersenne_twister.hpp>
+//#include <boost/random/uniform_int_distribution.hpp>
+//#include <boost/random/uniform_real_distribution.hpp>
+//#include <boost/random/uniform_01.hpp>
+//#include <boost/random/variate_generator.hpp>
+#include <boost/random.hpp>
 
 #include <mlpack/core.h>