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

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

Author: niche
Date: 2011-12-08 00:31:20 -0500 (Thu, 08 Dec 2011)
New Revision: 10655

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:
more style fixes

Modified: mlpack/trunk/src/mlpack/methods/radical/radical.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/radical.cpp	2011-12-08 05:13:22 UTC (rev 10654)
+++ mlpack/trunk/src/mlpack/methods/radical/radical.cpp	2011-12-08 05:31:20 UTC (rev 10655)
@@ -10,6 +10,7 @@
 //using namespace arma;
 using namespace std;
 
+/*
 Radical::Radical(double noiseStdDev, size_t nReplicates, size_t nAngles, size_t nSweeps,
 		 const arma::mat& matX) {
   this->noiseStdDev = noiseStdDev;
@@ -19,11 +20,19 @@
   this->matX = arma::mat(matX); // is this the same as this.X = X ?
   m = floor(sqrt(matX.n_rows));
 }
-
-arma::mat Radical::GetX() {
-  return matX;
+*/
+Radical::Radical(double noiseStdDev, size_t nReplicates, size_t nAngles, size_t nSweeps,
+		 const arma::mat& matX) :
+  noiseStdDev(noiseStdDev),
+  nReplicates(nReplicates),
+  nAngles(nAngles),
+  nSweeps(nSweeps),
+  matX(matX) 
+{
+  m = floor(sqrt(matX.n_rows));
 }
 
+
 void Radical::WhitenX(arma::mat& matWhitening) {
   arma::mat matU, matV;
   arma::vec s;

Modified: mlpack/trunk/src/mlpack/methods/radical/radical.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/radical.hpp	2011-12-08 05:13:22 UTC (rev 10654)
+++ mlpack/trunk/src/mlpack/methods/radical/radical.hpp	2011-12-08 05:31:20 UTC (rev 10655)
@@ -21,7 +21,10 @@
   Radical(double noiseStdDev, size_t nReplicates, size_t nAngles, size_t nSweeps,
 	  const arma::mat& matX);
 
-  arma::mat GetX();
+  arma::mat X() {
+    return matX;
+  }
+  
   void WhitenX(arma::mat& matWhitening);
   void CopyAndPerturb(arma::mat& XNew, const arma::mat& matX);
   double Vasicek(const arma::vec& x);

Modified: mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp	2011-12-08 05:13:22 UTC (rev 10654)
+++ mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp	2011-12-08 05:31:20 UTC (rev 10655)
@@ -43,7 +43,7 @@
 
   double val_init = 0;
   for(size_t i = 0; i < nDims; i++) {
-    val_init += rad.Vasicek(rad.GetX().col(i));
+    val_init += rad.Vasicek(rad.X().col(i));
   }
   printf("initial objective value: %f\n", val_init);