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

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Thu Dec 8 17:12:23 EST 2011


Author: niche
Date: 2011-12-08 17:12:23 -0500 (Thu, 08 Dec 2011)
New Revision: 10675

Modified:
   mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp
Log:
small fixes to radical_main since we present radical with a n_dims by n_points matrix

Modified: mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp	2011-12-08 22:07:41 UTC (rev 10674)
+++ mlpack/trunk/src/mlpack/methods/radical/radical_main.cpp	2011-12-08 22:12:23 UTC (rev 10675)
@@ -14,12 +14,12 @@
   size_t nPoints = 1000;
   size_t nDims = 2;
 
-  mat S = randu(nPoints, nDims);
+  mat S = randu(nDims, nPoints);
   //S.print("S");
   mat Mixing = randn(nDims, nDims);
   Mixing.print("Mixing");
-  mat X = S * Mixing;
-
+  mat X = Mixing * S;
+  
   /*
   mat U, V;
   vec s;
@@ -33,21 +33,24 @@
 
   mat Y;
   mat W;
+  printf("doing radical\n");
   rad.DoRadical(X, Y, W);
+  printf("radical done\n");
   
   W.print("W");
   
-  mat matXWhitened;
-  mat matWhitening;
-  mlpack::radical::WhitenFeatureMajorMatrix(X, matXWhitened, matWhitening);
+  X = trans(X);
+  mat XWhitened;
+  mat Whitening;
+  mlpack::radical::WhitenFeatureMajorMatrix(X, XWhitened, Whitening);
   
   double val_init = 0;
   for(size_t i = 0; i < nDims; i++) {
-    val_init += rad.Vasicek(matXWhitened.col(i));
+    val_init += rad.Vasicek(XWhitened.col(i));
   }
   printf("initial objective value: %f\n", val_init);
-
   
+  Y = trans(Y);
   double val_final = 0;
   for(size_t i = 0; i < nDims; i++) {
     val_final += rad.Vasicek(Y.col(i));




More information about the mlpack-svn mailing list