Merge branch 'SAMOA-6'
Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/c77d80b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/c77d80b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/c77d80b5 Branch: refs/heads/master Commit: c77d80b5b154709053dd6c85847543c101fb0ab0 Parents: 787864b 3ea7990 Author: Matthieu Morel <[email protected]> Authored: Wed Feb 4 14:48:58 2015 +0100 Committer: Matthieu Morel <[email protected]> Committed: Wed Feb 4 14:48:58 2015 +0100 ---------------------------------------------------------------------- eclipse-format.xml | 358 ++++ pom.xml | 32 +- samoa-api/pom.xml | 225 ++- .../com/yahoo/labs/samoa/core/ContentEvent.java | 33 +- .../com/yahoo/labs/samoa/core/DoubleVector.java | 148 +- .../labs/samoa/core/EntranceProcessor.java | 57 +- .../java/com/yahoo/labs/samoa/core/Globals.java | 44 +- .../com/yahoo/labs/samoa/core/Processor.java | 56 +- .../labs/samoa/core/SerializableInstance.java | 53 +- ...BasicClassificationPerformanceEvaluator.java | 198 +- .../BasicRegressionPerformanceEvaluator.java | 182 +- .../ClusteringEvaluationContentEvent.java | 83 +- .../ClusteringEvaluatorProcessor.java | 438 ++--- .../ClusteringResultContentEvent.java | 66 +- .../samoa/evaluation/EvaluatorProcessor.java | 373 ++-- .../samoa/evaluation/PerformanceEvaluator.java | 47 +- ...indowClassificationPerformanceEvaluator.java | 294 ++- .../labs/samoa/evaluation/measures/CMM.java | 861 ++++----- .../evaluation/measures/CMM_GTAnalysis.java | 1441 +++++++-------- .../evaluation/measures/EntropyCollection.java | 257 +-- .../labs/samoa/evaluation/measures/F1.java | 147 +- .../labs/samoa/evaluation/measures/General.java | 295 +-- .../labs/samoa/evaluation/measures/SSQ.java | 109 +- .../samoa/evaluation/measures/Separation.java | 156 +- .../measures/SilhouetteCoefficient.java | 191 +- .../measures/StatisticalCollection.java | 281 +-- .../samoa/examples/HelloWorldContentEvent.java | 66 +- .../HelloWorldDestinationProcessor.java | 30 +- .../examples/HelloWorldSourceProcessor.java | 70 +- .../labs/samoa/examples/HelloWorldTask.java | 112 +- .../labs/samoa/learners/AdaptiveLearner.java | 35 +- .../samoa/learners/InstanceContentEvent.java | 337 ++-- .../samoa/learners/InstancesContentEvent.java | 304 ++-- .../com/yahoo/labs/samoa/learners/Learner.java | 55 +- .../labs/samoa/learners/ResultContentEvent.java | 347 ++-- .../learners/classifiers/LocalLearner.java | 78 +- .../classifiers/LocalLearnerProcessor.java | 345 ++-- .../samoa/learners/classifiers/NaiveBayes.java | 426 +++-- .../classifiers/SimpleClassifierAdapter.java | 202 +-- .../learners/classifiers/SingleClassifier.java | 127 +- .../classifiers/ensemble/AdaptiveBagging.java | 184 +- .../learners/classifiers/ensemble/Bagging.java | 188 +- .../ensemble/BaggingDistributorProcessor.java | 324 ++-- .../learners/classifiers/ensemble/Boosting.java | 199 +- .../ensemble/BoostingDistributorProcessor.java | 15 +- .../BoostingPredictionCombinerProcessor.java | 252 +-- .../ensemble/PredictionCombinerProcessor.java | 273 +-- .../classifiers/rules/AMRulesRegressor.java | 251 ++- .../rules/HorizontalAMRulesRegressor.java | 376 ++-- .../rules/VerticalAMRulesRegressor.java | 301 ++-- .../centralized/AMRulesRegressorProcessor.java | 926 +++++----- .../classifiers/rules/common/ActiveRule.java | 382 ++-- .../classifiers/rules/common/LearningRule.java | 164 +- .../rules/common/NonLearningRule.java | 26 +- .../classifiers/rules/common/PassiveRule.java | 71 +- .../classifiers/rules/common/Perceptron.java | 885 +++++---- .../learners/classifiers/rules/common/Rule.java | 146 +- .../rules/common/RuleActiveLearningNode.java | 9 +- .../rules/common/RuleActiveRegressionNode.java | 551 +++--- .../rules/common/RulePassiveLearningNode.java | 7 +- .../rules/common/RulePassiveRegressionNode.java | 81 +- .../rules/common/RuleRegressionNode.java | 516 +++--- .../classifiers/rules/common/RuleSplitNode.java | 52 +- .../classifiers/rules/common/TargetMean.java | 314 ++-- .../distributed/AMRDefaultRuleProcessor.java | 577 +++--- .../rules/distributed/AMRLearnerProcessor.java | 421 ++--- .../rules/distributed/AMRRuleSetProcessor.java | 634 +++---- .../distributed/AMRulesAggregatorProcessor.java | 940 +++++----- .../distributed/AMRulesStatisticsProcessor.java | 340 ++-- .../distributed/AssignmentContentEvent.java | 70 +- .../distributed/PredicateContentEvent.java | 90 +- .../rules/distributed/RuleContentEvent.java | 86 +- .../classifiers/trees/ActiveLearningNode.java | 337 ++-- .../trees/AttributeBatchContentEvent.java | 205 +-- .../trees/AttributeContentEvent.java | 376 ++-- .../classifiers/trees/ComputeContentEvent.java | 221 +-- .../classifiers/trees/ControlContentEvent.java | 75 +- .../classifiers/trees/DeleteContentEvent.java | 30 +- .../classifiers/trees/FilterProcessor.java | 286 +-- .../learners/classifiers/trees/FoundNode.java | 96 +- .../classifiers/trees/InactiveLearningNode.java | 42 +- .../classifiers/trees/LearningNode.java | 52 +- .../trees/LocalResultContentEvent.java | 123 +- .../trees/LocalStatisticsProcessor.java | 370 ++-- .../trees/ModelAggregatorProcessor.java | 1330 +++++++------- .../samoa/learners/classifiers/trees/Node.java | 137 +- .../learners/classifiers/trees/SplitNode.java | 159 +- .../trees/VerticalHoeffdingTree.java | 10 +- .../clusterers/ClusteringContentEvent.java | 93 +- .../clusterers/ClustreamClustererAdapter.java | 230 +-- .../clusterers/LocalClustererAdapter.java | 84 +- .../clusterers/LocalClustererProcessor.java | 275 +-- .../learners/clusterers/SingleLearner.java | 107 +- .../simple/ClusteringDistributorProcessor.java | 106 +- .../clusterers/simple/DistributedClusterer.java | 141 +- .../yahoo/labs/samoa/moa/AbstractMOAObject.java | 89 +- .../com/yahoo/labs/samoa/moa/MOAObject.java | 50 +- .../moa/classifiers/AbstractClassifier.java | 616 +++---- .../labs/samoa/moa/classifiers/Classifier.java | 78 +- .../labs/samoa/moa/classifiers/Regressor.java | 6 +- .../core/AttributeSplitSuggestion.java | 57 +- .../AttributeClassObserver.java | 80 +- ...BinaryTreeNumericAttributeClassObserver.java | 252 +-- ...NumericAttributeClassObserverRegression.java | 296 +-- .../DiscreteAttributeClassObserver.java | 10 +- .../FIMTDDNumericAttributeClassObserver.java | 362 ++-- .../GaussianNumericAttributeClassObserver.java | 252 +-- ...waldKhannaNumericAttributeClassObserver.java | 145 +- .../NominalAttributeClassObserver.java | 243 ++- .../NullAttributeClassObserver.java | 73 +- .../NumericAttributeClassObserver.java | 10 +- .../VFMLNumericAttributeClassObserver.java | 337 ++-- .../InstanceConditionalBinaryTest.java | 10 +- .../InstanceConditionalTest.java | 79 +- .../NominalAttributeBinaryTest.java | 64 +- .../NominalAttributeMultiwayTest.java | 62 +- .../NumericAttributeBinaryTest.java | 96 +- .../classifiers/core/driftdetection/ADWIN.java | 970 +++++----- .../driftdetection/ADWINChangeDetector.java | 64 +- .../driftdetection/AbstractChangeDetector.java | 222 ++- .../core/driftdetection/ChangeDetector.java | 127 +- .../core/driftdetection/CusumDM.java | 118 +- .../classifiers/core/driftdetection/DDM.java | 145 +- .../classifiers/core/driftdetection/EDDM.java | 173 +- .../core/driftdetection/EWMAChartDM.java | 151 +- .../GeometricMovingAverageDM.java | 116 +- .../core/driftdetection/PageHinkleyDM.java | 122 +- .../core/splitcriteria/GiniSplitCriterion.java | 86 +- .../splitcriteria/InfoGainSplitCriterion.java | 140 +- .../InfoGainSplitCriterionMultilabel.java | 37 +- .../core/splitcriteria/SDRSplitCriterion.java | 14 +- .../core/splitcriteria/SplitCriterion.java | 49 +- .../VarianceReductionSplitCriterion.java | 115 +- .../classifiers/functions/MajorityClass.java | 78 +- .../moa/classifiers/rules/core/Predicate.java | 8 +- ...IMTDDNumericAttributeClassLimitObserver.java | 182 +- .../NumericAttributeBinaryRulePredicate.java | 220 +-- .../splitcriteria/SDRSplitCriterionAMRules.java | 106 +- .../core/voting/AbstractErrorWeightedVote.java | 122 +- .../rules/core/voting/ErrorWeightedVote.java | 102 +- .../core/voting/InverseErrorWeightedVote.java | 124 +- .../rules/core/voting/UniformWeightedVote.java | 74 +- .../rules/driftdetection/PageHinkleyFading.java | 95 +- .../rules/driftdetection/PageHinkleyTest.java | 113 +- .../yahoo/labs/samoa/moa/cluster/CFCluster.java | 273 +-- .../yahoo/labs/samoa/moa/cluster/Cluster.java | 268 ++- .../labs/samoa/moa/cluster/Clustering.java | 426 +++-- .../yahoo/labs/samoa/moa/cluster/Miniball.java | 80 +- .../labs/samoa/moa/cluster/SphereCluster.java | 670 ++++--- .../samoa/moa/clusterers/AbstractClusterer.java | 498 ++--- .../samoa/moa/clusterers/ClusterGenerator.java | 566 +++--- .../labs/samoa/moa/clusterers/Clusterer.java | 34 +- .../yahoo/labs/samoa/moa/clusterers/KMeans.java | 306 ++-- .../moa/clusterers/clustream/Clustream.java | 592 +++--- .../clusterers/clustream/ClustreamKernel.java | 460 ++--- .../moa/clusterers/clustream/WithKmeans.java | 849 +++++---- .../labs/samoa/moa/core/AutoClassDiscovery.java | 279 ++- .../labs/samoa/moa/core/AutoExpandVector.java | 184 +- .../yahoo/labs/samoa/moa/core/DataPoint.java | 181 +- .../yahoo/labs/samoa/moa/core/DoubleVector.java | 264 +-- .../com/yahoo/labs/samoa/moa/core/Example.java | 13 +- .../yahoo/labs/samoa/moa/core/FastVector.java | 57 +- .../labs/samoa/moa/core/GaussianEstimator.java | 164 +- .../core/GreenwaldKhannaQuantileSummary.java | 430 ++--- .../moa/core/InputStreamProgressMonitor.java | 174 +- .../labs/samoa/moa/core/InstanceExample.java | 46 +- .../yahoo/labs/samoa/moa/core/Measurement.java | 132 +- .../yahoo/labs/samoa/moa/core/MiscUtils.java | 105 +- .../labs/samoa/moa/core/ObjectRepository.java | 4 +- .../labs/samoa/moa/core/SerializeUtils.java | 114 +- .../yahoo/labs/samoa/moa/core/Statistics.java | 1113 ++++++------ .../yahoo/labs/samoa/moa/core/StringUtils.java | 110 +- .../com/yahoo/labs/samoa/moa/core/Utils.java | 1699 +++++++++--------- .../samoa/moa/evaluation/LearningCurve.java | 162 +- .../moa/evaluation/LearningEvaluation.java | 42 +- .../LearningPerformanceEvaluator.java | 52 +- .../samoa/moa/evaluation/MeasureCollection.java | 450 ++--- .../samoa/moa/evaluation/MembershipMatrix.java | 219 ++- .../yahoo/labs/samoa/moa/learners/Learner.java | 194 +- .../samoa/moa/options/AbstractClassOption.java | 404 +++-- .../moa/options/AbstractOptionHandler.java | 275 ++- .../labs/samoa/moa/options/ClassOption.java | 249 +-- .../labs/samoa/moa/options/OptionHandler.java | 82 +- .../labs/samoa/moa/options/OptionsHandler.java | 292 ++- .../labs/samoa/moa/streams/ArffFileStream.java | 256 +-- .../labs/samoa/moa/streams/ExampleStream.java | 81 +- .../labs/samoa/moa/streams/InstanceStream.java | 9 +- .../moa/streams/clustering/ClusterEvent.java | 13 +- .../clustering/ClusterEventListener.java | 2 - .../streams/clustering/ClusteringStream.java | 38 +- .../clustering/RandomRBFGeneratorEvents.java | 1588 ++++++++-------- .../streams/generators/HyperplaneGenerator.java | 217 +-- .../streams/generators/RandomTreeGenerator.java | 384 ++-- .../yahoo/labs/samoa/moa/tasks/NullMonitor.java | 144 +- .../samoa/moa/tasks/ResultPreviewListener.java | 19 +- .../com/yahoo/labs/samoa/moa/tasks/Task.java | 55 +- .../yahoo/labs/samoa/moa/tasks/TaskMonitor.java | 230 +-- .../labs/samoa/streams/ArffFileStream.java | 160 +- .../streams/ClusteringEntranceProcessor.java | 358 ++-- .../yahoo/labs/samoa/streams/FileStream.java | 257 ++- .../streams/PrequentialSourceProcessor.java | 331 ++-- .../yahoo/labs/samoa/streams/StreamSource.java | 94 +- .../samoa/streams/StreamSourceProcessor.java | 288 +-- .../labs/samoa/streams/fs/FileStreamSource.java | 65 +- .../samoa/streams/fs/HDFSFileStreamSource.java | 210 +-- .../samoa/streams/fs/LocalFileStreamSource.java | 186 +- .../labs/samoa/tasks/ClusteringEvaluation.java | 208 ++- .../labs/samoa/tasks/PrequentialEvaluation.java | 252 +-- .../java/com/yahoo/labs/samoa/tasks/Task.java | 58 +- .../AbstractEntranceProcessingItem.java | 163 +- .../samoa/topology/AbstractProcessingItem.java | 263 +-- .../labs/samoa/topology/AbstractStream.java | 159 +- .../labs/samoa/topology/AbstractTopology.java | 190 +- .../labs/samoa/topology/ComponentFactory.java | 86 +- .../samoa/topology/EntranceProcessingItem.java | 30 +- .../labs/samoa/topology/IProcessingItem.java | 30 +- .../yahoo/labs/samoa/topology/ISubmitter.java | 28 +- .../topology/LocalEntranceProcessingItem.java | 98 +- .../labs/samoa/topology/ProcessingItem.java | 70 +- .../com/yahoo/labs/samoa/topology/Stream.java | 63 +- .../com/yahoo/labs/samoa/topology/Topology.java | 115 +- .../labs/samoa/topology/TopologyBuilder.java | 380 ++-- .../labs/samoa/utils/PartitioningScheme.java | 5 +- .../labs/samoa/utils/StreamDestination.java | 67 +- .../java/com/yahoo/labs/samoa/utils/Utils.java | 279 +-- .../yahoo/labs/samoa/core/DoubleVectorTest.java | 132 +- .../streams/fs/HDFSFileStreamSourceTest.java | 507 +++--- .../streams/fs/LocalFileStreamSourceTest.java | 458 ++--- samoa-instances/pom.xml | 45 +- .../yahoo/labs/samoa/instances/ArffLoader.java | 599 +++--- .../yahoo/labs/samoa/instances/Attribute.java | 280 +-- .../labs/samoa/instances/DenseInstance.java | 76 +- .../labs/samoa/instances/DenseInstanceData.java | 134 +- .../yahoo/labs/samoa/instances/Instance.java | 101 +- .../labs/samoa/instances/InstanceData.java | 26 +- .../samoa/instances/InstanceInformation.java | 144 +- .../yahoo/labs/samoa/instances/Instances.java | 410 +++-- .../labs/samoa/instances/InstancesHeader.java | 164 +- .../instances/SingleClassInstanceData.java | 90 +- .../samoa/instances/SingleLabelInstance.java | 449 +++-- .../labs/samoa/instances/SparseInstance.java | 37 +- .../samoa/instances/SparseInstanceData.java | 181 +- .../com/yahoo/labs/samoa/instances/Utils.java | 105 +- samoa-local/pom.xml | 179 +- .../java/com/yahoo/labs/samoa/LocalDoTask.java | 81 +- .../topology/impl/SimpleComponentFactory.java | 30 +- .../labs/samoa/topology/impl/SimpleEngine.java | 10 +- .../impl/SimpleEntranceProcessingItem.java | 12 +- .../topology/impl/SimpleProcessingItem.java | 86 +- .../labs/samoa/topology/impl/SimpleStream.java | 94 +- .../samoa/topology/impl/SimpleTopology.java | 28 +- samoa-local/src/main/resources/log4j.xml | 31 +- .../java/com/yahoo/labs/samoa/AlgosTest.java | 103 +- .../impl/SimpleComponentFactoryTest.java | 105 +- .../samoa/topology/impl/SimpleEngineTest.java | 45 +- .../impl/SimpleEntranceProcessingItemTest.java | 239 +-- .../topology/impl/SimpleProcessingItemTest.java | 150 +- .../samoa/topology/impl/SimpleStreamTest.java | 132 +- .../samoa/topology/impl/SimpleTopologyTest.java | 101 +- samoa-s4/pom.xml | 228 +-- samoa-s4/samoa-s4-adapter/pom.xml | 64 +- samoa-s4/src/main/assembly/samoa-s4.xml | 100 +- .../samoa/topology/impl/S4ComponentFactory.java | 93 +- .../labs/samoa/topology/impl/S4DoTask.java | 369 ++-- .../topology/impl/S4EntranceProcessingItem.java | 168 +- .../yahoo/labs/samoa/topology/impl/S4Event.java | 102 +- .../samoa/topology/impl/S4ProcessingItem.java | 289 ++- .../labs/samoa/topology/impl/S4Stream.java | 288 +-- .../labs/samoa/topology/impl/S4Submitter.java | 197 +- .../labs/samoa/topology/impl/S4Topology.java | 70 +- .../samoa/topology/impl/SamoaSerializer.java | 106 +- .../topology/impl/SamoaSerializerModule.java | 10 +- samoa-samza/pom.xml | 288 +-- samoa-samza/src/main/assembly/samoa-samza.xml | 42 +- .../java/com/yahoo/labs/samoa/SamzaDoTask.java | 355 ++-- .../samoa/topology/impl/SamoaSystemFactory.java | 30 +- .../topology/impl/SamzaComponentFactory.java | 44 +- .../labs/samoa/topology/impl/SamzaEngine.java | 308 ++-- .../impl/SamzaEntranceProcessingItem.java | 339 ++-- .../topology/impl/SamzaProcessingItem.java | 216 +-- .../topology/impl/SamzaProcessingNode.java | 54 +- .../labs/samoa/topology/impl/SamzaStream.java | 400 ++--- .../labs/samoa/topology/impl/SamzaTopology.java | 58 +- .../labs/samoa/utils/SamzaConfigFactory.java | 955 +++++----- .../labs/samoa/utils/SamzaKryoSerdeFactory.java | 229 +-- .../samoa/utils/SerializableSerializer.java | 54 +- .../yahoo/labs/samoa/utils/SystemsUtils.java | 665 +++---- samoa-samza/src/main/resources/log4j.xml | 60 +- samoa-storm/pom.xml | 217 +-- .../com/yahoo/labs/samoa/LocalStormDoTask.java | 53 +- .../samoa/topology/impl/StormBoltStream.java | 57 +- .../topology/impl/StormComponentFactory.java | 90 +- .../labs/samoa/topology/impl/StormDoTask.java | 159 +- .../impl/StormEntranceProcessingItem.java | 298 +-- .../samoa/topology/impl/StormJarSubmitter.java | 64 +- .../topology/impl/StormProcessingItem.java | 237 ++- .../samoa/topology/impl/StormSamoaUtils.java | 133 +- .../samoa/topology/impl/StormSpoutStream.java | 2 +- .../labs/samoa/topology/impl/StormStream.java | 97 +- .../labs/samoa/topology/impl/StormTopology.java | 39 +- .../samoa/topology/impl/StormTopologyNode.java | 13 +- .../topology/impl/StormTopologySubmitter.java | 173 +- .../java/com/yahoo/labs/samoa/AlgosTest.java | 70 +- .../topology/impl/StormProcessingItemTest.java | 68 +- samoa-test/pom.xml | 133 +- .../assembly/test-jar-with-dependencies.xml | 50 +- .../java/com/yahoo/labs/samoa/TestParams.java | 393 ++-- .../java/com/yahoo/labs/samoa/TestUtils.java | 231 ++- samoa-threads/pom.xml | 209 ++- .../yahoo/labs/samoa/LocalThreadsDoTask.java | 92 +- .../topology/impl/ThreadsComponentFactory.java | 43 +- .../labs/samoa/topology/impl/ThreadsEngine.java | 127 +- .../impl/ThreadsEntranceProcessingItem.java | 17 +- .../topology/impl/ThreadsEventRunnable.java | 60 +- .../topology/impl/ThreadsProcessingItem.java | 120 +- .../impl/ThreadsProcessingItemInstance.java | 46 +- .../labs/samoa/topology/impl/ThreadsStream.java | 131 +- .../samoa/topology/impl/ThreadsTopology.java | 61 +- .../java/com/yahoo/labs/samoa/AlgosTest.java | 71 +- .../impl/ThreadsComponentFactoryTest.java | 141 +- .../samoa/topology/impl/ThreadsEngineTest.java | 190 +- .../impl/ThreadsEntranceProcessingItemTest.java | 202 ++- .../topology/impl/ThreadsEventRunnableTest.java | 60 +- .../impl/ThreadsProcessingItemInstanceTest.java | 58 +- .../impl/ThreadsProcessingItemTest.java | 261 +-- .../samoa/topology/impl/ThreadsStreamTest.java | 166 +- .../topology/impl/ThreadsTopologyTest.java | 85 +- .../labs/samoa/utils/StreamDestinationTest.java | 64 +- 328 files changed, 33921 insertions(+), 33081 deletions(-) ----------------------------------------------------------------------
