From 6f308e1ca079fa89e2b75da6203df5f91e2d59ea Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Mon, 11 Jun 2012 20:10:33 +0000 Subject: [PATCH] Change tests to respect new SparseCoding template parameters. --- src/mlpack/tests/sparse_coding_test.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mlpack/tests/sparse_coding_test.cpp b/src/mlpack/tests/sparse_coding_test.cpp index a1182d037a..dee5673f22 100644 --- a/src/mlpack/tests/sparse_coding_test.cpp +++ b/src/mlpack/tests/sparse_coding_test.cpp @@ -57,8 +57,7 @@ BOOST_AUTO_TEST_CASE(SparseCodingTestCodingStepLasso) 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 @@ BOOST_AUTO_TEST_CASE(SparseCodingTestCodingStepElasticNet) 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 @@ BOOST_AUTO_TEST_CASE(SparseCodingTestDictionaryStep) 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 @@ BOOST_AUTO_TEST_CASE(SparseCodingTestDictionaryStep) X = D * Z; + SparseCoding<> sc2(X, nAtoms, lambda1); sc.Data() = X; - sc.DataDependentRandomInitDictionary(); uvec adjacencies = find(Z); sc.OptimizeDictionary(adjacencies);