[mlpack-svn] r11571 - mlpack/trunk/src/mlpack/methods/radical

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

Author: rcurtin
Date: 2012-02-21 14:07:54 -0500 (Tue, 21 Feb 2012)
New Revision: 11571

Modified:
   mlpack/trunk/src/mlpack/methods/radical/radical.cpp
   mlpack/trunk/src/mlpack/methods/radical/radical.hpp
   mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp
Log:
Some changes; use M_PI instead of math::pi() (for consistency across all MLPACK
code), and explicitly specify using namespace mlpack::math so that radical
compiles on older versions of gcc.


Modified: mlpack/trunk/src/mlpack/methods/radical/radical.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/radical.cpp	2012-02-21 16:42:15 UTC (rev 11570)
+++ mlpack/trunk/src/mlpack/methods/radical/radical.cpp	2012-02-21 19:07:54 UTC (rev 11571)
@@ -75,7 +75,7 @@
   mat candidateY;
 
   vec thetas = linspace<vec>(0, nAngles - 1, nAngles) /
-                ((double) nAngles) * math::pi() / 2;
+                ((double) nAngles) * M_PI / 2;
   vec values(nAngles);
 
   for(size_t i = 0; i < nAngles; i++) {

Modified: mlpack/trunk/src/mlpack/methods/radical/radical.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/radical.hpp	2012-02-21 16:42:15 UTC (rev 11570)
+++ mlpack/trunk/src/mlpack/methods/radical/radical.hpp	2012-02-21 19:07:54 UTC (rev 11571)
@@ -10,9 +10,7 @@
 #ifndef __MLPACK_METHODS_RADICAL_RADICAL_HPP
 #define __MLPACK_METHODS_RADICAL_RADICAL_HPP
 
-#include<armadillo>
-#include <stdio.h>
-#include<float.h>
+#include <mlpack/core.hpp>
 
 namespace mlpack {
 namespace radical {

Modified: mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp	2012-02-21 16:42:15 UTC (rev 11570)
+++ mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp	2012-02-21 19:07:54 UTC (rev 11571)
@@ -6,7 +6,6 @@
  */
 
 #include <mlpack/core.hpp>
-#include <armadillo>
 #include "radical.hpp"
 
 PROGRAM_INFO("RADICAL", "An implementation of RADICAL, a method for independent"
@@ -44,6 +43,7 @@
 
 using namespace mlpack;
 using namespace mlpack::radical;
+using namespace mlpack::math;
 using namespace std;
 using namespace arma;
 
@@ -54,9 +54,9 @@
 
   // Set random seed.
   if (CLI::GetParam<int>("seed") != 0)
-    math::RandomSeed((size_t) CLI::GetParam<int>("seed"));
+    RandomSeed((size_t) CLI::GetParam<int>("seed"));
   else
-    math::RandomSeed((size_t) std::time(NULL));
+    RandomSeed((size_t) std::time(NULL));
 
   // Load the data.
   const string matXFilename = CLI::GetParam<string>("input_file");