From 4bc4c207885175e597367af25982ecb8a6ecb0a4 Mon Sep 17 00:00:00 2001
From: Bill March <march@ices.utexas.edu>
Date: Mon, 31 Oct 2011 19:29:32 +0000
Subject: [PATCH] fixed small bug in angle results, made random generation
 stuff backwards compatible with boost (hopefully)

---
 src/contrib/march/n_point/angle_results.cc          |  5 +++--
 src/contrib/march/n_point/generate_random_problem.h | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/contrib/march/n_point/angle_results.cc b/src/contrib/march/n_point/angle_results.cc
index 8062e8976d..7f5557eac1 100644
--- a/src/contrib/march/n_point/angle_results.cc
+++ b/src/contrib/march/n_point/angle_results.cc
@@ -62,8 +62,9 @@ void npt::AngleResults::ProcessResults(std::vector<int>& region_ids,
         }
       } // check the invalid region ids
       
-      AddResult_(i, num_random, matcher.results());
-      
+      if (!skip_me) {
+        AddResult_(i, num_random, matcher.results());
+      }
     } // for i
     
   }
diff --git a/src/contrib/march/n_point/generate_random_problem.h b/src/contrib/march/n_point/generate_random_problem.h
index c637695ca8..62ca574948 100644
--- a/src/contrib/march/n_point/generate_random_problem.h
+++ b/src/contrib/march/n_point/generate_random_problem.h
@@ -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>