You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2010/11/24 22:11:03 UTC
svn commit: r1038820 [2/2] - in /mahout/trunk:
core/src/main/java/org/apache/mahout/classifier/bayes/datastore/
core/src/main/java/org/apache/mahout/classifier/naivebayes/
core/src/main/java/org/apache/mahout/clustering/kmeans/
core/src/main/java/org/a...
Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/AbstractTestVector.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/AbstractTestVector.java?rev=1038820&r1=1038819&r2=1038820&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/AbstractTestVector.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/AbstractTestVector.java Wed Nov 24 21:11:01 2010
@@ -59,7 +59,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testIterator() throws Exception {
+ public void testIterator() {
Iterator<Vector.Element> iterator = test.iterateNonZero();
checkIterator(iterator, gold);
@@ -97,7 +97,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testIteratorSet() throws Exception {
+ public void testIteratorSet() {
Vector clone = test.clone();
Iterator<Vector.Element> it = clone.iterateNonZero();
while (it.hasNext()) {
@@ -123,7 +123,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testCopy() throws Exception {
+ public void testCopy() {
Vector copy = test.clone();
for (int i = 0; i < test.size(); i++) {
assertEquals("copy [" + i + ']', test.get(i), copy.get(i), EPSILON);
@@ -131,7 +131,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testGet() throws Exception {
+ public void testGet() {
for (int i = 0; i < test.size(); i++) {
if (i % 2 == 0) {
assertEquals("get [" + i + ']', 0.0, test.get(i), EPSILON);
@@ -152,7 +152,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testSet() throws Exception {
+ public void testSet() {
test.set(3, 4.5);
for (int i = 0; i < test.size(); i++) {
if (i % 2 == 0) {
@@ -171,7 +171,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testViewPart() throws Exception {
+ public void testViewPart() {
Vector part = test.viewPart(1, 2);
assertEquals("part size", 2, part.getNumNondefaultElements());
for (int i = 0; i < part.size(); i++) {
@@ -195,7 +195,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testDecodeVector() throws Exception {
+ public void testDecodeVector() {
Vector val = AbstractVector.decodeVector(test.asFormatString());
for (int i = 0; i < test.size(); i++) {
assertEquals("get [" + i + ']', test.get(i), val.get(i), EPSILON);
@@ -203,7 +203,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testSparseDoubleVectorInt() throws Exception {
+ public void testSparseDoubleVectorInt() {
Vector val = new RandomAccessSparseVector(4);
assertEquals("size", 4, val.size());
for (int i = 0; i < 4; i++) {
@@ -212,14 +212,14 @@ public abstract class AbstractTestVector
}
@Test
- public void testDot() throws Exception {
+ public void testDot() {
double res = test.dot(test);
double expected = 3.3 * 3.3 + 2.2 * 2.2 + 1.1 * 1.1;
assertEquals("dot", expected, res, EPSILON);
}
@Test
- public void testDot2() throws Exception {
+ public void testDot2() {
Vector test2 = test.clone();
test2.set(1, 0.0);
test2.set(3, 0.0);
@@ -232,7 +232,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testNormalize() throws Exception {
+ public void testNormalize() {
Vector val = test.normalize();
double mag = Math.sqrt(1.1 * 1.1 + 2.2 * 2.2 + 3.3 * 3.3);
for (int i = 0; i < test.size(); i++) {
@@ -245,7 +245,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testMinus() throws Exception {
+ public void testMinus() {
Vector val = test.minus(test);
assertEquals("size", test.size(), val.size());
for (int i = 0; i < test.size(); i++) {
@@ -272,7 +272,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testPlusDouble() throws Exception {
+ public void testPlusDouble() {
Vector val = test.plus(1);
assertEquals("size", test.size(), val.size());
for (int i = 0; i < test.size(); i++) {
@@ -285,7 +285,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testPlusVector() throws Exception {
+ public void testPlusVector() {
Vector val = test.plus(test);
assertEquals("size", test.size(), val.size());
for (int i = 0; i < test.size(); i++) {
@@ -303,7 +303,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testTimesDouble() throws Exception {
+ public void testTimesDouble() {
Vector val = test.times(3);
assertEquals("size", test.size(), val.size());
for (int i = 0; i < test.size(); i++) {
@@ -316,7 +316,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testDivideDouble() throws Exception {
+ public void testDivideDouble() {
Vector val = test.divide(3);
assertEquals("size", test.size(), val.size());
for (int i = 0; i < test.size(); i++) {
@@ -329,7 +329,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testTimesVector() throws Exception {
+ public void testTimesVector() {
Vector val = test.times(test);
assertEquals("size", test.size(), val.size());
for (int i = 0; i < test.size(); i++) {
@@ -376,7 +376,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testAssignDoubleArray() throws Exception {
+ public void testAssignDoubleArray() {
double[] array = new double[test.size()];
test.assign(array);
for (int i = 0; i < values.length; i++) {
@@ -391,7 +391,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testAssignVector() throws Exception {
+ public void testAssignVector() {
Vector other = new DenseVector(test.size());
test.assign(other);
for (int i = 0; i < values.length; i++) {
@@ -414,7 +414,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testAssignBinaryFunction() throws Exception {
+ public void testAssignBinaryFunction() {
test.assign(test, Functions.PLUS);
for (int i = 0; i < values.length; i++) {
if (i % 2 == 0) {
@@ -426,7 +426,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testAssignBinaryFunction2() throws Exception {
+ public void testAssignBinaryFunction2() {
test.assign(Functions.plus(4));
for (int i = 0; i < values.length; i++) {
if (i % 2 == 0) {
@@ -438,7 +438,7 @@ public abstract class AbstractTestVector
}
@Test
- public void testAssignBinaryFunction3() throws Exception {
+ public void testAssignBinaryFunction3() {
test.assign(Functions.mult(4));
for (int i = 0; i < values.length; i++) {
if (i % 2 == 0) {
Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java?rev=1038820&r1=1038819&r2=1038820&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java Wed Nov 24 21:11:01 2010
@@ -220,7 +220,7 @@ public final class VectorTest extends Ma
v.addTo(w);
Vector gold = new DenseVector(new double[]{2, 3, 1, 5});
- assertTrue(w.equals(gold));
+ assertEquals(w, gold);
assertFalse(v.equals(gold));
}
Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/ExponentialTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/ExponentialTest.java?rev=1038820&r1=1038819&r2=1038820&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/ExponentialTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/ExponentialTest.java Wed Nov 24 21:11:01 2010
@@ -27,7 +27,7 @@ import java.util.Arrays;
public final class ExponentialTest extends MahoutTestCase {
@Test
- public void consistency() throws ConvergenceException, FunctionEvaluationException {
+ public void consistency() throws Exception {
Exponential dist = new Exponential(1, RandomUtils.getRandom());
// deciles computed using R
double[] breaks = {0.1053605, 0.2231436, 0.3566749, 0.5108256, 0.6931472, 0.9162907, 1.2039728, 1.6094379, 2.3025851};
Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/NormalTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/NormalTest.java?rev=1038820&r1=1038819&r2=1038820&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/NormalTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/NormalTest.java Wed Nov 24 21:11:01 2010
@@ -45,7 +45,7 @@ public final class NormalTest extends Ma
}
@Test
- public void consistency() throws ConvergenceException, FunctionEvaluationException {
+ public void consistency() throws Exception {
Random gen = RandomUtils.getRandom();
double offset = 0;
double scale = 1;
Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java?rev=1038820&r1=1038819&r2=1038820&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java Wed Nov 24 21:11:01 2010
@@ -90,7 +90,7 @@ public final class VectorHelper {
/**
* Read a dictionary in {@link SequenceFile} generated by
- * {@link org.apache.mahout.utils.vectors.text.DictionaryVectorizer}
+ * {@link org.apache.mahout.vectorizer.DictionaryVectorizer}
*
* @param conf
* @param fs
Modified: mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java?rev=1038820&r1=1038819&r2=1038820&view=diff
==============================================================================
--- mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java (original)
+++ mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java Wed Nov 24 21:11:01 2010
@@ -266,12 +266,12 @@ public final class TestClusterDumper ext
DistanceMeasure measure = new EuclideanDistanceMeasure();
Path output = getTestTempDirPath("output");
Path tmp = getTestTempDirPath("tmp");
- int desiredRank = 15;
DistributedLanczosSolver solver = new DistributedLanczosSolver();
Configuration conf = new Configuration();
solver.setConf(conf);
Path testData = getTestTempDirPath("testdata");
int sampleDimension = sampleData.get(0).get().size();
+ int desiredRank = 15;
solver.run(testData, output, tmp, sampleData.size(), sampleDimension, false, desiredRank, 0.5, 0.0, true);
Path cleanEigenvectors = new Path(output, EigenVerificationJob.CLEAN_EIGENVECTORS);
@@ -331,13 +331,13 @@ public final class TestClusterDumper ext
DistanceMeasure measure = new EuclideanDistanceMeasure();
Path output = getTestTempDirPath("output");
Path tmp = getTestTempDirPath("tmp");
- int desiredRank = 13;
DistributedLanczosSolver solver = new DistributedLanczosSolver();
Configuration config = new Configuration();
solver.setConf(config);
Path testData = getTestTempDirPath("testdata");
int sampleDimension = sampleData.get(0).get().size();
// Run EigenVerificationJob from within DistributedLanczosSolver.run(...)
+ int desiredRank = 13;
solver.run(testData, output, tmp, sampleData.size(), sampleDimension, false, desiredRank, 0.5, 0.0, false);
Path cleanEigenvectors = new Path(output, EigenVerificationJob.CLEAN_EIGENVECTORS);
@@ -364,13 +364,13 @@ public final class TestClusterDumper ext
DistanceMeasure measure = new EuclideanDistanceMeasure();
Path output = getTestTempDirPath("output");
Path tmp = getTestTempDirPath("tmp");
- int desiredRank = 13;
DistributedLanczosSolver solver = new DistributedLanczosSolver();
Configuration config = new Configuration();
solver.setConf(config);
Path testData = getTestTempDirPath("testdata");
int sampleDimension = sampleData.get(0).get().size();
// call EigenVerificationJob separately
+ int desiredRank = 13;
solver.run(testData, output, tmp, sampleData.size(), sampleDimension, false, desiredRank);
Path rawEigenvectors = new Path(output, DistributedLanczosSolver.RAW_EIGENVECTORS);
JobConf conf = new JobConf(config);
Modified: mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java?rev=1038820&r1=1038819&r2=1038820&view=diff
==============================================================================
--- mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java (original)
+++ mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java Wed Nov 24 21:11:01 2010
@@ -19,6 +19,7 @@ package org.apache.mahout.clustering.cdb
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,7 +72,7 @@ public final class TestCDbwEvaluator ext
private FileSystem fs;
- private final List<VectorWritable> sampleData = new ArrayList<VectorWritable>();
+ private final Collection<VectorWritable> sampleData = new ArrayList<VectorWritable>();
private List<VectorWritable> referenceData = new ArrayList<VectorWritable>();
@@ -153,7 +154,7 @@ public final class TestCDbwEvaluator ext
* double standard deviation of the samples
* @throws Exception
*/
- private void generateSamples(int num, double mx, double my, double sd) throws Exception {
+ private void generateSamples(int num, double mx, double my, double sd) {
log.info("Generating {} samples m=[{}, {}] sd={}", new Object[] { num, mx, my, sd });
for (int i = 0; i < num; i++) {
sampleData.add(new VectorWritable(new DenseVector(new double[] { UncommonDistributions.rNorm(mx, sd),
@@ -161,7 +162,7 @@ public final class TestCDbwEvaluator ext
}
}
- private void generateSamples() throws Exception {
+ private void generateSamples() {
generateSamples(500, 1, 1, 3);
generateSamples(300, 1, 0, 0.5);
generateSamples(300, 0, 2, 0.1);