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/09/03 14:28:41 UTC
svn commit: r992277 [1/9] - in /mahout/trunk:
core/src/main/java/org/apache/mahout/ep/
core/src/main/java/org/apache/mahout/fpm/pfpgrowth/
core/src/test/java/org/apache/mahout/cf/taste/common/
core/src/test/java/org/apache/mahout/cf/taste/hadoop/ core/...
Author: srowen
Date: Fri Sep 3 12:28:34 2010
New Revision: 992277
URL: http://svn.apache.org/viewvc?rev=992277&view=rev
Log:
Big-bang change to move tests to JUnit 4 and standardize a bit along the way.
Added:
mahout/trunk/examples/src/test/java/org/apache/mahout/examples/
mahout/trunk/examples/src/test/java/org/apache/mahout/examples/MahoutTestCase.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/MahoutTestCase.java
Removed:
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/
mahout/trunk/utils/src/test/java/org/apache/mahout/math/
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/common/CommonTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/MaybePruneRowsMapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/BitSetTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastIDSetTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/InvertedRunningAverageTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveArrayIteratorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RefreshHelperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageAndStdDevTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/SamplingLongPrimitiveIteratorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluatorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/RMSRecommenderEvaluatorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArrayTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArrayTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericDataModelTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArrayTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArrayTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/MemoryIDMigratorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileIDMigratorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNNeighborhoodTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdNeighborhoodTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/AllUnknownItemsCandidateItemsStrategyTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/PreferredItemsNeighborhoodCandidateItemsStrategyTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/RandomRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/SamplingCandidateItemsStrategyTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorageTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/EuclideanDistanceSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/file/FileItemSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/CaseAmplificationTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequencyTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/TransformTestCase.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/ZScoreTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierSelfTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapReduceTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/PerceptronTrainerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/WinnowTrainerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegressionTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/ModelSerializerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/OnlineLogisticRegressionTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/ClusteringTestUtils.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestClusterInterface.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestModelDistributionSerialization.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestVectorModelClassifier.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/AbstractJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyCounter.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyRecordWriter.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyReporter.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyStatusReporter.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/IntPairWritableTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/MockIterator.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestEuclideanDistanceMeasure.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestMahalanobisDistanceMeasure.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestManhattanDistanceMeasure.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestTanimotoDistanceMeasure.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestWeightedEuclideanDistanceMeasureTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestWeightedManhattanDistanceMeasure.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/EmptyIteratorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/IteratorUtilsTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestFixedSizeSampler.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestStableFixedSizeSampler.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/builder/DefaultTreeBuilderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataConverterTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/MockContext.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step1MapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step2MapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/TreeIDTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/ep/EvolutionaryProcessTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/ep/ThreadedEvolutionaryProcessTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/EvalMapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/STFitnessEvaluatorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/utils/DummyCandidate.java
mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/utils/DummyEvaluator.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/VarintTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/VectorWritableTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/MathHelper.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/TestDistributedRowMatrix.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/decomposer/TestDistributedLanczosSolver.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/TestRowSimilarityJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedEuclideanDistanceVectorSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedLoglikelihoodVectorSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedPearsonCorrelationVectorSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedTanimotoCoefficientVectorSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedUncenteredCosineVectorSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedUncenteredZeroAssumingCosineVectorSimilarityTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedVectorSimilarityTestCase.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/stats/OnlineAucTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectors/ContinuousValueEncoderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectors/InteractionValueEncoderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectors/MurmurHashTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectors/TextValueEncoderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectors/WordLikeValueEncoderTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/classifier/bayes/SplitBayesInputTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDCrossoverTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapperTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducerTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplitTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombinerTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapperTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducerTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRule.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/AbstractTestVector.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/MahoutTestCase.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/QRDecompositionTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseMatrix.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestMatrixView.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestOrderedIntDoubleMapping.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestRandomAccessSparseVector.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSequentialAccessSparseVector.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSingularValueDecomposition.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseColumnMatrix.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseMatrix.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseRowMatrix.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestVectorView.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/decomposer/SolverTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/decomposer/hebbian/TestHebbianSolver.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/decomposer/lanczos/TestLanczosSolver.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/DistributionChecks.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/ExponentialTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/GammaTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/NegativeBinomialTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/NormalTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/engine/MersenneTwisterTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/stat/GammaTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/stat/ProbabilityTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/OnlineSummarizerTest.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducer.java
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/CollocMapperTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/CollocReducerTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyGroupComparatorTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyPartitionerTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/GramTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducerTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/RandomVectorIterable.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java Fri Sep 3 12:28:34 2010
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.ep;
import com.google.common.collect.Lists;
@@ -29,28 +46,22 @@ import java.util.concurrent.atomic.Atomi
* @see State
*/
public class State<T extends Payload<T>> implements Comparable<State<T>> {
+
// object count is kept to break ties in comparison.
private static final AtomicInteger objectCount = new AtomicInteger();
private int id = objectCount.getAndIncrement();
-
private Random gen = RandomUtils.getRandom();
-
// current state
private double[] params;
-
// mappers to transform state
private Mapping[] maps;
-
// omni-directional mutation
private double omni;
-
// directional mutation
private double[] step;
-
// current fitness value
private double value;
-
private T payload;
public State() {
@@ -169,10 +180,6 @@ public class State<T extends Payload<T>>
return value;
}
- public void setRand(Random rand) {
- this.gen = rand;
- }
-
public void setOmni(double omni) {
this.omni = omni;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java Fri Sep 3 12:28:34 2010
@@ -111,9 +111,7 @@ public final class PFPGrowth {
/**
* read the feature frequency List which is built at the end of the Parallel counting job
*
- * @param params
* @return Feature Frequency List
- * @throws IOException
*/
public static List<Pair<String,Long>> readFList(Parameters params) throws IOException {
Writable key = new Text();
@@ -158,9 +156,7 @@ public final class PFPGrowth {
/**
* Read the Frequent Patterns generated from Text
*
- * @param params
* @return List of TopK patterns for each string frequent feature
- * @throws IOException
*/
public static List<Pair<String,TopKStringPatterns>> readFrequentPattern(Parameters params) throws IOException {
@@ -183,9 +179,6 @@ public final class PFPGrowth {
* @param params
* params should contain input and output locations as a string value, the additional parameters
* include minSupport(3), maxHeapSize(50), numGroups(1000)
- * @throws IOException
- * @throws ClassNotFoundException
- * @throws InterruptedException
*/
public static void runPFPGrowth(Parameters params) throws IOException,
InterruptedException,
@@ -200,11 +193,6 @@ public final class PFPGrowth {
/**
* Run the aggregation Job to aggregate the different TopK patterns and group each Pattern by the features
* present in it and thus calculate the final Top K frequent Patterns for each feature
- *
- * @param params
- * @throws IOException
- * @throws InterruptedException
- * @throws ClassNotFoundException
*/
public static void startAggregating(Parameters params) throws IOException,
InterruptedException,
@@ -276,11 +264,6 @@ public final class PFPGrowth {
/**
* Count the frequencies of various features in parallel using Map/Reduce
- *
- * @param params
- * @throws IOException
- * @throws InterruptedException
- * @throws ClassNotFoundException
*/
public static void startParallelCounting(Parameters params) throws IOException,
InterruptedException,
@@ -317,11 +300,6 @@ public final class PFPGrowth {
/**
* Run the Parallel FPGrowth Map/Reduce Job to calculate the Top K features of group dependent shards
- *
- * @param params
- * @throws IOException
- * @throws InterruptedException
- * @throws ClassNotFoundException
*/
public static void startTransactionSorting(Parameters params) throws IOException,
InterruptedException,
@@ -360,11 +338,6 @@ public final class PFPGrowth {
/**
* Run the Parallel FPGrowth Map/Reduce Job to calculate the Top K features of group dependent shards
- *
- * @param params
- * @throws IOException
- * @throws InterruptedException
- * @throws ClassNotFoundException
*/
public static void startParallelFPGrowth(Parameters params) throws IOException,
InterruptedException,
@@ -401,11 +374,8 @@ public final class PFPGrowth {
/**
* Serializes the fList and returns the string representation of the List
- *
- * @param list
- * @param conf
+ *
* @return Serialized String representation of List
- * @throws IOException
*/
private static String serializeList(List<Pair<String,Long>> list, Configuration conf) throws IOException {
conf.set("io.serializations", "org.apache.hadoop.io.serializer.JavaSerialization,"
@@ -418,10 +388,7 @@ public final class PFPGrowth {
/**
* Converts a given Map in to a String using DefaultStringifier of Hadoop
*
- * @param map
- * @param conf
* @return Serialized String representation of the GList Map
- * @throws IOException
*/
private static String serializeMap(Map<String,Long> map, Configuration conf) throws IOException {
conf.set("io.serializations", "org.apache.hadoop.io.serializer.JavaSerialization,"
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/common/CommonTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/common/CommonTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/common/CommonTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/common/CommonTest.java Fri Sep 3 12:28:34 2010
@@ -18,6 +18,7 @@
package org.apache.mahout.cf.taste.common;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
@@ -27,6 +28,7 @@ import java.io.PrintWriter;
/** <p>Tests common classes.</p> */
public final class CommonTest extends TasteTestCase {
+ @Test
public void testTasteException() {
// Just make sure this all doesn't, ah, throw an exception
TasteException te1 = new TasteException();
@@ -37,6 +39,7 @@ public final class CommonTest extends Ta
te4.printStackTrace(new PrintWriter(new OutputStreamWriter(new ByteArrayOutputStream())));
}
+ @Test
public void testNSUException() {
// Just make sure this all doesn't, ah, throw an exception
TasteException te1 = new NoSuchUserException();
@@ -45,6 +48,7 @@ public final class CommonTest extends Ta
te4.printStackTrace(new PrintWriter(new OutputStreamWriter(new ByteArrayOutputStream())));
}
+ @Test
public void testNSIException() {
// Just make sure this all doesn't, ah, throw an exception
TasteException te1 = new NoSuchItemException();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/MaybePruneRowsMapperTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/MaybePruneRowsMapperTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/MaybePruneRowsMapperTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/MaybePruneRowsMapperTest.java Fri Sep 3 12:28:34 2010
@@ -27,9 +27,11 @@ import org.apache.mahout.math.VectorWrit
import org.apache.mahout.math.hadoop.DistributedRowMatrix;
import org.apache.mahout.math.hadoop.MathHelper;
import org.easymock.classextension.EasyMock;
+import org.junit.Test;
public class MaybePruneRowsMapperTest extends TasteTestCase {
+ @Test
public void testPruning() throws Exception {
Vector v1 = new RandomAccessSparseVector(Integer.MAX_VALUE, 100);
v1.set(1, 1);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java Fri Sep 3 12:28:34 2010
@@ -52,12 +52,14 @@ import org.apache.mahout.math.hadoop.sim
import org.apache.mahout.math.map.OpenIntLongHashMap;
import org.easymock.IArgumentMatcher;
import org.easymock.classextension.EasyMock;
+import org.junit.Test;
public class RecommenderJobTest extends TasteTestCase {
/**
* tests {@link ItemIDIndexMapper}
*/
+ @Test
public void testItemIDIndexMapper() throws Exception {
Mapper<LongWritable,Text, VarIntWritable, VarLongWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -73,6 +75,7 @@ public class RecommenderJobTest extends
/**
* tests {@link ItemIDIndexReducer}
*/
+ @Test
public void testItemIDIndexReducer() throws Exception {
Reducer<VarIntWritable, VarLongWritable, VarIntWritable,VarLongWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -89,6 +92,7 @@ public class RecommenderJobTest extends
/**
* tests {@link ToItemPrefsMapper}
*/
+ @Test
public void testToItemPrefsMapper() throws Exception {
Mapper<LongWritable,Text, VarLongWritable,VarLongWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -107,6 +111,7 @@ public class RecommenderJobTest extends
/**
* tests {@link ToItemPrefsMapper} using boolean data
*/
+ @Test
public void testToItemPrefsMapperBooleanData() throws Exception {
Mapper<LongWritable,Text, VarLongWritable,VarLongWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -126,6 +131,7 @@ public class RecommenderJobTest extends
/**
* tests {@link ToUserVectorReducer}
*/
+ @Test
public void testToUserVectorReducer() throws Exception {
Reducer<VarLongWritable,VarLongWritable,VarLongWritable,VectorWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -147,6 +153,7 @@ public class RecommenderJobTest extends
/**
* tests {@link ToUserVectorReducer} using boolean data
*/
+ @Test
public void testToUserVectorReducerWithBooleanData() throws Exception {
Reducer<VarLongWritable,VarLongWritable,VarLongWritable,VectorWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -165,6 +172,7 @@ public class RecommenderJobTest extends
/**
* tests {@link SimilarityMatrixRowWrapperMapper}
*/
+ @Test
public void testSimilarityMatrixRowWrapperMapper() throws Exception {
Mapper<IntWritable,VectorWritable,VarIntWritable,VectorOrPrefWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -187,7 +195,7 @@ public class RecommenderJobTest extends
/**
* verifies the {@link Vector} included in a {@link VectorOrPrefWritable}
*/
- public static VectorOrPrefWritable vectorOfVectorOrPrefWritableMatches(final Vector.Element... elements) {
+ private static VectorOrPrefWritable vectorOfVectorOrPrefWritableMatches(final Vector.Element... elements) {
EasyMock.reportMatcher(new IArgumentMatcher() {
@Override
public boolean matches(Object argument) {
@@ -206,9 +214,8 @@ public class RecommenderJobTest extends
/**
* tests {@link UserVectorSplitterMapper}
- *
- * @throws Exception
*/
+ @Test
public void testUserVectorSplitterMapper() throws Exception {
Mapper<VarLongWritable,VectorWritable, VarIntWritable,VectorOrPrefWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -233,7 +240,7 @@ public class RecommenderJobTest extends
/**
* verifies a preference in a {@link VectorOrPrefWritable}
*/
- public static VectorOrPrefWritable prefOfVectorOrPrefWritableMatches(final long userID, final float prefValue) {
+ private static VectorOrPrefWritable prefOfVectorOrPrefWritableMatches(final long userID, final float prefValue) {
EasyMock.reportMatcher(new IArgumentMatcher() {
@Override
public boolean matches(Object argument) {
@@ -253,6 +260,7 @@ public class RecommenderJobTest extends
/**
* tests {@link UserVectorSplitterMapper} in the special case that some userIDs shall be excluded
*/
+ @Test
public void testUserVectorSplitterMapperUserExclusion() throws Exception {
Mapper<VarLongWritable,VectorWritable, VarIntWritable,VectorOrPrefWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -284,6 +292,7 @@ public class RecommenderJobTest extends
* tests {@link UserVectorSplitterMapper} in the special case that the number of preferences to be considered
* is less than the number of available preferences
*/
+ @Test
public void testUserVectorSplitterMapperOnlySomePrefsConsidered() throws Exception {
Mapper<VarLongWritable,VectorWritable, VarIntWritable,VectorOrPrefWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -308,7 +317,7 @@ public class RecommenderJobTest extends
/**
* verifies that a preference value is NaN in a {@link VectorOrPrefWritable}
*/
- public static VectorOrPrefWritable prefOfVectorOrPrefWritableMatchesNaN(final long userID) {
+ private static VectorOrPrefWritable prefOfVectorOrPrefWritableMatchesNaN(final long userID) {
EasyMock.reportMatcher(new IArgumentMatcher() {
@Override
public boolean matches(Object argument) {
@@ -328,6 +337,7 @@ public class RecommenderJobTest extends
/**
* tests {@link ToVectorAndPrefReducer}
*/
+ @Test
public void testToVectorAndPrefReducer() throws Exception {
Reducer<VarIntWritable,VectorOrPrefWritable,VarIntWritable,VectorAndPrefsWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -354,7 +364,7 @@ public class RecommenderJobTest extends
/**
* verifies a {@link VectorAndPrefsWritable}
*/
- public static VectorAndPrefsWritable vectorAndPrefsWritableMatches(final List<Long> userIDs,
+ private static VectorAndPrefsWritable vectorAndPrefsWritableMatches(final List<Long> userIDs,
final List<Float> prefValues, final Vector.Element... elements) {
EasyMock.reportMatcher(new IArgumentMatcher() {
@Override
@@ -383,6 +393,7 @@ public class RecommenderJobTest extends
* tests {@link ToVectorAndPrefReducer} in the error case that two similarity column vectors a supplied for the same
* item (which should never happen)
*/
+ @Test
public void testToVectorAndPrefReducerExceptionOn2Vectors() throws Exception {
Reducer<VarIntWritable,VectorOrPrefWritable,VarIntWritable,VectorAndPrefsWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -408,6 +419,7 @@ public class RecommenderJobTest extends
/**
* tests {@link PartialMultiplyMapper}
*/
+ @Test
public void testPartialMultiplyMapper() throws Exception {
Vector similarityColumn = new RandomAccessSparseVector(Integer.MAX_VALUE, 100);
@@ -439,6 +451,7 @@ public class RecommenderJobTest extends
/**
* tests {@link AggregateAndRecommendReducer}
*/
+ @Test
public void testAggregateAndRecommendReducer() throws Exception {
Reducer<VarLongWritable,PrefAndSimilarityColumnWritable,VarLongWritable,RecommendedItemsWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -477,6 +490,7 @@ public class RecommenderJobTest extends
/**
* tests {@link AggregateAndRecommendReducer}
*/
+ @Test
public void testAggregateAndRecommendReducerExcludeRecommendationsBasedOnOneItem() throws Exception {
Reducer<VarLongWritable,PrefAndSimilarityColumnWritable,VarLongWritable,RecommendedItemsWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -513,6 +527,7 @@ public class RecommenderJobTest extends
/**
* tests {@link AggregateAndRecommendReducer} with a limit on the recommendations per user
*/
+ @Test
public void testAggregateAndRecommendReducerLimitNumberOfRecommendations() throws Exception {
Reducer<VarLongWritable,PrefAndSimilarityColumnWritable,VarLongWritable,RecommendedItemsWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -603,6 +618,7 @@ public class RecommenderJobTest extends
*
* </pre>
*/
+ @Test
public void testCompleteJob() throws Exception {
File inputFile = getTestTempFile("prefs.txt");
@@ -667,6 +683,7 @@ public class RecommenderJobTest extends
/**
* small integration test for boolean data
*/
+ @Test
public void testCompleteJobBoolean() throws Exception {
File inputFile = getTestTempFile("prefs.txt");
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityTest.java Fri Sep 3 12:28:34 2010
@@ -46,6 +46,7 @@ import org.apache.mahout.math.hadoop.sim
import org.apache.mahout.math.map.OpenIntLongHashMap;
import org.easymock.IArgumentMatcher;
import org.easymock.classextension.EasyMock;
+import org.junit.Test;
/**
* Unit tests for the mappers and reducers in org.apache.mahout.cf.taste.hadoop.similarity.item
@@ -54,8 +55,9 @@ import org.easymock.classextension.EasyM
public final class ItemSimilarityTest extends TasteTestCase {
/**
- * tests {@link CountUsersMapper}
+ * Tests {@link CountUsersMapper}
*/
+ @Test
public void testCountUsersMapper() throws Exception {
Mapper<LongWritable,Text,CountUsersKeyWritable,VarLongWritable>.Context context =
EasyMock.createMock(Mapper.Context.class);
@@ -71,8 +73,9 @@ public final class ItemSimilarityTest ex
}
/**
- * applies an {@link IArgumentMatcher} to a {@link CountUsersKeyWritable} checking whether it matches the userID
+ * Applies an {@link IArgumentMatcher} to a {@link CountUsersKeyWritable} checking whether it matches the userID
*/
+ @Test
static CountUsersKeyWritable keyForUserID(final long userID) {
EasyMock.reportMatcher(new IArgumentMatcher() {
@Override
@@ -92,8 +95,9 @@ public final class ItemSimilarityTest ex
}
/**
- * tests {@link CountUsersReducer}
+ * Tests {@link CountUsersReducer}
*/
+ @Test
public void testCountUsersReducer() throws Exception {
Reducer<CountUsersKeyWritable,VarLongWritable,VarIntWritable,NullWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -109,8 +113,9 @@ public final class ItemSimilarityTest ex
}
/**
- * tests {@link MostSimilarItemPairsMapper}
+ * Tests {@link MostSimilarItemPairsMapper}
*/
+ @Test
public void testMostSimilarItemsPairsMapper() throws Exception {
OpenIntLongHashMap indexItemIDMap = new OpenIntLongHashMap();
@@ -140,8 +145,9 @@ public final class ItemSimilarityTest ex
}
/**
- * tests {@link MostSimilarItemPairsReducer}
+ * Tests {@link MostSimilarItemPairsReducer}
*/
+ @Test
public void testMostSimilarItemPairsReducer() throws Exception {
Reducer<EntityEntityWritable,DoubleWritable,EntityEntityWritable,DoubleWritable>.Context context =
EasyMock.createMock(Reducer.Context.class);
@@ -157,7 +163,7 @@ public final class ItemSimilarityTest ex
}
/**
- * integration test with a tiny data set
+ * Integration test with a tiny data set
*
* <pre>
* user-item-matrix
@@ -168,6 +174,7 @@ public final class ItemSimilarityTest ex
* Fred - - - 1
* </pre>
*/
+ @Test
public void testCompleteJob() throws Exception {
File inputFile = getTestTempFile("prefs.txt");
@@ -262,6 +269,7 @@ public final class ItemSimilarityTest ex
* i3 --> i1
* </pre>
*/
+ @Test
public void testMaxSimilaritiesPerItem() throws Exception {
File inputFile = getTestTempFile("prefsForMaxSimilarities.txt");
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java Fri Sep 3 12:28:34 2010
@@ -37,9 +37,6 @@ import java.util.List;
public abstract class TasteTestCase extends MahoutTestCase {
- /** "Close enough" value for floating-point comparisons. */
- protected static final double EPSILON = 0.00001;
-
public static DataModel getDataModel(long[] userIDs, Double[][] prefValues) {
FastByIDMap<PreferenceArray> result = new FastByIDMap<PreferenceArray>();
for (int i = 0; i < userIDs.length; i++) {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/BitSetTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/BitSetTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/BitSetTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/BitSetTest.java Fri Sep 3 12:28:34 2010
@@ -18,11 +18,13 @@
package org.apache.mahout.cf.taste.impl.common;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
public final class BitSetTest extends TasteTestCase {
private static final int NUM_BITS = 100;
+ @Test
public void testGetSet() {
BitSet bitSet = new BitSet(NUM_BITS);
for (int i = 0; i < NUM_BITS; i++) {
@@ -34,6 +36,7 @@ public final class BitSetTest extends Ta
assertTrue(bitSet.get(NUM_BITS-1));
}
+ @Test
public void testBounds() {
BitSet bitSet = new BitSet(NUM_BITS);
try {
@@ -50,6 +53,7 @@ public final class BitSetTest extends Ta
}
}
+ @Test
public void testClear() {
BitSet bitSet = new BitSet(NUM_BITS);
for (int i = 0; i < NUM_BITS; i++) {
@@ -64,6 +68,7 @@ public final class BitSetTest extends Ta
}
}
+ @Test
public void testClone() {
BitSet bitSet = new BitSet(NUM_BITS);
bitSet.set(NUM_BITS-1);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java Fri Sep 3 12:28:34 2010
@@ -20,11 +20,13 @@ package org.apache.mahout.cf.taste.impl.
import org.apache.mahout.cf.taste.common.TasteException;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.common.RandomUtils;
+import org.junit.Test;
import java.util.Random;
public final class CacheTest extends TasteTestCase {
-
+
+ @Test
public void testLotsOfGets() throws TasteException {
Retriever<Object,Object> retriever = new IdentityRetriever();
Cache<Object,Object> cache = new Cache<Object,Object>(retriever, 1000);
@@ -32,7 +34,8 @@ public final class CacheTest extends Tas
assertEquals(i, cache.get(i));
}
}
-
+
+ @Test
public void testMixedUsage() throws TasteException {
Random random = RandomUtils.getRandom();
Retriever<Object,Object> retriever = new IdentityRetriever();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastIDSetTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastIDSetTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastIDSetTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastIDSetTest.java Fri Sep 3 12:28:34 2010
@@ -19,15 +19,16 @@ package org.apache.mahout.cf.taste.impl.
import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.common.RandomUtils;
+import org.junit.Test;
import java.util.Collection;
import java.util.HashSet;
import java.util.Random;
-import java.util.Set;
/** <p>Tests {@link FastIDSet}.</p> */
public final class FastIDSetTest extends TasteTestCase {
+ @Test
public void testContainsAndAdd() {
FastIDSet set = new FastIDSet();
assertFalse(set.contains(1));
@@ -35,6 +36,7 @@ public final class FastIDSetTest extends
assertTrue(set.contains(1));
}
+ @Test
public void testRemove() {
FastIDSet set = new FastIDSet();
set.add(1);
@@ -44,7 +46,7 @@ public final class FastIDSetTest extends
assertFalse(set.contains(1));
}
-
+ @Test
public void testClear() {
FastIDSet set = new FastIDSet();
set.add(1);
@@ -54,6 +56,7 @@ public final class FastIDSetTest extends
assertFalse(set.contains(1));
}
+ @Test
public void testSizeEmpty() {
FastIDSet set = new FastIDSet();
assertEquals(0, set.size());
@@ -66,6 +69,7 @@ public final class FastIDSetTest extends
assertTrue(set.isEmpty());
}
+ @Test
public void testContains() {
FastIDSet set = buildTestFastSet();
assertTrue(set.contains(1));
@@ -74,6 +78,7 @@ public final class FastIDSetTest extends
assertFalse(set.contains(4));
}
+ @Test
public void testReservedValues() {
FastIDSet set = new FastIDSet();
try {
@@ -92,6 +97,7 @@ public final class FastIDSetTest extends
assertFalse(set.contains(Long.MAX_VALUE));
}
+ @Test
public void testRehash() {
FastIDSet set = buildTestFastSet();
set.remove(1);
@@ -99,6 +105,7 @@ public final class FastIDSetTest extends
assertFalse(set.contains(1));
}
+ @Test
public void testGrow() {
FastIDSet set = new FastIDSet(1);
set.add(1);
@@ -107,6 +114,7 @@ public final class FastIDSetTest extends
assertTrue(set.contains(2));
}
+ @Test
public void testIterator() {
FastIDSet set = buildTestFastSet();
Collection<Long> expected = new HashSet<Long>(3);
@@ -120,9 +128,10 @@ public final class FastIDSetTest extends
assertTrue(expected.isEmpty());
}
+ @Test
public void testVersusHashSet() {
FastIDSet actual = new FastIDSet(1);
- Set<Integer> expected = new HashSet<Integer>(1000000);
+ Collection<Integer> expected = new HashSet<Integer>(1000000);
Random r = RandomUtils.getRandom();
for (int i = 0; i < 1000000; i++) {
double d = r.nextDouble();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java Fri Sep 3 12:28:34 2010
@@ -19,6 +19,7 @@ package org.apache.mahout.cf.taste.impl.
import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.common.RandomUtils;
+import org.junit.Test;
import java.util.Collection;
import java.util.HashMap;
@@ -30,13 +31,15 @@ import java.util.Set;
/** <p>Tests {@link FastMap}.</p> */
public final class FastMapTest extends TasteTestCase {
+ @Test
public void testPutAndGet() {
- FastMap<String, String> map = new FastMap<String, String>();
+ Map<String, String> map = new FastMap<String, String>();
assertNull(map.get("foo"));
map.put("foo", "bar");
assertEquals("bar", map.get("foo"));
}
+ @Test
public void testRemove() {
Map<String, String> map = new FastMap<String, String>();
map.put("foo", "bar");
@@ -46,6 +49,7 @@ public final class FastMapTest extends T
assertNull(map.get("foo"));
}
+ @Test
public void testClear() {
Map<String, String> map = new FastMap<String, String>();
map.put("foo", "bar");
@@ -55,6 +59,7 @@ public final class FastMapTest extends T
assertNull(map.get("foo"));
}
+ @Test
public void testSizeEmpty() {
Map<String, String> map = new FastMap<String, String>();
assertEquals(0, map.size());
@@ -67,6 +72,7 @@ public final class FastMapTest extends T
assertTrue(map.isEmpty());
}
+ @Test
public void testContains() {
FastMap<String, String> map = buildTestFastMap();
assertTrue(map.containsKey("foo"));
@@ -79,6 +85,7 @@ public final class FastMapTest extends T
assertFalse(map.containsValue("something"));
}
+ @Test
public void testNull() {
Map<String, String> map = new FastMap<String, String>();
try {
@@ -96,6 +103,7 @@ public final class FastMapTest extends T
assertNull(map.get(null));
}
+ @Test
public void testRehash() {
FastMap<String, String> map = buildTestFastMap();
map.remove("foo");
@@ -104,14 +112,16 @@ public final class FastMapTest extends T
assertEquals("bang", map.get("baz"));
}
+ @Test
public void testGrow() {
- FastMap<String, String> map = new FastMap<String, String>(1, FastMap.NO_MAX_SIZE);
+ Map<String, String> map = new FastMap<String, String>(1, FastMap.NO_MAX_SIZE);
map.put("foo", "bar");
map.put("baz", "bang");
assertEquals("bar", map.get("foo"));
assertEquals("bang", map.get("baz"));
}
+ @Test
public void testKeySet() {
FastMap<String, String> map = buildTestFastMap();
Collection<String> expected = new HashSet<String>(3);
@@ -123,6 +133,7 @@ public final class FastMapTest extends T
assertTrue(actual.containsAll(expected));
}
+ @Test
public void testValues() {
FastMap<String, String> map = buildTestFastMap();
Collection<String> expected = new HashSet<String>(3);
@@ -134,6 +145,7 @@ public final class FastMapTest extends T
assertTrue(actual.containsAll(expected));
}
+ @Test
public void testEntrySet() {
FastMap<String, String> map = buildTestFastMap();
Set<Map.Entry<String, String>> actual = map.entrySet();
@@ -154,6 +166,7 @@ public final class FastMapTest extends T
assertEquals(0, expectedValues.size());
}
+ @Test
public void testVersusHashMap() {
Map<Integer, String> actual = new FastMap<Integer, String>(1, 1000000);
Map<Integer, String> expected = new HashMap<Integer, String>(1000000);
@@ -175,6 +188,7 @@ public final class FastMapTest extends T
}
}
+ @Test
public void testMaxSize() {
Map<String, String> map = new FastMap<String, String>(1, 1);
map.put("foo", "bar");
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/InvertedRunningAverageTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/InvertedRunningAverageTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/InvertedRunningAverageTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/InvertedRunningAverageTest.java Fri Sep 3 12:28:34 2010
@@ -18,21 +18,24 @@
package org.apache.mahout.cf.taste.impl.common;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
public final class InvertedRunningAverageTest extends TasteTestCase {
+ @Test
public void testAverage() {
RunningAverage avg = new FullRunningAverage();
InvertedRunningAverage inverted = new InvertedRunningAverage(avg);
assertEquals(0, inverted.getCount());
avg.addDatum(1.0);
assertEquals(1, inverted.getCount());
- assertEquals(-1.0, inverted.getAverage());
+ assertEquals(-1.0, inverted.getAverage(), EPSILON);
avg.addDatum(2.0);
assertEquals(2, inverted.getCount());
- assertEquals(-1.5, inverted.getAverage());
+ assertEquals(-1.5, inverted.getAverage(), EPSILON);
}
+ @Test
public void testUnsupported() {
RunningAverage avg = new FullRunningAverage();
InvertedRunningAverage inverted = new InvertedRunningAverage(avg);
@@ -56,22 +59,24 @@ public final class InvertedRunningAverag
}
}
+ @Test
public void testAverageAndStdDev() {
RunningAverageAndStdDev avg = new FullRunningAverageAndStdDev();
- InvertedRunningAverageAndStdDev inverted = new InvertedRunningAverageAndStdDev(avg);
+ RunningAverageAndStdDev inverted = new InvertedRunningAverageAndStdDev(avg);
assertEquals(0, inverted.getCount());
avg.addDatum(1.0);
assertEquals(1, inverted.getCount());
- assertEquals(-1.0, inverted.getAverage());
+ assertEquals(-1.0, inverted.getAverage(), EPSILON);
avg.addDatum(2.0);
assertEquals(2, inverted.getCount());
- assertEquals(-1.5, inverted.getAverage());
- assertEquals(Math.sqrt(2.0)/2.0, inverted.getStandardDeviation());
+ assertEquals(-1.5, inverted.getAverage(), EPSILON);
+ assertEquals(Math.sqrt(2.0)/2.0, inverted.getStandardDeviation(), EPSILON);
}
+ @Test
public void testAndStdDevUnsupported() {
RunningAverageAndStdDev avg = new FullRunningAverageAndStdDev();
- InvertedRunningAverageAndStdDev inverted = new InvertedRunningAverageAndStdDev(avg);
+ RunningAverage inverted = new InvertedRunningAverageAndStdDev(avg);
try {
inverted.addDatum(1.0);
fail("Should have thrown exception");
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveArrayIteratorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveArrayIteratorTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveArrayIteratorTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveArrayIteratorTest.java Fri Sep 3 12:28:34 2010
@@ -18,11 +18,13 @@
package org.apache.mahout.cf.taste.impl.common;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
import java.util.NoSuchElementException;
public final class LongPrimitiveArrayIteratorTest extends TasteTestCase {
+ @Test
public void testEmpty() {
LongPrimitiveArrayIterator it = new LongPrimitiveArrayIterator(new long[0]);
assertFalse(it.hasNext());
@@ -34,6 +36,7 @@ public final class LongPrimitiveArrayIte
}
}
+ @Test
public void testNext() {
LongPrimitiveArrayIterator it = new LongPrimitiveArrayIterator(new long[] {3,2,1});
assertTrue(it.hasNext());
@@ -51,6 +54,7 @@ public final class LongPrimitiveArrayIte
}
}
+ @Test
public void testPeekSkip() {
LongPrimitiveArrayIterator it = new LongPrimitiveArrayIterator(new long[] {3,2,1});
assertEquals(3, it.peek());
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RefreshHelperTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RefreshHelperTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RefreshHelperTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RefreshHelperTest.java Fri Sep 3 12:28:34 2010
@@ -19,6 +19,7 @@ package org.apache.mahout.cf.taste.impl.
import org.apache.mahout.cf.taste.common.Refreshable;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
import java.util.Collection;
import java.util.HashSet;
@@ -26,6 +27,7 @@ import java.util.HashSet;
/** Tests {@link RefreshHelper} */
public final class RefreshHelperTest extends TasteTestCase {
+ @Test
public void testCallable() {
MockRefreshable mock = new MockRefreshable();
RefreshHelper helper = new RefreshHelper(mock);
@@ -33,11 +35,13 @@ public final class RefreshHelperTest ext
assertEquals(1, mock.getCallCount());
}
+ @Test
public void testNoCallable() {
RefreshHelper helper = new RefreshHelper(null);
helper.refresh(null);
}
+ @Test
public void testDependencies() {
RefreshHelper helper = new RefreshHelper(null);
MockRefreshable mock1 = new MockRefreshable();
@@ -49,6 +53,7 @@ public final class RefreshHelperTest ext
assertEquals(1, mock2.getCallCount());
}
+ @Test
public void testAlreadyRefreshed() {
RefreshHelper helper = new RefreshHelper(null);
MockRefreshable mock1 = new MockRefreshable();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageAndStdDevTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageAndStdDevTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageAndStdDevTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageAndStdDevTest.java Fri Sep 3 12:28:34 2010
@@ -18,13 +18,16 @@
package org.apache.mahout.cf.taste.impl.common;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
public final class RunningAverageAndStdDevTest extends TasteTestCase {
+ @Test
public void testFull() {
doTestAverageAndStdDev(new FullRunningAverageAndStdDev());
}
+ @Test
public void testCompact() {
doTestAverageAndStdDev(new CompactRunningAverageAndStdDev());
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/RunningAverageTest.java Fri Sep 3 12:28:34 2010
@@ -18,14 +18,17 @@
package org.apache.mahout.cf.taste.impl.common;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
/** <p>Tests {@link FullRunningAverage}.</p> */
public final class RunningAverageTest extends TasteTestCase {
+ @Test
public void testFull() {
doTestRunningAverage(new FullRunningAverage());
}
+ @Test
public void testCompact() {
doTestRunningAverage(new CompactRunningAverage());
}
@@ -36,30 +39,30 @@ public final class RunningAverageTest ex
assertTrue(Double.isNaN(runningAverage.getAverage()));
runningAverage.addDatum(1.0);
assertEquals(1, runningAverage.getCount());
- assertEquals(1.0, runningAverage.getAverage());
+ assertEquals(1.0, runningAverage.getAverage(), EPSILON);
runningAverage.addDatum(1.0);
assertEquals(2, runningAverage.getCount());
- assertEquals(1.0, runningAverage.getAverage());
+ assertEquals(1.0, runningAverage.getAverage(), EPSILON);
runningAverage.addDatum(4.0);
assertEquals(3, runningAverage.getCount());
- assertEquals(2.0, runningAverage.getAverage());
+ assertEquals(2.0, runningAverage.getAverage(), EPSILON);
runningAverage.addDatum(-4.0);
assertEquals(4, runningAverage.getCount());
- assertEquals(0.5, runningAverage.getAverage());
+ assertEquals(0.5, runningAverage.getAverage(), EPSILON);
runningAverage.removeDatum(-4.0);
assertEquals(3, runningAverage.getCount());
- assertEquals(2.0, runningAverage.getAverage());
+ assertEquals(2.0, runningAverage.getAverage(), EPSILON);
runningAverage.removeDatum(4.0);
assertEquals(2, runningAverage.getCount());
- assertEquals(1.0, runningAverage.getAverage());
+ assertEquals(1.0, runningAverage.getAverage(), EPSILON);
runningAverage.changeDatum(0.0);
assertEquals(2, runningAverage.getCount());
- assertEquals(1.0, runningAverage.getAverage());
+ assertEquals(1.0, runningAverage.getAverage(), EPSILON);
runningAverage.changeDatum(2.0);
assertEquals(2, runningAverage.getCount());
- assertEquals(2.0, runningAverage.getAverage());
+ assertEquals(2.0, runningAverage.getAverage(), EPSILON);
}
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/SamplingLongPrimitiveIteratorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/SamplingLongPrimitiveIteratorTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/SamplingLongPrimitiveIteratorTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/SamplingLongPrimitiveIteratorTest.java Fri Sep 3 12:28:34 2010
@@ -18,11 +18,13 @@
package org.apache.mahout.cf.taste.impl.common;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
import java.util.NoSuchElementException;
public final class SamplingLongPrimitiveIteratorTest extends TasteTestCase {
+ @Test
public void testEmpty() {
LongPrimitiveArrayIterator it = new LongPrimitiveArrayIterator(new long[0]);
SamplingLongPrimitiveIterator sample = new SamplingLongPrimitiveIterator(it, 0.5);
@@ -35,6 +37,7 @@ public final class SamplingLongPrimitive
}
}
+ @Test
public void testNext() {
LongPrimitiveArrayIterator it = new LongPrimitiveArrayIterator(new long[] {5,4,3,2,1});
SamplingLongPrimitiveIterator sample = new SamplingLongPrimitiveIterator(it, 0.5);
@@ -53,6 +56,7 @@ public final class SamplingLongPrimitive
}
}
+ @Test
public void testPeekSkip() {
LongPrimitiveArrayIterator it = new LongPrimitiveArrayIterator(new long[] {8,7,6,5,4,3,2,1});
SamplingLongPrimitiveIterator sample = new SamplingLongPrimitiveIterator(it, 0.5);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluatorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluatorTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluatorTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluatorTest.java Fri Sep 3 12:28:34 2010
@@ -24,9 +24,11 @@ import org.apache.mahout.cf.taste.impl.T
import org.apache.mahout.cf.taste.impl.recommender.slopeone.SlopeOneRecommender;
import org.apache.mahout.cf.taste.model.DataModel;
import org.apache.mahout.cf.taste.recommender.Recommender;
+import org.junit.Test;
public final class AverageAbsoluteDifferenceRecommenderEvaluatorTest extends TasteTestCase {
+ @Test
public void testEvaluate() throws Exception {
DataModel model = getDataModel();
RecommenderBuilder builder = new RecommenderBuilder() {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java Fri Sep 3 12:28:34 2010
@@ -25,9 +25,11 @@ import org.apache.mahout.cf.taste.impl.T
import org.apache.mahout.cf.taste.impl.recommender.slopeone.SlopeOneRecommender;
import org.apache.mahout.cf.taste.model.DataModel;
import org.apache.mahout.cf.taste.recommender.Recommender;
+import org.junit.Test;
public final class GenericRecommenderIRStatsEvaluatorImplTest extends TasteTestCase {
+ @Test
public void testEvaluate() throws Exception {
DataModel model = getDataModel();
RecommenderBuilder builder = new RecommenderBuilder() {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/RMSRecommenderEvaluatorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/RMSRecommenderEvaluatorTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/RMSRecommenderEvaluatorTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/RMSRecommenderEvaluatorTest.java Fri Sep 3 12:28:34 2010
@@ -24,9 +24,11 @@ import org.apache.mahout.cf.taste.impl.T
import org.apache.mahout.cf.taste.impl.recommender.slopeone.SlopeOneRecommender;
import org.apache.mahout.cf.taste.model.DataModel;
import org.apache.mahout.cf.taste.recommender.Recommender;
+import org.junit.Test;
public final class RMSRecommenderEvaluatorTest extends TasteTestCase {
+ @Test
public void testEvaluate() throws Exception {
DataModel model = getDataModel();
RecommenderBuilder builder = new RecommenderBuilder() {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArrayTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArrayTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArrayTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArrayTest.java Fri Sep 3 12:28:34 2010
@@ -17,10 +17,12 @@
package org.apache.mahout.cf.taste.impl.model;
-import org.apache.mahout.common.MahoutTestCase;
+import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
-public final class BooleanItemPreferenceArrayTest extends MahoutTestCase {
+public final class BooleanItemPreferenceArrayTest extends TasteTestCase {
+ @Test
public void testUserID() {
BooleanItemPreferenceArray prefs = new BooleanItemPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -30,6 +32,7 @@ public final class BooleanItemPreference
assertEquals(1L, prefs.getItemID(2));
}
+ @Test
public void testItemID() {
BooleanItemPreferenceArray prefs = new BooleanItemPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -41,6 +44,7 @@ public final class BooleanItemPreference
assertEquals(3L, prefs.getUserID(2));
}
+ @Test
public void testSetValue() {
BooleanItemPreferenceArray prefs = new BooleanItemPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -50,9 +54,10 @@ public final class BooleanItemPreference
} catch (UnsupportedOperationException uoe) {
// good
}
- assertEquals(1.0f, prefs.getValue(2));
+ assertEquals(1.0f, prefs.getValue(2), EPSILON);
}
+ @Test
public void testHasPref() {
BooleanItemPreferenceArray prefs = new BooleanItemPreferenceArray(3);
prefs.set(0, new GenericPreference(1L, 3L, 5.0f));
@@ -62,6 +67,7 @@ public final class BooleanItemPreference
assertFalse(prefs.hasPrefWithUserID(2L));
}
+ @Test
public void testSort() {
BooleanItemPreferenceArray prefs = new BooleanItemPreferenceArray(3);
prefs.set(0, new GenericPreference(3L, 1L, 5.0f));
@@ -73,6 +79,7 @@ public final class BooleanItemPreference
assertEquals(3L, prefs.getUserID(2));
}
+ @Test
public void testClone() {
BooleanItemPreferenceArray prefs = new BooleanItemPreferenceArray(3);
prefs.set(0, new BooleanPreference(3L, 1L));
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArrayTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArrayTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArrayTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArrayTest.java Fri Sep 3 12:28:34 2010
@@ -17,10 +17,12 @@
package org.apache.mahout.cf.taste.impl.model;
-import org.apache.mahout.common.MahoutTestCase;
+import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
-public final class BooleanUserPreferenceArrayTest extends MahoutTestCase {
+public final class BooleanUserPreferenceArrayTest extends TasteTestCase {
+ @Test
public void testUserID() {
BooleanUserPreferenceArray prefs = new BooleanUserPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -30,6 +32,7 @@ public final class BooleanUserPreference
assertEquals(1L, prefs.getUserID(2));
}
+ @Test
public void testItemID() {
BooleanUserPreferenceArray prefs = new BooleanUserPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -41,6 +44,7 @@ public final class BooleanUserPreference
assertEquals(3L, prefs.getItemID(2));
}
+ @Test
public void testSetValue() {
BooleanUserPreferenceArray prefs = new BooleanUserPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -50,9 +54,10 @@ public final class BooleanUserPreference
} catch (UnsupportedOperationException uoe) {
// good
}
- assertEquals(1.0f, prefs.getValue(2));
+ assertEquals(1.0f, prefs.getValue(2), EPSILON);
}
+ @Test
public void testHasPref() {
BooleanUserPreferenceArray prefs = new BooleanUserPreferenceArray(3);
prefs.set(0, new GenericPreference(1L, 3L, 5.0f));
@@ -62,6 +67,7 @@ public final class BooleanUserPreference
assertFalse(prefs.hasPrefWithUserID(2L));
}
+ @Test
public void testSort() {
BooleanUserPreferenceArray prefs = new BooleanUserPreferenceArray(3);
prefs.set(0, new BooleanPreference(1L, 3L));
@@ -73,6 +79,7 @@ public final class BooleanUserPreference
assertEquals(3L, prefs.getItemID(2));
}
+ @Test
public void testClone() {
BooleanUserPreferenceArray prefs = new BooleanUserPreferenceArray(3);
prefs.set(0, new BooleanPreference(1L, 3L));
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericDataModelTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericDataModelTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericDataModelTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericDataModelTest.java Fri Sep 3 12:28:34 2010
@@ -23,12 +23,14 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
/**
* Tests {@link GenericDataModel}.
*/
public final class GenericDataModelTest extends TasteTestCase {
+ @Test
public void testSerialization() throws Exception {
GenericDataModel model = (GenericDataModel) getDataModel();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArrayTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArrayTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArrayTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArrayTest.java Fri Sep 3 12:28:34 2010
@@ -17,10 +17,12 @@
package org.apache.mahout.cf.taste.impl.model;
-import org.apache.mahout.common.MahoutTestCase;
+import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
-public final class GenericItemPreferenceArrayTest extends MahoutTestCase {
+public final class GenericItemPreferenceArrayTest extends TasteTestCase {
+ @Test
public void testUserID() {
GenericItemPreferenceArray prefs = new GenericItemPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -30,6 +32,7 @@ public final class GenericItemPreference
assertEquals(1L, prefs.getItemID(2));
}
+ @Test
public void testItemID() {
GenericItemPreferenceArray prefs = new GenericItemPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -41,17 +44,19 @@ public final class GenericItemPreference
assertEquals(3L, prefs.getUserID(2));
}
+ @Test
public void testSetValue() {
GenericItemPreferenceArray prefs = new GenericItemPreferenceArray(3);
assertEquals(3, prefs.length());
prefs.setValue(0, 1.0f);
prefs.setValue(1, 2.0f);
prefs.setValue(2, 3.0f);
- assertEquals(1.0f, prefs.getValue(0));
- assertEquals(2.0f, prefs.getValue(1));
- assertEquals(3.0f, prefs.getValue(2));
+ assertEquals(1.0f, prefs.getValue(0), EPSILON);
+ assertEquals(2.0f, prefs.getValue(1), EPSILON);
+ assertEquals(3.0f, prefs.getValue(2), EPSILON);
}
+ @Test
public void testHasPref() {
GenericItemPreferenceArray prefs = new GenericItemPreferenceArray(3);
prefs.set(0, new GenericPreference(1L, 3L, 5.0f));
@@ -61,6 +66,7 @@ public final class GenericItemPreference
assertFalse(prefs.hasPrefWithUserID(2L));
}
+ @Test
public void testSort() {
GenericItemPreferenceArray prefs = new GenericItemPreferenceArray(3);
prefs.set(0, new GenericPreference(3L, 1L, 5.0f));
@@ -72,6 +78,7 @@ public final class GenericItemPreference
assertEquals(3L, prefs.getUserID(2));
}
+ @Test
public void testSortValue() {
GenericItemPreferenceArray prefs = new GenericItemPreferenceArray(3);
prefs.set(0, new GenericPreference(3L, 1L, 5.0f));
@@ -87,6 +94,7 @@ public final class GenericItemPreference
assertEquals(2L, prefs.getUserID(2));
}
+ @Test
public void testClone() {
GenericItemPreferenceArray prefs = new GenericItemPreferenceArray(3);
prefs.set(0, new GenericPreference(3L, 1L, 5.0f));
@@ -95,7 +103,7 @@ public final class GenericItemPreference
prefs = prefs.clone();
assertEquals(3L, prefs.getUserID(0));
assertEquals(1L, prefs.getItemID(1));
- assertEquals(3.0f, prefs.getValue(2));
+ assertEquals(3.0f, prefs.getValue(2), EPSILON);
}
}
\ No newline at end of file
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArrayTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArrayTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArrayTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArrayTest.java Fri Sep 3 12:28:34 2010
@@ -17,10 +17,12 @@
package org.apache.mahout.cf.taste.impl.model;
-import org.apache.mahout.common.MahoutTestCase;
+import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.junit.Test;
-public final class GenericUserPreferenceArrayTest extends MahoutTestCase {
+public final class GenericUserPreferenceArrayTest extends TasteTestCase {
+ @Test
public void testUserID() {
GenericUserPreferenceArray prefs = new GenericUserPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -30,6 +32,7 @@ public final class GenericUserPreference
assertEquals(1L, prefs.getUserID(2));
}
+ @Test
public void testItemID() {
GenericUserPreferenceArray prefs = new GenericUserPreferenceArray(3);
assertEquals(3, prefs.length());
@@ -41,17 +44,19 @@ public final class GenericUserPreference
assertEquals(3L, prefs.getItemID(2));
}
+ @Test
public void testSetValue() {
GenericUserPreferenceArray prefs = new GenericUserPreferenceArray(3);
assertEquals(3, prefs.length());
prefs.setValue(0, 1.0f);
prefs.setValue(1, 2.0f);
prefs.setValue(2, 3.0f);
- assertEquals(1.0f, prefs.getValue(0));
- assertEquals(2.0f, prefs.getValue(1));
- assertEquals(3.0f, prefs.getValue(2));
+ assertEquals(1.0f, prefs.getValue(0), EPSILON);
+ assertEquals(2.0f, prefs.getValue(1), EPSILON);
+ assertEquals(3.0f, prefs.getValue(2), EPSILON);
}
+ @Test
public void testHasPref() {
GenericUserPreferenceArray prefs = new GenericUserPreferenceArray(3);
prefs.set(0, new GenericPreference(1L, 3L, 5.0f));
@@ -61,6 +66,7 @@ public final class GenericUserPreference
assertFalse(prefs.hasPrefWithUserID(2L));
}
+ @Test
public void testSort() {
GenericUserPreferenceArray prefs = new GenericUserPreferenceArray(3);
prefs.set(0, new GenericPreference(1L, 3L, 5.0f));
@@ -72,6 +78,7 @@ public final class GenericUserPreference
assertEquals(3L, prefs.getItemID(2));
}
+ @Test
public void testSortValue() {
GenericUserPreferenceArray prefs = new GenericUserPreferenceArray(3);
prefs.set(0, new GenericPreference(1L, 3L, 5.0f));
@@ -87,6 +94,7 @@ public final class GenericUserPreference
assertEquals(2L, prefs.getItemID(2));
}
+ @Test
public void testClone() {
GenericUserPreferenceArray prefs = new GenericUserPreferenceArray(3);
prefs.set(0, new GenericPreference(1L, 3L, 5.0f));
@@ -95,7 +103,7 @@ public final class GenericUserPreference
prefs = prefs.clone();
assertEquals(3L, prefs.getItemID(0));
assertEquals(1L, prefs.getUserID(1));
- assertEquals(3.0f, prefs.getValue(2));
+ assertEquals(3.0f, prefs.getValue(2), EPSILON);
}
}
\ No newline at end of file
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/MemoryIDMigratorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/MemoryIDMigratorTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/MemoryIDMigratorTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/MemoryIDMigratorTest.java Fri Sep 3 12:28:34 2010
@@ -17,23 +17,26 @@
package org.apache.mahout.cf.taste.impl.model;
+import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.cf.taste.model.IDMigrator;
-import org.apache.mahout.common.MahoutTestCase;
import java.util.Collections;
import org.apache.mahout.cf.taste.model.UpdatableIDMigrator;
+import org.junit.Test;
-public final class MemoryIDMigratorTest extends MahoutTestCase {
+public final class MemoryIDMigratorTest extends TasteTestCase {
private static final String DUMMY_STRING = "Mahout";
private static final long DUMMY_ID = -6311185995763544451L;
+ @Test
public void testToLong() {
IDMigrator migrator = new MemoryIDMigrator();
long id = migrator.toLongID(DUMMY_STRING);
assertEquals(DUMMY_ID, id);
}
+ @Test
public void testStore() throws Exception {
UpdatableIDMigrator migrator = new MemoryIDMigrator();
long id = migrator.toLongID(DUMMY_STRING);
@@ -42,6 +45,7 @@ public final class MemoryIDMigratorTest
assertEquals(DUMMY_STRING, migrator.toStringID(id));
}
+ @Test
public void testInitialize() throws Exception {
UpdatableIDMigrator migrator = new MemoryIDMigrator();
long id = migrator.toLongID(DUMMY_STRING);