Change tests to respect new SparseCoding template parameters.

This commit is contained in:
Ryan Curtin
2012-06-11 20:10:33 +00:00
parent ef1abf596d
commit 6f308e1ca0
+4 -7
View File
@@ -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);