[mlpack-svn] r13025 - mlpack/trunk/src/mlpack/tests

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

Author: rcurtin
Date: 2012-06-11 16:10:33 -0400 (Mon, 11 Jun 2012)
New Revision: 13025

Modified:
   mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp
Log:
Change tests to respect new SparseCoding template parameters.


Modified: mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp	2012-06-11 20:10:20 UTC (rev 13024)
+++ mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp	2012-06-11 20:10:33 UTC (rev 13025)
@@ -57,8 +57,7 @@
   for (uword i = 0; i < nPoints; ++i)
     X.col(i) /= norm(X.col(i), 2);
 
-  SparseCoding sc(X, nAtoms, lambda1);
-  sc.DataDependentRandomInitDictionary();
+  SparseCoding<> sc(X, nAtoms, lambda1);
   sc.OptimizeCode();
 
   mat D = sc.Dictionary();
@@ -85,8 +84,7 @@
   for (uword i = 0; i < nPoints; ++i)
     X.col(i) /= norm(X.col(i), 2);
 
-  SparseCoding sc(X, nAtoms, lambda1, lambda2);
-  sc.DataDependentRandomInitDictionary();
+  SparseCoding<> sc(X, nAtoms, lambda1, lambda2);
   sc.OptimizeCode();
 
   mat D = sc.Dictionary();
@@ -116,8 +114,7 @@
   for(uword i = 0; i < nPoints; ++i)
     X.col(i) /= norm(X.col(i), 2);
 
-  SparseCoding sc(X, nAtoms, lambda1);
-  sc.DataDependentRandomInitDictionary();
+  SparseCoding<> sc(X, nAtoms, lambda1);
   sc.OptimizeCode();
 
   mat D = sc.Dictionary();
@@ -125,8 +122,8 @@
 
   X = D * Z;
 
+  SparseCoding<> sc2(X, nAtoms, lambda1);
   sc.Data() = X;
-  sc.DataDependentRandomInitDictionary();
 
   uvec adjacencies = find(Z);
   sc.OptimizeDictionary(adjacencies);