You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2013/03/26 14:24:46 UTC
svn commit: r1461119 [1/4] - in /mahout/trunk: ./
buildtools/src/main/resources/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/s...
Author: ssc
Date: Tue Mar 26 13:24:40 2013
New Revision: 1461119
URL: http://svn.apache.org/r1461119
Log:
MAHOUT-1173 Reactivate checkstyle
Removed:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DefaultAnalyzer.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/VectorMapper.java
Modified:
mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ALS.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/FactorizationEvaluator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/PredictionMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveExplicitFeedbackMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveImplicitFeedbackMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/TopSimilarItemsQueue.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/ResultSetIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/BiasedItemBasedRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/Factorization.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ImplicitLinearRegressionFactorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDPlusPlusFactorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/precompute/MultithreadedBatchItemSimilarities.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/NaiveBayesModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/StandardThetaTrainer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0DocInferenceMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0Mapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0PerplexityMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/ModelTrainer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/HashFactory.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessor.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/DefaultOptionCreator.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/StableFixedSizeSamplingIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/sequencefile/SequenceFileDirIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/sequencefile/SequenceFileDirValueIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/mapreduce/MergeVectorsCombiner.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/mapreduce/MergeVectorsReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/TransactionIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/MatrixUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/HdfsBackedLanczosState.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/SeedVectorUtil.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/VectorDistanceMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/VectorDistanceSimilarityJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/RowSimilarityJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/measures/CosineSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/measures/TanimotoCoefficientSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stats/BasicStats.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stats/StandardDeviationCalculatorMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtDenseOutJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BtJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/VJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/entropy/SpecificConditionalEntropyMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/entropy/SpecificConditionalEntropyReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/entropy/VarIntSumReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFiles.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/pruner/WordsPrunerReducer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToRecReducer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1RecommenderEvaluator.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/KDDCupFactorizablePreferences.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/ParallelArraysSGDFactorizer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/BatchItemSimilaritiesGroupLens.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/NewsgroupHelper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/BuildForest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/email/PrepEmailVectorsDriver.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/SimpleCsvExamples.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainAdaptiveLogistic.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayDirichlet.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMinHash.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/cassandra/CassandraDataModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/mongodb/MongoDBDataModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/classifier/ConfusionMatrixDumper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java
mahout/trunk/integration/src/main/java/org/apache/mahout/text/MailArchivesClusteringAnalyzer.java
mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/Bump125.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SplitInput.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SplitInputJob.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/CSVClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFType.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/AbstractLuceneIterator.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterator.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/TFDFMapper.java
mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMap.java.t
mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMap.java.t
mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMap.java.t
mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSet.java.t
mahout/trunk/math/src/main/java/org/apache/mahout/collections/Arithmetic.java
mahout/trunk/math/src/main/java/org/apache/mahout/collections/Constants.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/CholeskyDecomposition.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/DelegatingVector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/FileBasedMatrix.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/FileBasedSparseBinaryMatrix.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/MurmurHash3.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/OrderedIntDoubleMapping.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomTrinaryMatrix.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/SingularValueDecomposition.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/Sorting.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/Vector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/als/AlternatingLeastSquaresSolver.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianUpdater.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Functions.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/function/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/list/AbstractObjectList.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/list/SimpleLongArrayList.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/list/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/map/PrimeFinder.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/map/QuickOpenIntIntHashMap.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/map/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/random/ChineseRestaurant.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/random/Empirical.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/random/IndianBuffet.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/random/Multinomial.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/random/Normal.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/random/WeightedThing.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/set/AbstractSet.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/set/OpenHashSet.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/solver/ConjugateGradientSolver.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/solver/LSMR.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/LogLikelihood.java
mahout/trunk/math/src/test/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMapTest.java.t
mahout/trunk/math/src/test/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMapTest.java.t
mahout/trunk/math/src/test/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMapTest.java.t
mahout/trunk/math/src/test/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSetTest.java.t
mahout/trunk/math/src/test/java/org/apache/mahout/math/MurmurHash3Test.java
mahout/trunk/pom.xml
Modified: mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml (original)
+++ mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml Tue Mar 26 13:24:40 2013
@@ -1,282 +1,200 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
+<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<!--
- Checks to make sure the code meets the CXF coding guidelines which
- are similar to the Sun guidelines at:
- http://java.sun.com/docs/codeconv/index.html
-
- It also enforces aa bunch of other "BestPractices like method
- lengths, if/try depths, etc...
+ Checkstyle configuration derived from the sun coding conventions from:
+
+ - the Java Language Specification at
+ http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+ - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-->
<module name="Checker">
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <!-- <module name="NewlineAtEndOfFile"/> -->
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation" />
- <!--<module name="StrictDuplicateCode"/>-->
-
- <module name="TreeWalker">
- <!-- Enable FileContentsHolder to allow us to in turn turn on suppression comments -->
- <module name="FileContentsHolder" />
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <!-- <module name="PackageHtml"/> -->
- <!--module name="JavadocMethod"/-->
- <!--module name="JavadocType"/-->
- <!--module name="JavadocVariable"/-->
- <!--module name="JavadocStyle"/-->
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName">
- <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|log)$"/>
- </module>
- <module name="LocalFinalVariableName" />
- <module name="LocalVariableName" />
- <module name="MemberName" />
- <module name="MethodName" />
- <module name="PackageName" />
- <module name="ParameterName" />
- <!--module name="StaticVariableName" /-->
- <module name="TypeName" />
-
- <!-- Header checks -->
- <!--module name="Header">
- <property name="header"
- value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * "License"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
- </module-->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport" /> <!-- defaults to sun.* packages -->
- <module name="RedundantImport" />
- <module name="UnusedImports" />
- <!--module name="ImportOrder"/-->
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="AnonInnerLength">
- <property name="max" value="40" />
- </module>
- <module name="ExecutableStatementCount">
- <property name="max" value="75" />
- </module>
- <!--<module name="FileLength">
- <property name="max" value="3000" />
- </module>-->
- <module name="LineLength">
- <property name="max" value="120" />
- </module>
- <module name="MethodLength">
- <property name="max" value="150" />
- <property name="countEmpty" value="false" />
- </module>
- <module name="ParameterNumber">
- <property name="max" value="10" />
- </module>
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad" />
- <module name="EmptyForInitializerPad" />
- <module name="MethodParamPad" />
- <module name="NoWhitespaceAfter">
- <property name="tokens"
- value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS,COMMA" />
- </module>
- <module name="NoWhitespaceBefore" />
- <module name="OperatorWrap" />
- <module name="ParenPad" />
- <module name="TypecastParenPad" />
- <!--module name="TabCharacter" /-->
- <module name="WhitespaceAfter">
- <property name="tokens" value="SEMI" />
- </module>
- <module name="WhitespaceAround">
- <property name="tokens"
- value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND" />
- </module>
-
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
- <module name="ModifierOrder" />
- <module name="RedundantModifier" />
-
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks">
- <property name="allowInSwitchCase" value="true" />
- </module>
- <module name="EmptyBlock">
- <property name="option" value="text" />
- </module>
- <module name="LeftCurly" />
- <!-- <module name="NeedBraces" />-->
- <module name="RightCurly" />
-
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <!--<module name="ArrayTrailingComma"/>-->
- <!--<module name="AvoidInlineConditionals"/>-->
- <module name="CovariantEquals" />
- <module name="DoubleCheckedLocking" />
- <module name="EmptyStatement" />
- <module name="EqualsHashCode" />
- <!--<module name="FinalLocalVariable"/>-->
- <!--
- <module name="HiddenField">
- <property name="ignoreConstructorParameter" value="true" />
- <property name="ignoreSetter" value="true" />
- </module>
- -->
- <module name="IllegalInstantiation" />
- <!--<module name="IllegalToken"/>-->
- <!--<module name="IllegalTokenText"/>-->
- <!--<module name="InnerAssignment"/>-->
- <!--<module name="MagicNumber"/>-->
- <module name="MissingSwitchDefault" />
- <!--module name="ModifiedControlVariable"/-->
- <module name="SimplifyBooleanExpression" />
- <module name="SimplifyBooleanReturn" />
- <module name="StringLiteralEquality" />
- <module name="NestedIfDepth">
- <property name="max" value="3" />
- </module>
- <module name="NestedTryDepth">
- <property name="max" value="3" />
- </module>
- <!--module name="SuperClone" /-->
- <module name="SuperFinalize" />
- <!--<module name="IllegalCatch"/>-->
- <module name="IllegalThrows">
- <property name="illegalClassNames"
- value="java.lang.Error,java.lang.RuntimeException" />
- </module>
- <module name="RedundantThrows"/>
- <module name="PackageDeclaration" />
- <!--module name="JUnitTestCase" /-->
- <module name="ReturnCount">
- <property name="max" value="6" />
- </module>
-
- <module name="IllegalType">
- <property name="format" value="^xxx$" />
- <property name="illegalClassNames"
- value="java.util.GregorianCalendar, java.util.Hashtable, java.util.HashSet, java.util.HashMap, java.util.ArrayList, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap" />
- </module>
- <!--module name="DeclarationOrder" /-->
- <!--<module name="ParameterAssignment"/>-->
- <module name="ExplicitInitialization" />
- <module name="DefaultComesLast" />
- <!--<module name="MissingCtor"/>-->
- <module name="FallThrough" />
- <!--<module name="MultipleStringLiterals"/>-->
- <module name="MultipleVariableDeclarations" />
- <!--<module name="RequireThis"/>-->
- <module name="UnnecessaryParentheses" />
-
-
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <!--<module name="DesignForExtension"/>-->
- <module name="FinalClass" />
- <module name="HideUtilityClassConstructor" />
- <module name="InterfaceIsType" />
- <module name="MutableException"/>
- <module name="ThrowsCount">
- <property name="max" value="5" />
- </module>
- <module name="VisibilityModifier">
- <property name="protectedAllowed" value="true" />
- <property name="packageAllowed" value="true" />
- <!-- this is needed for the resource injection unit tests. It will removed
- when private member inject is supported.
- -->
- <property name="publicMemberPattern" value="resource[12].*" />
- </module>
-
-
-
- <!-- Metrics checks. -->
- <!-- See http://checkstyle.sf.net/config_metrics.html -->
- <module name="BooleanExpressionComplexity">
- <property name="max" value="6" />
- </module>
- <!--<module name="ClassDataAbstractionCoupling"/>-->
- <!--<module name="ClassFanOutComplexity"/>-->
- <!--<module name="CyclomaticComplexity"/>-->
- <!--<module name="NPathComplexity"/>-->
- <module name="JavaNCSS">
- <property name="methodMaximum" value="100" />
- </module>
+ <!--
+ If you set the basedir property below, then all reported file
+ names will be relative to the specified directory. See
+ http://checkstyle.sourceforge.net/5.x/config.html#Checker
+
+ <property name="basedir" value="${basedir}"/>
+ -->
+
+ <!-- Checks that a package-info.java file exists for each package. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+ <!--module name="JavadocPackage"/-->
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <module name="NewlineAtEndOfFile"/>
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <!--module name="FileLength"/-->
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="FileTabCharacter"/>
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <!--module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module-->
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <!-- <module name="Header"> -->
+ <!-- <property name="headerFile" value="${checkstyle.header.file}"/> -->
+ <!-- <property name="fileExtensions" value="java"/> -->
+ <!-- </module> -->
+
+ <module name="TreeWalker">
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <!--module name="JavadocMethod"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/>
+ <module name="JavadocStyle"/-->
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <!-- allow loggers to be named log to not draw to much attention to their invocations -->
+ <module name="ConstantName">
+ <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|log)$"/>
+ </module>
+ <!-- Allow variables to start with capital letters. A lot of algorithm implementations should replicate the
+ notation from the papers they implement to be comprehensible. Matrices e.g. are mostly named with capital
+ letters -->
+ <module name="LocalFinalVariableName">
+ <property name="format" value="^e[a-zA-Z0-9]|[A-Z]*[a-zA-Z0-9]*$"/>
+ </module>
+ <module name="LocalVariableName">
+ <property name="format" value="^e[a-zA-Z0-9]|[A-Z]*[a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MemberName">
+ <property name="format" value="^e[a-zA-Z0-9]|[A-Z]*[a-zA-Z0-9]*$"/>
+ </module>
+ <module name="ParameterName">
+ <property name="format" value="^e[a-zA-Z0-9]|[A-Z]*[a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <!-- we use 120 instead of 80 characters per line -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <module name="AnonInnerLength">
+ <property name="max" value="40" />
+ </module>
+ <!--module name="ExecutableStatementCount"-->
+ <!--module name="MethodLength"/-->
+ <!--module name="ParameterNumber"/-->
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="GenericWhitespace"/>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter">
+ <!-- allow whitespaces for array initialization -->
+ <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
+ </module>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <!--TODO currently broken because of generics <module name="WhitespaceAfter"/>-->
+ <module name="WhitespaceAround">
+ <!-- no need to waste space for empty constructors or methods -->
+ <property name="allowEmptyConstructors" value="true"/>
+ <property name="allowEmptyMethods" value="true"/>
+ </module>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <!--module name="AvoidNestedBlocks"/-->
+ <module name="EmptyBlock"/>
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <!--module name="AvoidInlineConditionals"/-->
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <!--module name="HiddenField"/-->
+ <module name="IllegalInstantiation"/>
+ <!--module name="InnerAssignment"/-->
+ <!--module name="MagicNumber"/-->
+ <module name="MissingSwitchDefault"/>
+ <!--module name="RedundantThrows"/-->
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <!--module name="NestedIfDepth"/-->
+ <module name="NestedTryDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="UnnecessaryParentheses"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!--module name="DesignForExtension"/-->
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true" />
+ <property name="packageAllowed" value="true" />
+ </module>
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
<module name="ArrayTypeStyle"/>
- <!--
- <module name="FinalParameters"/>
- -->
- <!--
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- -->
- <!--<module name="TodoComment">
- <property name="format" value="WARNING" />
- </module>-->
-
- <module name="UpperEll" />
-
- <!--Assert statement may have side effects:-->
- <module name="DescendantToken">
- <property name="tokens" value="LITERAL_ASSERT" />
- <property name="limitedTokens"
- value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN" />
- <property name="maximumNumber" value="0" />
- </module>
-
- <!--<module name="UncommentedMain"/>-->
- <!--module name="TrailingComment"/-->
- <module name="Indentation">
- <property name="caseIndent" value="2" />
- <property name="basicOffset" value="2" />
- </module>
- <!--<module name="RequiredRegexp">-->
- </module>
- <module name="SuppressionCommentFilter"/>
-</module>
+ <!--module name="FinalParameters"/-->
+ <!--module name="TodoComment"/-->
+ <module name="UpperEll"/>
+ <module name="Indentation">
+ <property name="caseIndent" value="2"/>
+ <property name="basicOffset" value="2"/>
+ </module>
+
+ </module>
+
+</module>
\ No newline at end of file
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ALS.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ALS.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ALS.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ALS.java Tue Mar 26 13:24:40 2013
@@ -48,8 +48,8 @@ final class ALS {
public static OpenIntObjectHashMap<Vector> readMatrixByRows(Path dir, Configuration conf) {
OpenIntObjectHashMap<Vector> matrix = new OpenIntObjectHashMap<Vector>();
- for (Pair<IntWritable,VectorWritable> pair :
- new SequenceFileDirIterable<IntWritable,VectorWritable>(dir, PathType.LIST, PathFilters.partFilter(), conf)) {
+ for (Pair<IntWritable,VectorWritable> pair
+ : new SequenceFileDirIterable<IntWritable,VectorWritable>(dir, PathType.LIST, PathFilters.partFilter(), conf)) {
int rowIndex = pair.getFirst().get();
Vector row = pair.getSecond().get().clone();
matrix.put(rowIndex, row);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/FactorizationEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/FactorizationEvaluator.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/FactorizationEvaluator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/FactorizationEvaluator.java Tue Mar 26 13:24:40 2013
@@ -110,8 +110,8 @@ public class FactorizationEvaluator exte
double computeRmse(Path errors) {
RunningAverage average = new FullRunningAverage();
- for (Pair<DoubleWritable,NullWritable> entry :
- new SequenceFileDirIterable<DoubleWritable, NullWritable>(errors, PathType.LIST, PathFilters.logsCRCFilter(),
+ for (Pair<DoubleWritable,NullWritable> entry
+ : new SequenceFileDirIterable<DoubleWritable, NullWritable>(errors, PathType.LIST, PathFilters.logsCRCFilter(),
getConf())) {
DoubleWritable error = entry.getFirst();
average.addDatum(error.get() * error.get());
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java Tue Mar 26 13:24:40 2013
@@ -232,7 +232,7 @@ public class ParallelALSFactorizationJob
}
private void runSolver(Path ratings, Path output, Path pathToUorI, int currentIteration, String matrixName)
- throws ClassNotFoundException, IOException, InterruptedException {
+ throws ClassNotFoundException, IOException, InterruptedException {
int iterationNumber = currentIteration + 1;
Class<? extends Mapper<IntWritable,VectorWritable,IntWritable,VectorWritable>> solverMapperClassInternal;
@@ -240,12 +240,12 @@ public class ParallelALSFactorizationJob
if (implicitFeedback) {
solverMapperClassInternal = SolveImplicitFeedbackMapper.class;
- name = "Recompute " + matrixName + ", iteration (" + iterationNumber + "/" + numIterations + "), " +
- "(" + numThreadsPerSolver + " threads, implicit feedback)";
+ name = "Recompute " + matrixName + ", iteration (" + iterationNumber + "/" + numIterations + "), "
+ + "(" + numThreadsPerSolver + " threads, implicit feedback)";
} else {
solverMapperClassInternal = SolveExplicitFeedbackMapper.class;
- name = "Recompute " + matrixName + ", iteration (" + iterationNumber + "/" + numIterations + "), " +
- "(" + numThreadsPerSolver + " threads, explicit feedback)";
+ name = "Recompute " + matrixName + ", iteration (" + iterationNumber + "/" + numIterations + "), "
+ + "(" + numThreadsPerSolver + " threads, explicit feedback)";
}
Job solverForUorI = prepareJob(ratings, output, SequenceFileInputFormat.class, MultithreadedSharingMapper.class,
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/PredictionMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/PredictionMapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/PredictionMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/PredictionMapper.java Tue Mar 26 13:24:40 2013
@@ -66,7 +66,7 @@ public class PredictionMapper extends Sh
@Override
protected void map(IntWritable userIDWritable, VectorWritable ratingsWritable, Context ctx)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
Pair<OpenIntObjectHashMap<Vector>, OpenIntObjectHashMap<Vector>> uAndM = getSharedInstance();
OpenIntObjectHashMap<Vector> U = uAndM.getFirst();
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveExplicitFeedbackMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveExplicitFeedbackMapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveExplicitFeedbackMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveExplicitFeedbackMapper.java Tue Mar 26 13:24:40 2013
@@ -51,7 +51,7 @@ public class SolveExplicitFeedbackMapper
@Override
protected void map(IntWritable userOrItemID, VectorWritable ratingsWritable, Context ctx)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
OpenIntObjectHashMap<Vector> uOrM = getSharedInstance();
uiOrmj.set(ALS.solveExplicit(ratingsWritable, uOrM, lambda, numFeatures));
ctx.write(userOrItemID, uiOrmj);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveImplicitFeedbackMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveImplicitFeedbackMapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveImplicitFeedbackMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/SolveImplicitFeedbackMapper.java Tue Mar 26 13:24:40 2013
@@ -50,7 +50,7 @@ public class SolveImplicitFeedbackMapper
@Override
protected void map(IntWritable userOrItemID, VectorWritable ratingsWritable, Context ctx)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
ImplicitFeedbackAlternatingLeastSquaresSolver solver = getSharedInstance();
uiOrmj.set(solver.solve(ratingsWritable.get()));
ctx.write(userOrItemID, uiOrmj);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java Tue Mar 26 13:24:40 2013
@@ -117,8 +117,8 @@ public final class RecommenderJob extend
addOption("maxSimilaritiesPerItem", "m", "Maximum number of similarities considered per item ",
String.valueOf(DEFAULT_MAX_SIMILARITIES_PER_ITEM));
addOption("maxPrefsPerUserInItemSimilarity", "mppuiis", "max number of preferences to consider per user in the "
- + "item similarity computation phase, users with more preferences will be sampled down (default: " +
- DEFAULT_MAX_PREFS_PER_USER + ')', String.valueOf(DEFAULT_MAX_PREFS_PER_USER));
+ + "item similarity computation phase, users with more preferences will be sampled down (default: "
+ + DEFAULT_MAX_PREFS_PER_USER + ')', String.valueOf(DEFAULT_MAX_PREFS_PER_USER));
addOption("similarityClassname", "s", "Name of distributed similarity measures class to instantiate, "
+ "alternatively use one of the predefined similarities (" + VectorSimilarityMeasures.list() + ')', true);
addOption("threshold", "tr", "discard item pairs with a similarity value below this", false);
@@ -141,8 +141,8 @@ public final class RecommenderJob extend
int maxPrefsPerUserInItemSimilarity = Integer.parseInt(getOption("maxPrefsPerUserInItemSimilarity"));
int maxSimilaritiesPerItem = Integer.parseInt(getOption("maxSimilaritiesPerItem"));
String similarityClassname = getOption("similarityClassname");
- double threshold = hasOption("threshold") ?
- Double.parseDouble(getOption("threshold")) : RowSimilarityJob.NO_THRESHOLD;
+ double threshold = hasOption("threshold")
+ ? Double.parseDouble(getOption("threshold")) : RowSimilarityJob.NO_THRESHOLD;
Path prepPath = getTempPath("preparePreferenceMatrix");
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java Tue Mar 26 13:24:40 2013
@@ -123,8 +123,8 @@ public final class ItemSimilarityJob ext
int minPrefsPerUser = Integer.parseInt(getOption("minPrefsPerUser"));
boolean booleanData = Boolean.valueOf(getOption("booleanData"));
- double threshold = hasOption("threshold") ?
- Double.parseDouble(getOption("threshold")) : RowSimilarityJob.NO_THRESHOLD;
+ double threshold = hasOption("threshold")
+ ? Double.parseDouble(getOption("threshold")) : RowSimilarityJob.NO_THRESHOLD;
Path similarityMatrixPath = getTempPath("similarityMatrix");
Path prepPath = getTempPath("prepareRatingMatrix");
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/TopSimilarItemsQueue.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/TopSimilarItemsQueue.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/TopSimilarItemsQueue.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/TopSimilarItemsQueue.java Tue Mar 26 13:24:40 2013
@@ -30,31 +30,31 @@ public class TopSimilarItemsQueue extend
private final int maxSize;
- public TopSimilarItemsQueue(int maxSize) {
- super(maxSize);
- this.maxSize = maxSize;
- }
+ public TopSimilarItemsQueue(int maxSize) {
+ super(maxSize);
+ this.maxSize = maxSize;
+ }
- public List<SimilarItem> getTopItems() {
- List<SimilarItem> items = Lists.newArrayListWithCapacity(maxSize);
- while (size() > 0) {
- SimilarItem topItem = pop();
- // filter out "sentinel" objects necessary for maintaining an efficient priority queue
- if (topItem.getItemID() != SENTINEL_ID) {
- items.add(topItem);
- }
+ public List<SimilarItem> getTopItems() {
+ List<SimilarItem> items = Lists.newArrayListWithCapacity(maxSize);
+ while (size() > 0) {
+ SimilarItem topItem = pop();
+ // filter out "sentinel" objects necessary for maintaining an efficient priority queue
+ if (topItem.getItemID() != SENTINEL_ID) {
+ items.add(topItem);
}
- Collections.reverse(items);
- return items;
}
+ Collections.reverse(items);
+ return items;
+ }
- @Override
- protected boolean lessThan(SimilarItem one, SimilarItem two) {
- return one.getSimilarity() < two.getSimilarity();
- }
+ @Override
+ protected boolean lessThan(SimilarItem one, SimilarItem two) {
+ return one.getSimilarity() < two.getSimilarity();
+ }
- @Override
- protected SimilarItem getSentinelObject() {
- return new SimilarItem(SENTINEL_ID, Double.MIN_VALUE);
- }
+ @Override
+ protected SimilarItem getSentinelObject() {
+ return new SimilarItem(SENTINEL_ID, Double.MIN_VALUE);
+ }
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/ResultSetIterator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/ResultSetIterator.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/ResultSetIterator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/ResultSetIterator.java Tue Mar 26 13:24:40 2013
@@ -34,16 +34,16 @@ public abstract class ResultSetIterator<
protected ResultSetIterator(DataSource dataSource, String sqlQuery) throws SQLException {
this.rowDelegate = new EachRowIterator(dataSource, sqlQuery);
delegate = Iterators.transform(rowDelegate,
- new Function<ResultSet, T>() {
- @Override
- public T apply(ResultSet from) {
- try {
- return parseElement(from);
- } catch (SQLException sqle) {
- throw new IllegalStateException(sqle);
- }
- }
- });
+ new Function<ResultSet, T>() {
+ @Override
+ public T apply(ResultSet from) {
+ try {
+ return parseElement(from);
+ } catch (SQLException sqle) {
+ throw new IllegalStateException(sqle);
+ }
+ }
+ });
}
@Override
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java Tue Mar 26 13:24:40 2013
@@ -177,12 +177,12 @@ public final class BooleanItemPreference
@Override
public Iterator<Preference> iterator() {
return Iterators.transform(new CountingIterator(length()),
- new Function<Integer, Preference>() {
- @Override
- public Preference apply(Integer from) {
- return new PreferenceView(from);
- }
- });
+ new Function<Integer, Preference>() {
+ @Override
+ public Preference apply(Integer from) {
+ return new PreferenceView(from);
+ }
+ });
}
@Override
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java Tue Mar 26 13:24:40 2013
@@ -177,12 +177,12 @@ public final class BooleanUserPreference
@Override
public Iterator<Preference> iterator() {
return Iterators.transform(new CountingIterator(length()),
- new Function<Integer, Preference>() {
- @Override
- public Preference apply(Integer from) {
- return new PreferenceView(from);
- }
- });
+ new Function<Integer, Preference>() {
+ @Override
+ public Preference apply(Integer from) {
+ return new PreferenceView(from);
+ }
+ });
}
@Override
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java Tue Mar 26 13:24:40 2013
@@ -239,12 +239,12 @@ public final class GenericItemPreference
@Override
public Iterator<Preference> iterator() {
return Iterators.transform(new CountingIterator(length()),
- new Function<Integer, Preference>() {
- @Override
- public Preference apply(Integer from) {
- return new PreferenceView(from);
- }
- });
+ new Function<Integer, Preference>() {
+ @Override
+ public Preference apply(Integer from) {
+ return new PreferenceView(from);
+ }
+ });
}
@Override
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java Tue Mar 26 13:24:40 2013
@@ -245,12 +245,12 @@ public final class GenericUserPreference
@Override
public Iterator<Preference> iterator() {
return Iterators.transform(new CountingIterator(length()),
- new Function<Integer, Preference>() {
- @Override
- public Preference apply(Integer from) {
- return new PreferenceView(from);
- }
- });
+ new Function<Integer, Preference>() {
+ @Override
+ public Preference apply(Integer from) {
+ return new PreferenceView(from);
+ }
+ });
}
@Override
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/BiasedItemBasedRecommender.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/BiasedItemBasedRecommender.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/BiasedItemBasedRecommender.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/BiasedItemBasedRecommender.java Tue Mar 26 13:24:40 2013
@@ -133,7 +133,7 @@ public class BiasedItemBasedRecommender
@Override
protected float doEstimatePreference(long userID, PreferenceArray preferencesFromUser, long itemID)
- throws TasteException {
+ throws TasteException {
long[] userIDs = preferencesFromUser.getIDs();
float[] ratings = new float[userIDs.length];
long[] itemIDs = new long[userIDs.length];
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java Tue Mar 26 13:24:40 2013
@@ -180,8 +180,8 @@ public class ALSWRFactorizer extends Abs
LongPrimitiveIterator userIDsIterator = dataModel.getUserIDs();
try {
- final ImplicitFeedbackAlternatingLeastSquaresSolver implicitFeedbackSolver = usesImplicitFeedback ?
- new ImplicitFeedbackAlternatingLeastSquaresSolver(numFeatures, lambda, alpha, itemY) : null;
+ final ImplicitFeedbackAlternatingLeastSquaresSolver implicitFeedbackSolver = usesImplicitFeedback
+ ? new ImplicitFeedbackAlternatingLeastSquaresSolver(numFeatures, lambda, alpha, itemY) : null;
while (userIDsIterator.hasNext()) {
final long userID = userIDsIterator.nextLong();
@@ -196,9 +196,9 @@ public class ALSWRFactorizer extends Abs
featureVectors.add(features.getItemFeatureColumn(itemIndex(itemID)));
}
- Vector userFeatures = usesImplicitFeedback ?
- implicitFeedbackSolver.solve(sparseUserRatingVector(userPrefs)) :
- AlternatingLeastSquaresSolver.solve(featureVectors, ratingVector(userPrefs), lambda, numFeatures);
+ Vector userFeatures = usesImplicitFeedback
+ ? implicitFeedbackSolver.solve(sparseUserRatingVector(userPrefs))
+ : AlternatingLeastSquaresSolver.solve(featureVectors, ratingVector(userPrefs), lambda, numFeatures);
features.setFeatureColumnInU(userIndex(userID), userFeatures);
}
@@ -218,8 +218,8 @@ public class ALSWRFactorizer extends Abs
LongPrimitiveIterator itemIDsIterator = dataModel.getItemIDs();
try {
- final ImplicitFeedbackAlternatingLeastSquaresSolver implicitFeedbackSolver = usesImplicitFeedback ?
- new ImplicitFeedbackAlternatingLeastSquaresSolver(numFeatures, lambda, alpha, userY) : null;
+ final ImplicitFeedbackAlternatingLeastSquaresSolver implicitFeedbackSolver = usesImplicitFeedback
+ ? new ImplicitFeedbackAlternatingLeastSquaresSolver(numFeatures, lambda, alpha, userY) : null;
while (itemIDsIterator.hasNext()) {
final long itemID = itemIDsIterator.nextLong();
@@ -233,9 +233,9 @@ public class ALSWRFactorizer extends Abs
featureVectors.add(features.getUserFeatureColumn(userIndex(userID)));
}
- Vector itemFeatures = usesImplicitFeedback ?
- implicitFeedbackSolver.solve(sparseItemRatingVector(itemPrefs)) :
- AlternatingLeastSquaresSolver.solve(featureVectors, ratingVector(itemPrefs), lambda, numFeatures);
+ Vector itemFeatures = usesImplicitFeedback
+ ? implicitFeedbackSolver.solve(sparseItemRatingVector(itemPrefs))
+ : AlternatingLeastSquaresSolver.solve(featureVectors, ratingVector(itemPrefs), lambda, numFeatures);
features.setFeatureColumnInM(itemIndex(itemID), itemFeatures);
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/Factorization.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/Factorization.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/Factorization.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/Factorization.java Tue Mar 26 13:24:40 2013
@@ -112,8 +112,8 @@ public class Factorization {
public boolean equals(Object o) {
if (o instanceof Factorization) {
Factorization other = (Factorization) o;
- return userIDMapping.equals(other.userIDMapping) && itemIDMapping.equals(other.itemIDMapping) &&
- Arrays.deepEquals(userFeatures, other.userFeatures) && Arrays.deepEquals(itemFeatures, other.itemFeatures);
+ return userIDMapping.equals(other.userIDMapping) && itemIDMapping.equals(other.itemIDMapping)
+ && Arrays.deepEquals(userFeatures, other.userFeatures) && Arrays.deepEquals(itemFeatures, other.itemFeatures);
}
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ImplicitLinearRegressionFactorizer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ImplicitLinearRegressionFactorizer.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ImplicitLinearRegressionFactorizer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ImplicitLinearRegressionFactorizer.java Tue Mar 26 13:24:40 2013
@@ -328,7 +328,7 @@ public final class ImplicitLinearRegress
}
@Override
- public Void call() throws Exception {
+ public Void call() throws Exception {
Matrix XTCX;
if (recomputeUserFeatures) {
Matrix I = identityV(dataModel.getNumItems());
@@ -372,7 +372,7 @@ public final class ImplicitLinearRegress
}
@Override
- public Void call() throws Exception {
+ public Void call() throws Exception {
long start = System.currentTimeMillis();
delegate.call();
long end = System.currentTimeMillis();
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDPlusPlusFactorizer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDPlusPlusFactorizer.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDPlusPlusFactorizer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDPlusPlusFactorizer.java Tue Mar 26 13:24:40 2013
@@ -128,9 +128,9 @@ public final class SVDPlusPlusFactorizer
double[] pPlusY = new double[numFeatures];
for (int i2 : itemsByUser.get(userIndex)) {
- for (int f = FEATURE_OFFSET; f < numFeatures; f++) {
- pPlusY[f] += y[i2][f];
- }
+ for (int f = FEATURE_OFFSET; f < numFeatures; f++) {
+ pPlusY[f] += y[i2][f];
+ }
}
double denominator = Math.sqrt(itemsByUser.get(userIndex).size());
for (int feature = 0; feature < pPlusY.length; feature++) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/precompute/MultithreadedBatchItemSimilarities.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/precompute/MultithreadedBatchItemSimilarities.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/precompute/MultithreadedBatchItemSimilarities.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/precompute/MultithreadedBatchItemSimilarities.java Tue Mar 26 13:24:40 2013
@@ -73,7 +73,7 @@ public class MultithreadedBatchItemSimil
@Override
public int computeItemSimilarities(int degreeOfParallelism, int maxDurationInHours, SimilarItemsWriter writer)
- throws IOException {
+ throws IOException {
ExecutorService executorService = Executors.newFixedThreadPool(degreeOfParallelism + 1);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java Tue Mar 26 13:24:40 2013
@@ -97,7 +97,7 @@ public final class BayesUtils {
/** Write the list of labels into a map file */
public static int writeLabelIndex(Configuration conf, Iterable<String> labels, Path indexPath)
- throws IOException {
+ throws IOException {
FileSystem fs = FileSystem.get(indexPath.toUri(), conf);
SequenceFile.Writer writer = new SequenceFile.Writer(fs, conf, indexPath, Text.class, IntWritable.class);
int i = 0;
@@ -141,8 +141,8 @@ public final class BayesUtils {
public static OpenObjectIntHashMap<String> readIndexFromCache(Configuration conf) throws IOException {
OpenObjectIntHashMap<String> index = new OpenObjectIntHashMap<String>();
- for (Pair<Writable,IntWritable> entry :
- new SequenceFileIterable<Writable,IntWritable>(HadoopUtil.cachedFile(conf), conf)) {
+ for (Pair<Writable,IntWritable> entry
+ : new SequenceFileIterable<Writable,IntWritable>(HadoopUtil.cachedFile(conf), conf)) {
index.put(entry.getFirst().toString(), entry.getSecond().get());
}
return index;
@@ -150,9 +150,9 @@ public final class BayesUtils {
public static Map<String,Vector> readScoresFromCache(Configuration conf) throws IOException {
Map<String,Vector> sumVectors = Maps.newHashMap();
- for (Pair<Text,VectorWritable> entry :
- new SequenceFileDirIterable<Text,VectorWritable>(HadoopUtil.cachedFile(conf),
- PathType.LIST, PathFilters.partFilter(), conf)) {
+ for (Pair<Text,VectorWritable> entry
+ : new SequenceFileDirIterable<Text,VectorWritable>(HadoopUtil.cachedFile(conf),
+ PathType.LIST, PathFilters.partFilter(), conf)) {
sumVectors.put(entry.getFirst().toString(), entry.getSecond().get());
}
return sumVectors;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/NaiveBayesModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/NaiveBayesModel.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/NaiveBayesModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/NaiveBayesModel.java Tue Mar 26 13:24:40 2013
@@ -112,7 +112,7 @@ public class NaiveBayesModel {
weightsPerLabel = new DenseVector(VectorWritable.readVector(in));
perLabelThetaNormalizer = new DenseVector(VectorWritable.readVector(in));
- weightsPerLabelAndFeature = new SparseRowMatrix(weightsPerLabel.size(), weightsPerFeature.size() );
+ weightsPerLabelAndFeature = new SparseRowMatrix(weightsPerLabel.size(), weightsPerFeature.size());
for (int label = 0; label < weightsPerLabelAndFeature.numRows(); label++) {
weightsPerLabelAndFeature.assignRow(label, VectorWritable.readVector(in));
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/StandardThetaTrainer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/StandardThetaTrainer.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/StandardThetaTrainer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/StandardThetaTrainer.java Tue Mar 26 13:24:40 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
- package org.apache.mahout.classifier.naivebayes.training;
+package org.apache.mahout.classifier.naivebayes.training;
import java.util.Iterator;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java Tue Mar 26 13:24:40 2013
@@ -420,7 +420,8 @@ public class AdaptiveLogisticRegression
public static void freeze(State<Wrapper, CrossFoldLearner> s) {
// radically decrease learning rate
- s.getParams()[1] -= 10;
+ double[] params = s.getParams();
+ params[1] -= 10;
// and cause evolution to hold (almost)
s.setOmni(s.getOmni() / 20);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java Tue Mar 26 13:24:40 2013
@@ -114,7 +114,7 @@ public class CanopyDriver extends Abstra
clusterClassificationThreshold = Double.parseDouble(getOption(DefaultOptionCreator.OUTLIER_THRESHOLD));
}
run(conf, input, output, measure, t1, t2, t3, t4, clusterFilter,
- runClustering, clusterClassificationThreshold, runSequential );
+ runClustering, clusterClassificationThreshold, runSequential);
return 0;
}
@@ -150,7 +150,7 @@ public class CanopyDriver extends Abstra
public static void run(Configuration conf, Path input, Path output,
DistanceMeasure measure, double t1, double t2, double t3, double t4,
int clusterFilter, boolean runClustering, double clusterClassificationThreshold, boolean runSequential)
- throws IOException, InterruptedException, ClassNotFoundException {
+ throws IOException, InterruptedException, ClassNotFoundException {
Path clustersOut = buildClusters(conf, input, output, measure, t1, t2, t3,
t4, clusterFilter, runSequential);
if (runClustering) {
@@ -191,7 +191,7 @@ public class CanopyDriver extends Abstra
*/
public static void run(Path input, Path output, DistanceMeasure measure,
double t1, double t2, boolean runClustering, double clusterClassificationThreshold, boolean runSequential)
- throws IOException, InterruptedException, ClassNotFoundException {
+ throws IOException, InterruptedException, ClassNotFoundException {
run(new Configuration(), input, output, measure, t1, t2, runClustering,
clusterClassificationThreshold, runSequential);
}
@@ -268,7 +268,7 @@ public class CanopyDriver extends Abstra
*/
private static Path buildClustersSeq(Path input, Path output,
DistanceMeasure measure, double t1, double t2, int clusterFilter)
- throws IOException {
+ throws IOException {
CanopyClusterer clusterer = new CanopyClusterer(measure, t1, t2);
Collection<Canopy> canopies = Lists.newArrayList();
Configuration conf = new Configuration();
@@ -368,7 +368,7 @@ public class CanopyDriver extends Abstra
Path output,
double clusterClassificationThreshold,
boolean runSequential)
- throws IOException, InterruptedException, ClassNotFoundException {
+ throws IOException, InterruptedException, ClassNotFoundException {
ClusterClassifier.writePolicy(new CanopyClusteringPolicy(), canopies);
ClusterClassificationDriver.run(points,
output,
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java Tue Mar 26 13:24:40 2013
@@ -50,7 +50,7 @@ public class CanopyReducer extends Reduc
ClusterWritable clusterWritable = new ClusterWritable();
canopy.computeParameters();
if (canopy.getNumObservations() > clusterFilter) {
- clusterWritable.setValue(canopy);
+ clusterWritable.setValue(canopy);
context.write(new Text(canopy.getIdentifier()), clusterWritable);
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java Tue Mar 26 13:24:40 2013
@@ -78,7 +78,7 @@ public class ClusterClassificationMapper
*/
@Override
protected void map(WritableComparable<?> key, VectorWritable vw, Context context)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
if (!clusterModels.isEmpty()) {
Vector pdfPerCluster = clusterClassifier.classify(vw.get());
if (shouldClassify(pdfPerCluster)) {
@@ -105,7 +105,7 @@ public class ClusterClassificationMapper
}
private void write(VectorWritable vw, Context context, int clusterIndex, double weight)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
Cluster cluster = clusterModels.get(clusterIndex);
clusterId.set(cluster.getId());
context.write(clusterId, new WeightedVectorWritable(weight, vw.get()));
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java Tue Mar 26 13:24:40 2013
@@ -178,7 +178,7 @@ public class KMeansDriver extends Abstra
*/
public static void run(Path input, Path clustersIn, Path output, DistanceMeasure measure, double convergenceDelta,
int maxIterations, boolean runClustering, double clusterClassificationThreshold, boolean runSequential)
- throws IOException, InterruptedException, ClassNotFoundException {
+ throws IOException, InterruptedException, ClassNotFoundException {
run(new Configuration(), input, clustersIn, output, measure, convergenceDelta, maxIterations, runClustering,
clusterClassificationThreshold, runSequential);
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0DocInferenceMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0DocInferenceMapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0DocInferenceMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0DocInferenceMapper.java Tue Mar 26 13:24:40 2013
@@ -29,7 +29,7 @@ public class CVB0DocInferenceMapper exte
@Override
public void map(IntWritable docId, VectorWritable doc, Context context)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
int numTopics = getNumTopics();
Vector docTopics = new DenseVector(new double[numTopics]).assign(1.0 / numTopics);
Matrix docModel = new SparseRowMatrix(numTopics, doc.get().size());
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0Mapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0Mapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0Mapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0Mapper.java Tue Mar 26 13:24:40 2013
@@ -110,7 +110,7 @@ public class CachingCVB0Mapper
@Override
public void map(IntWritable docId, VectorWritable document, Context context)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
/* where to get docTopics? */
Vector topicVector = new DenseVector(new double[numTopics]).assign(1.0 / numTopics);
modelTrainer.train(document.get(), topicVector, true, maxIters);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0PerplexityMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0PerplexityMapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0PerplexityMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0PerplexityMapper.java Tue Mar 26 13:24:40 2013
@@ -95,7 +95,7 @@ public class CachingCVB0PerplexityMapper
@Override
public void map(IntWritable docId, VectorWritable document, Context context)
- throws IOException, InterruptedException {
+ throws IOException, InterruptedException {
if (testFraction < 1.0f && random.nextFloat() >= testFraction) {
return;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/ModelTrainer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/ModelTrainer.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/ModelTrainer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/ModelTrainer.java Tue Mar 26 13:24:40 2013
@@ -206,9 +206,9 @@ public class ModelTrainer {
public void train(Vector document, Vector docTopicCounts, boolean update, int numDocTopicIters) {
while (true) {
try {
- workQueue.put(new TrainerRunnable(readModel,
- update ? writeModel : null, document, docTopicCounts, new SparseRowMatrix(
- numTopics, numTerms, true), numDocTopicIters));
+ workQueue.put(new TrainerRunnable(readModel, update
+ ? writeModel
+ : null, document, docTopicCounts, new SparseRowMatrix(numTopics, numTerms, true), numDocTopicIters));
return;
} catch (InterruptedException e) {
log.warn("Interrupted waiting to submit document to work queue: {}", document, e);
@@ -218,15 +218,14 @@ public class ModelTrainer {
public void trainSync(Vector document, Vector docTopicCounts, boolean update,
int numDocTopicIters) {
- new TrainerRunnable(readModel,
- update ? writeModel : null, document, docTopicCounts, new SparseRowMatrix(
- numTopics, numTerms, true), numDocTopicIters).run();
+ new TrainerRunnable(readModel, update
+ ? writeModel
+ : null, document, docTopicCounts, new SparseRowMatrix(numTopics, numTerms, true), numDocTopicIters).run();
}
public double calculatePerplexity(Vector document, Vector docTopicCounts, int numDocTopicIters) {
- TrainerRunnable runner = new TrainerRunnable(readModel,
- null, document, docTopicCounts, new SparseRowMatrix(
- numTopics, numTerms, true), numDocTopicIters);
+ TrainerRunnable runner = new TrainerRunnable(readModel, null, document, docTopicCounts,
+ new SparseRowMatrix(numTopics, numTerms, true), numDocTopicIters);
return runner.call();
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModel.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModel.java Tue Mar 26 13:24:40 2013
@@ -192,13 +192,13 @@ public class TopicModel implements Confi
}
public static Pair<Matrix, Vector> loadModel(Configuration conf, Path... modelPaths)
- throws IOException {
+ throws IOException {
int numTopics = -1;
int numTerms = -1;
List<Pair<Integer, Vector>> rows = Lists.newArrayList();
for (Path modelPath : modelPaths) {
- for (Pair<IntWritable, VectorWritable> row :
- new SequenceFileIterable<IntWritable, VectorWritable>(modelPath, true, conf)) {
+ for (Pair<IntWritable, VectorWritable> row
+ : new SequenceFileIterable<IntWritable, VectorWritable>(modelPath, true, conf)) {
rows.add(Pair.of(row.getFirst().get(), row.getSecond().get()));
numTopics = Math.max(numTopics, row.getFirst().get());
if (numTerms < 0) {
@@ -357,8 +357,8 @@ public class TopicModel implements Confi
int termIndex = e.index();
// calc un-normalized p(topic x | term a, document i)
- double termTopicLikelihood = (topicTermRow.get(termIndex) + eta) * (topicWeight + alpha) /
- (topicSum + eta * numTerms);
+ double termTopicLikelihood = (topicTermRow.get(termIndex) + eta) * (topicWeight + alpha)
+ / (topicSum + eta * numTerms);
termTopicRow.set(termIndex, termTopicLikelihood);
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java?rev=1461119&r1=1461118&r2=1461119&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java Tue Mar 26 13:24:40 2013
@@ -42,7 +42,7 @@ public class MeanShiftCanopyClusterMappe
protected void map(WritableComparable<?> key, ClusterWritable clusterWritable, Context context)
throws IOException, InterruptedException {
// canopies use canopyIds assigned when input vectors are processed as vectorIds too
- MeanShiftCanopy canopy = (MeanShiftCanopy)clusterWritable.getValue();
+ MeanShiftCanopy canopy = (MeanShiftCanopy)clusterWritable.getValue();
int vectorId = canopy.getId();
for (MeanShiftCanopy msc : canopies) {
for (int containedId : msc.getBoundPoints().toList()) {