From 225cacad6ef8c98cae628874c6da39c3daf25954 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 5 Jun 2014 11:31:57 +0200 Subject: [PATCH] Radically cleaned the server side data mining projects --- .../build.properties | 3 +- .../sailing/datamining/test/TestClusters.java | 35 ----- .../META-INF/MANIFEST.MF | 3 +- .../com/sap/sailing/datamining/Clusters.java | 46 ------ .../datamining/WindStrengthCluster.java | 7 - .../dimensions/DimensionManager.java | 10 -- .../dimensions/DimensionManagerProvider.java | 26 ---- .../dimensions/GPSFixDimensionManager.java | 133 ---------------- ...rackedLegOfCompetitorDimensionManager.java | 132 ---------------- .../factories/DataMiningFactory.java | 46 ------ .../factories/DataRetrieverFactory.java | 16 -- .../factories/ExtractorFactory.java | 29 ---- .../datamining/factories/FilterFactory.java | 64 -------- .../datamining/factories/GrouperFactory.java | 49 ------ .../impl/WindStrengthClusterImpl.java | 13 -- ...ctLeaderboardGroupDataRetrievalWorker.java | 82 ---------- ...ixLeaderboardGroupDataRetrievalWorker.java | 48 ------ .../GroupDividingParallelDataRetriever.java | 54 ------- .../SpeedInKnotsExtractionWorker.java | 13 -- ...orLeaderboardGroupDataRetrievalWorker.java | 24 --- .../impl/gps_fix/GPSFixWithContextImpl.java | 118 -------------- .../DistanceTraveledExtractionWorker.java | 15 -- ...TrackedLegOfCompetitorWithContextImpl.java | 88 ----------- .../DataRetrieverWorkerBuilder.java | 30 ---- .../deprecated/ExtractionWorkerBuilder.java | 30 ---- .../shared/annotations/BaseDataType.java | 16 -- .../shared/annotations/DataRetriever.java | 16 -- .../impl/criterias/TestFilterCriterias.java | 16 -- .../impl/workers/TestDimensionGroupers.java | 144 ------------------ .../impl/workers/TestExtractors.java | 39 ----- .../datamining/impl/workers/TestFilters.java | 37 ----- .../workers/aggregators/TestAggregators.java | 65 -------- .../test/util/OpenDataReceiver.java | 14 -- .../sse/datamining/test/util/OpenGrouper.java | 25 --- .../test/util/StringLengthExtractor.java | 12 -- .../META-INF/MANIFEST.MF | 42 ++--- .../components/ParallelAggregator.java | 13 -- .../components/ParallelComponent.java | 11 -- .../components/ParallelDataRetriever.java | 8 - .../components/ParallelExtractor.java | 18 --- .../datamining/components/ParallelFilter.java | 7 - .../components/ParallelGrouper.java | 10 -- .../datamining/data/deprecated/Cluster.java | 13 -- .../data/deprecated/ClusterOfComparable.java | 7 - .../datamining/data/deprecated/Dimension.java | 9 -- .../factories/AggregatorFactory.java | 26 ---- .../deprecated/AbstractParallelComponent.java | 103 ------------- .../GroupDividingParallelAggregator.java | 56 ------- .../GroupDividingParallelExtractor.java | 74 --------- .../deprecated/NonFilteringFilter.java | 60 -------- .../PartitioningParallelFilter.java | 48 ------ .../PartitioningParallelGrouper.java | 51 ------- .../DimensionRegexFilterCriteria.java | 20 --- .../DimensionValuesFilterCriteria.java | 34 ----- .../deprecated/RangeFilterCriteria.java | 25 --- .../deprecated/SimpleRangeFilterCriteria.java | 16 -- .../data/deprecated/AbstractDimension.java | 48 ------ .../impl/data/deprecated/ClusterImpl.java | 39 ----- .../deprecated/ClusterOfComparableImpl.java | 17 --- .../datamining/impl/deprecated/QueryImpl.java | 74 --------- .../impl/workers/AbstractComponentWorker.java | 33 ---- .../workers/AbstractFiltrationWorker.java | 31 ---- .../impl/workers/AbstractGroupingWorker.java | 38 ----- .../workers/CriteriaFiltrationWorker.java | 18 --- .../MultiDimensionalGroupingWorker.java | 38 ----- .../AbstractAggregationWorker.java | 38 ----- .../ArithmeticAverageAggregationWorker.java | 23 --- .../aggregators/MedianAggregationWorker.java | 33 ---- ...pleArithmeticAverageAggregationWorker.java | 11 -- ...bleArithmeticAverageAggregationWorker.java | 17 --- .../SimpleDoubleMedianAggregationWorker.java | 15 -- ...gerArithmeticAverageAggregationWorker.java | 17 --- .../SimpleIntegerMedianAggregationWorker.java | 16 -- .../SimpleMedianAggregationWorker.java | 11 -- .../aggregators/SumAggregationWorker.java | 21 --- .../SimpleDoubleSumAggregationHelper.java | 11 -- .../SimpleIntegerSumAggregationHelper.java | 11 -- .../helpers/SimpleSumAggregationHelper.java | 11 -- .../helpers/SumAggregationHelper.java | 21 --- .../builders/AggregationWorkerBuilder.java | 64 -------- .../builders/FilterByCriteriaBuilder.java | 21 --- ...MultiDimensionalGroupingWorkerBuilder.java | 23 --- .../extractors/AbstractExtractionWorker.java | 44 ------ .../retrievers/AbstractRetrievalWorker.java | 9 -- .../datamining/workers/AggregationWorker.java | 12 -- .../datamining/workers/ComponentWorker.java | 9 -- .../workers/DataRetrievalWorker.java | 9 -- .../datamining/workers/ExtractionWorker.java | 12 -- .../datamining/workers/FiltrationWorker.java | 9 -- .../datamining/workers/GroupingWorker.java | 12 -- .../sse/datamining/workers/WorkReceiver.java | 7 - .../sse/datamining/workers/WorkerBuilder.java | 8 - 92 files changed, 18 insertions(+), 2962 deletions(-) delete mode 100644 java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestClusters.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Clusters.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/WindStrengthCluster.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManager.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManagerProvider.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/GPSFixDimensionManager.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/TrackedLegOfCompetitorDimensionManager.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/ExtractorFactory.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/GrouperFactory.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/WindStrengthClusterImpl.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/AbstractLeaderboardGroupDataRetrievalWorker.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GPSFixLeaderboardGroupDataRetrievalWorker.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GroupDividingParallelDataRetriever.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/SpeedInKnotsExtractionWorker.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixWithContextImpl.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/DistanceTraveledExtractionWorker.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/TrackedLegOfCompetitorWithContextImpl.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/DataRetrieverWorkerBuilder.java delete mode 100644 java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/ExtractionWorkerBuilder.java delete mode 100644 java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/BaseDataType.java delete mode 100644 java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/DataRetriever.java delete mode 100644 java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestDimensionGroupers.java delete mode 100644 java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestExtractors.java delete mode 100644 java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestFilters.java delete mode 100644 java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/aggregators/TestAggregators.java delete mode 100644 java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenDataReceiver.java delete mode 100644 java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenGrouper.java delete mode 100644 java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/StringLengthExtractor.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelAggregator.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelComponent.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelDataRetriever.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelExtractor.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelFilter.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelGrouper.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Cluster.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/ClusterOfComparable.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Dimension.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/AbstractParallelComponent.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelAggregator.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelExtractor.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/NonFilteringFilter.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelFilter.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelGrouper.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionRegexFilterCriteria.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionValuesFilterCriteria.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/RangeFilterCriteria.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/SimpleRangeFilterCriteria.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/AbstractDimension.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterImpl.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterOfComparableImpl.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/deprecated/QueryImpl.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractComponentWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractFiltrationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractGroupingWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/CriteriaFiltrationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/MultiDimensionalGroupingWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/AbstractAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/ArithmeticAverageAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/MedianAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleArithmeticAverageAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleArithmeticAverageAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleMedianAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerArithmeticAverageAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerMedianAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleMedianAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SumAggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleDoubleSumAggregationHelper.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleIntegerSumAggregationHelper.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleSumAggregationHelper.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SumAggregationHelper.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/FilterByCriteriaBuilder.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/MultiDimensionalGroupingWorkerBuilder.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/extractors/AbstractExtractionWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/retrievers/AbstractRetrievalWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/AggregationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ComponentWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/DataRetrievalWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ExtractionWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/FiltrationWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/GroupingWorker.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkReceiver.java delete mode 100644 java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkerBuilder.java diff --git a/java/com.sap.sailing.datamining.test/build.properties b/java/com.sap.sailing.datamining.test/build.properties index 34d2e4d2dad..3520af99683 100644 --- a/java/com.sap.sailing.datamining.test/build.properties +++ b/java/com.sap.sailing.datamining.test/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + resources/ output.. = bin/ bin.includes = META-INF/,\ . diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestClusters.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestClusters.java deleted file mode 100644 index da95ff3d53e..00000000000 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestClusters.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.sap.sailing.datamining.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import com.sap.sailing.datamining.Clusters; -import com.sap.sse.datamining.data.deprecated.ClusterOfComparable; -import com.sap.sse.datamining.impl.data.deprecated.ClusterOfComparableImpl; - -public class TestClusters { - - @Test - public void testClusterOfComparable() { - ClusterOfComparable cluster = new ClusterOfComparableImpl("Test", 3, 1); - - assertTrue(cluster.isInRange(1)); - assertTrue(cluster.isInRange(2)); - assertTrue(cluster.isInRange(3)); - - assertFalse(cluster.isInRange(null)); - assertFalse(cluster.isInRange(0)); - assertFalse(cluster.isInRange(4)); - } - - @Test - public void testWindStrengthClusters() { - assertNull(Clusters.WindStrength.getClusterFor(15, Clusters.WindStrength.StandardClusters)); - assertEquals(Clusters.WindStrength.VeryLight, Clusters.WindStrength.getClusterFor(1, Clusters.WindStrength.StandardClusters)); - } - -} diff --git a/java/com.sap.sailing.datamining/META-INF/MANIFEST.MF b/java/com.sap.sailing.datamining/META-INF/MANIFEST.MF index 55ba7a730cb..743688e0eb3 100644 --- a/java/com.sap.sailing.datamining/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.datamining/META-INF/MANIFEST.MF @@ -7,8 +7,7 @@ Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.sap.sailing.server, org.osgi.framework;version="1.7.0" -Export-Package: com.sap.sailing.datamining, - com.sap.sailing.datamining.data, +Export-Package: com.sap.sailing.datamining.data, com.sap.sailing.datamining.factories Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0", com.sap.sailing.domain.common, diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Clusters.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Clusters.java deleted file mode 100644 index 6d216820d7b..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Clusters.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.sap.sailing.datamining; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import com.sap.sailing.datamining.impl.WindStrengthClusterImpl; - -public class Clusters { - - private Clusters() { } - - public static class WindStrength { - - public static WindStrengthCluster VeryLight = new WindStrengthClusterImpl("Very Light", 0.0, 2.5); - public static WindStrengthCluster Light = new WindStrengthClusterImpl("Very Light", 2.5, 5.0); - public static WindStrengthCluster Medium = new WindStrengthClusterImpl("Very Light", 5.0, 7.5); - public static WindStrengthCluster Strong = new WindStrengthClusterImpl("Very Light", 7.5, 10.0); - public static WindStrengthCluster VeryStrong = new WindStrengthClusterImpl("Very Light", 10.0, 12.0); - public static Collection StandardClusters = Arrays.asList(VeryLight, Light, Medium, Strong, VeryStrong); - - private WindStrength() { } - - public static WindStrengthCluster getClusterFor(double windStrengthInBeafort, Collection clusters) { - List sortedClusters = new ArrayList(clusters); - Collections.sort(sortedClusters, new Comparator() { - @Override - public int compare(WindStrengthCluster cluster1, WindStrengthCluster cluster2) { - return cluster1.getUpperRange().compareTo(cluster2.getUpperRange()); - } - }); - - for (WindStrengthCluster cluster : sortedClusters) { - if (cluster.isInRange(windStrengthInBeafort)) { - return cluster; - } - } - return null; - } - - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/WindStrengthCluster.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/WindStrengthCluster.java deleted file mode 100644 index 39d701d738f..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/WindStrengthCluster.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sailing.datamining; - -import com.sap.sse.datamining.data.deprecated.ClusterOfComparable; - -public interface WindStrengthCluster extends ClusterOfComparable { - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManager.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManager.java deleted file mode 100644 index b5fe6dbbb27..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManager.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.sap.sailing.datamining.dimensions; - -import com.sap.sailing.datamining.shared.DimensionIdentifier; -import com.sap.sse.datamining.data.deprecated.Dimension; - -public interface DimensionManager { - - public Dimension getDimensionFor(DimensionIdentifier sharedDimension); - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManagerProvider.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManagerProvider.java deleted file mode 100644 index cfce45cbf80..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/DimensionManagerProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.sap.sailing.datamining.dimensions; - -import com.sap.sailing.datamining.data.GPSFixWithContext; -import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext; -import com.sap.sailing.datamining.shared.DataTypes; - -public final class DimensionManagerProvider { - - private DimensionManagerProvider() { } - - private static final DimensionManager GPSFixDimensionManager = new GPSFixDimensionManager(); - private static final DimensionManager TrackedLegOfCompetitorDimensionManager = new TrackedLegOfCompetitorDimensionManager(); - - @SuppressWarnings("unchecked") - public static DimensionManager getDimensionManagerFor(DataTypes dataType) { - switch (dataType) { - case GPSFix: - return (DimensionManager) GPSFixDimensionManager; - case TrackedLegOfCompetitor: - return (DimensionManager) TrackedLegOfCompetitorDimensionManager; - } - throw new IllegalArgumentException("Not yet implemented for the given data type: " - + dataType.toString()); - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/GPSFixDimensionManager.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/GPSFixDimensionManager.java deleted file mode 100644 index 25fdaa879ef..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/GPSFixDimensionManager.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.sap.sailing.datamining.dimensions; - -import com.sap.sailing.datamining.data.GPSFixWithContext; -import com.sap.sailing.datamining.shared.DimensionIdentifier; -import com.sap.sailing.domain.common.LegType; -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.data.deprecated.AbstractDimension; - -public final class GPSFixDimensionManager implements DimensionManager { - - public GPSFixDimensionManager() { } - - /** - * @return The dimension for the given dimension type. Throws an exception, if the used ValueType doesn't match the ValueType of the returning dimension. - */ - @Override - public Dimension getDimensionFor(DimensionIdentifier dimension) { - switch (dimension) { - case BoatClassName: - return BoatClassNameDimension; - case CompetitorName: - return CompetitorNameDimension; - case CourseAreaName: - return CourseAreaNameDimension; - case FleetName: - return FleetNameDimension; - case LegNumber: - return LegNumberDimension; - case LegType: - return LegTypeDimension; - case Nationality: - return NationalityDimension; - case RaceName: - return RaceNameDimension; - case RegattaName: - return RegattaNameDimension; - case SailID: - return SailIDDimension; - case WindStrength: - return WindStrengthDimension; - case Year: - return YearDimension; - } - throw new IllegalArgumentException("Not yet implemented for the given dimension: " - + dimension.toString()); - } - - public final static Dimension RegattaNameDimension = new AbstractDimension("Regatta") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getRegattaName(); - } - }; - - public final static Dimension RaceNameDimension = new AbstractDimension("Race") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getRaceName(); - } - }; - - public final static Dimension LegNumberDimension = new AbstractDimension("Leg Number") { - @Override - public Integer getDimensionValueFrom(GPSFixWithContext data) { - return data.getLegNumber(); - } - }; - - public final static Dimension CourseAreaNameDimension = new AbstractDimension("Course Area") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getCourseAreaName(); - } - }; - - public final static Dimension FleetNameDimension = new AbstractDimension("Fleet") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getFleetName(); - } - }; - - public final static Dimension BoatClassNameDimension = new AbstractDimension("Boat Class") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getBoatClassName(); - } - }; - - public final static Dimension YearDimension = new AbstractDimension("Year") { - @Override - public Integer getDimensionValueFrom(GPSFixWithContext data) { - return data.getYear(); - } - }; - - public final static Dimension LegTypeDimension = new AbstractDimension("Leg Type") { - @Override - public LegType getDimensionValueFrom(GPSFixWithContext data) { - return data.getLegType(); - } - }; - - public final static Dimension CompetitorNameDimension = new AbstractDimension("Competitor") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getCompetitorName(); - } - }; - - public final static Dimension SailIDDimension = new AbstractDimension("Sail ID") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getCompetitorSailID(); - } - }; - - public final static Dimension NationalityDimension = new AbstractDimension("Nationality") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getCompetitorNationality(); - } - }; - - //TODO after new clusters - public final static Dimension WindStrengthDimension = new AbstractDimension("Wind Strength") { - @Override - public String getDimensionValueFrom(GPSFixWithContext data) { - return data.getWindStrength().getName(); - } - }; - -} \ No newline at end of file diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/TrackedLegOfCompetitorDimensionManager.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/TrackedLegOfCompetitorDimensionManager.java deleted file mode 100644 index e389758cb9a..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/dimensions/TrackedLegOfCompetitorDimensionManager.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.sap.sailing.datamining.dimensions; - -import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext; -import com.sap.sailing.datamining.shared.DimensionIdentifier; -import com.sap.sailing.domain.common.LegType; -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.data.deprecated.AbstractDimension; - -public final class TrackedLegOfCompetitorDimensionManager implements DimensionManager { - - public TrackedLegOfCompetitorDimensionManager() { } - - /** - * @return The dimension for the given dimension type. Throws an exception, if the used ValueType doesn't match the ValueType of the returning dimension. - */ - public Dimension getDimensionFor(DimensionIdentifier dimension) { - switch (dimension) { - case BoatClassName: - return BoatClassNameDimension; - case CompetitorName: - return CompetitorNameDimension; - case CourseAreaName: - return CourseAreaNameDimension; - case FleetName: - return FleetNameDimension; - case LegNumber: - return LegNumberDimension; - case LegType: - return LegTypeDimension; - case Nationality: - return NationalityDimension; - case RaceName: - return RaceNameDimension; - case RegattaName: - return RegattaNameDimension; - case SailID: - return SailIDDimension; - case WindStrength: - return WindStrengthDimension; - case Year: - return YearDimension; - } - throw new IllegalArgumentException("Not yet implemented for the given dimension: " - + dimension.toString()); - } - - public final static Dimension RegattaNameDimension = new AbstractDimension("Regatta") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getRegattaName(); - } - }; - - public final static Dimension RaceNameDimension = new AbstractDimension("Race") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getRaceName(); - } - }; - - public final static Dimension LegNumberDimension = new AbstractDimension("Leg Number") { - @Override - public Integer getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getLegNumber(); - } - }; - - public final static Dimension CourseAreaNameDimension = new AbstractDimension("Course Area") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getCourseAreaName(); - } - }; - - public final static Dimension FleetNameDimension = new AbstractDimension("Fleet") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getFleetName(); - } - }; - - public final static Dimension BoatClassNameDimension = new AbstractDimension("Boat Class") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getBoatClassName(); - } - }; - - public final static Dimension YearDimension = new AbstractDimension("Year") { - @Override - public Integer getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getYear(); - } - }; - - public final static Dimension LegTypeDimension = new AbstractDimension("Leg Type") { - @Override - public LegType getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getLegType(); - } - }; - - public final static Dimension CompetitorNameDimension = new AbstractDimension("Competitor") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getCompetitorName(); - } - }; - - public final static Dimension SailIDDimension = new AbstractDimension("Sail ID") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getCompetitorSailID(); - } - }; - - public final static Dimension NationalityDimension = new AbstractDimension("Nationality") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getCompetitorNationality(); - } - }; - - //TODO after new clusters - public final static Dimension WindStrengthDimension = new AbstractDimension("Wind Strength") { - @Override - public String getDimensionValueFrom(TrackedLegOfCompetitorWithContext data) { - return data.getWindStrength().getName(); - } - }; - -} \ No newline at end of file diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataMiningFactory.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataMiningFactory.java index 39453295d6d..d0089cea582 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataMiningFactory.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataMiningFactory.java @@ -2,7 +2,6 @@ package com.sap.sailing.datamining.factories; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import com.sap.sailing.datamining.data.HasGPSFixContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; @@ -10,25 +9,13 @@ import com.sap.sailing.datamining.impl.DeprecatedToFunctionConverter; import com.sap.sailing.datamining.impl.QueryDefinitionConverter; import com.sap.sailing.datamining.shared.QueryDefinition; import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated; -import com.sap.sailing.server.RacingEventService; import com.sap.sse.datamining.Query; -import com.sap.sse.datamining.components.ParallelAggregator; -import com.sap.sse.datamining.components.ParallelDataRetriever; -import com.sap.sse.datamining.components.ParallelExtractor; -import com.sap.sse.datamining.components.ParallelFilter; -import com.sap.sse.datamining.components.ParallelGrouper; import com.sap.sse.datamining.components.Processor; -import com.sap.sse.datamining.factories.AggregatorFactory; import com.sap.sse.datamining.factories.ProcessorFactory; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.i18n.DataMiningStringMessages; -import com.sap.sse.datamining.impl.DataMiningActivator; import com.sap.sse.datamining.impl.ProcessorQuery; import com.sap.sse.datamining.impl.components.GroupedDataEntry; -import com.sap.sse.datamining.impl.deprecated.QueryImpl; import com.sap.sse.datamining.shared.dto.FunctionDTO; -import com.sap.sse.datamining.workers.FiltrationWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; public final class DataMiningFactory { @@ -84,37 +71,4 @@ public final class DataMiningFactory { return SailingDataRetrievalLevels.GPSFix; } - @Deprecated - public static Query createQuery( - QueryDefinitionDeprecated queryDefinition, RacingEventService racingService) { - Locale locale = DataMiningStringMessages.Util.getLocaleFrom(queryDefinition.getLocaleInfoName()); - - ParallelDataRetriever retriever = DataRetrieverFactory.createDataRetriever( - queryDefinition.getDataType(), racingService, DataMiningActivator.getExecutor()); - - ParallelFilter filter = createFilter(queryDefinition); - - ParallelGrouper grouper = GrouperFactory.createGrouper(queryDefinition, - DataMiningActivator.getExecutor()); - ParallelExtractor extractor = ExtractorFactory.createExtractor( - DataMiningActivator.getStringMessages(), locale, queryDefinition.getStatisticType(), - DataMiningActivator.getExecutor()); - ParallelAggregator aggregator = AggregatorFactory.createAggregator( - DataMiningActivator.getStringMessages(), locale, queryDefinition.getStatisticType().getValueType(), - queryDefinition.getAggregatorType(), DataMiningActivator.getExecutor()); - - return new QueryImpl(DataMiningActivator.getStringMessages(), locale, - retriever, filter, grouper, extractor, aggregator); - } - - private static ParallelFilter createFilter(QueryDefinitionDeprecated queryDefinition) { - if (queryDefinition.getSelection().isEmpty()) { - return FilterFactory.createNonFilteringFilter(); - } - - WorkerBuilder> workerBuilder = FilterFactory.createDimensionFilterBuilder( - queryDefinition.getDataType(), queryDefinition.getSelection()); - return FilterFactory.createParallelFilter(workerBuilder, DataMiningActivator.getExecutor()); - } - } diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataRetrieverFactory.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataRetrieverFactory.java index 7498075fe9e..c89d40f5af8 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataRetrieverFactory.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataRetrieverFactory.java @@ -16,14 +16,9 @@ import com.sap.sailing.datamining.impl.components.LeaderboardGroupRetrievalProce import com.sap.sailing.datamining.impl.components.RegattaLeaderboardFilteringRetrievalProcessor; import com.sap.sailing.datamining.impl.components.TrackedLegFilteringRetrievalProcessor; import com.sap.sailing.datamining.impl.components.TrackedLegOfCompetitorFilteringRetrievalProcessor; -import com.sap.sailing.datamining.impl.components.deprecated.GroupDividingParallelDataRetriever; -import com.sap.sailing.datamining.impl.workers.builders.deprecated.DataRetrieverWorkerBuilder; -import com.sap.sailing.datamining.shared.DataTypes; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; import com.sap.sailing.domain.leaderboard.RegattaLeaderboard; -import com.sap.sailing.server.RacingEventService; import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.components.ParallelDataRetriever; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.impl.DataMiningActivator; @@ -32,8 +27,6 @@ import com.sap.sse.datamining.impl.criterias.CompoundFilterCriteria; import com.sap.sse.datamining.impl.criterias.NonFilteringFilterCriteria; import com.sap.sse.datamining.impl.criterias.NullaryFunctionValuesFilterCriteria; import com.sap.sse.datamining.shared.dto.FunctionDTO; -import com.sap.sse.datamining.workers.DataRetrievalWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; public final class DataRetrieverFactory { @@ -103,13 +96,4 @@ public final class DataRetrieverFactory { return criteria != null ? criteria : new NonFilteringFilterCriteria(); } - /** - * Creates a retriever for the given data type. Throws an exception, if the used DataType doesn't match - * the DataType of the returning retriever. - */ - public static ParallelDataRetriever createDataRetriever(DataTypes dataType, RacingEventService racingService, ThreadPoolExecutor executor) { - WorkerBuilder> workerBuilder = new DataRetrieverWorkerBuilder(dataType); - return new GroupDividingParallelDataRetriever(racingService, workerBuilder, executor); - } - } diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/ExtractorFactory.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/ExtractorFactory.java deleted file mode 100644 index 98bfa6686ee..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/ExtractorFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.sap.sailing.datamining.factories; - -import java.util.Locale; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sailing.datamining.impl.workers.builders.deprecated.ExtractionWorkerBuilder; -import com.sap.sailing.datamining.shared.StatisticType; -import com.sap.sse.datamining.components.ParallelExtractor; -import com.sap.sse.datamining.i18n.DataMiningStringMessages; -import com.sap.sse.datamining.impl.components.deprecated.GroupDividingParallelExtractor; -import com.sap.sse.datamining.shared.Message; -import com.sap.sse.datamining.shared.Unit; -import com.sap.sse.datamining.workers.ExtractionWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public final class ExtractorFactory { - - private ExtractorFactory() { } - - public static ParallelExtractor createExtractor(DataMiningStringMessages stringMessages, Locale locale, - StatisticType statisticType, ThreadPoolExecutor executor) { - WorkerBuilder> workerBuilder = new ExtractionWorkerBuilder(statisticType); - String signifier = statisticType.getUnit() == Unit.None ? stringMessages.get(locale, statisticType.getSignifierMessage()) : - stringMessages.get(locale, Message.SignifierInUnit, statisticType.getSignifierMessage(), statisticType.getUnitMessage()); - return new GroupDividingParallelExtractor(signifier, statisticType.getUnit(), statisticType.getValueDecimals(), - workerBuilder, executor); - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java deleted file mode 100644 index af13bfdbb25..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.sap.sailing.datamining.factories; - -import java.util.Collection; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sailing.datamining.dimensions.DimensionManager; -import com.sap.sailing.datamining.dimensions.DimensionManagerProvider; -import com.sap.sailing.datamining.shared.DataTypes; -import com.sap.sailing.datamining.shared.DimensionIdentifier; -import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.components.ParallelFilter; -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.components.deprecated.NonFilteringFilter; -import com.sap.sse.datamining.impl.components.deprecated.PartitioningParallelFilter; -import com.sap.sse.datamining.impl.criterias.AndCompoundFilterCriteria; -import com.sap.sse.datamining.impl.criterias.CompoundFilterCriteria; -import com.sap.sse.datamining.impl.criterias.deprecated.DimensionValuesFilterCriteria; -import com.sap.sse.datamining.impl.workers.builders.FilterByCriteriaBuilder; -import com.sap.sse.datamining.workers.FiltrationWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public final class FilterFactory { - - private FilterFactory() { } - - public static ParallelFilter createParallelFilter(WorkerBuilder> workerBuilder, ThreadPoolExecutor executor) { - return new PartitioningParallelFilter(workerBuilder, executor); - } - - public static WorkerBuilder> createDimensionFilterBuilder(DataTypes dataType, Map> selection) { - FilterCriteria criteria = createAndCompoundDimensionFilterCritera(dataType, selection); - WorkerBuilder> builder = new FilterByCriteriaBuilder(criteria); - return builder; - } - - /** - * @return A filter that filters nothing. So the returning collection is the same as the given one. - */ - public static ParallelFilter createNonFilteringFilter() { - return new NonFilteringFilter(); - } - - private static FilterCriteria createAndCompoundDimensionFilterCritera(DataTypes dataType, Map> selection) { - DimensionManager dimensionManager = DimensionManagerProvider.getDimensionManagerFor(dataType); - CompoundFilterCriteria compoundCriteria = new AndCompoundFilterCriteria(); - - for (Entry> entry : selection.entrySet()) { - Dimension dimension = dimensionManager.getDimensionFor(entry.getKey()); - if (dimension != null) { - FilterCriteria criteria = createDimensionFilterCriteria(dimension, entry.getValue()); - compoundCriteria.addCriteria(criteria); - } - } - return compoundCriteria; - } - - @SuppressWarnings("unchecked") - private static FilterCriteria createDimensionFilterCriteria(Dimension dimension, Iterable values) { - return new DimensionValuesFilterCriteria(dimension, (Collection) values); - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/GrouperFactory.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/GrouperFactory.java deleted file mode 100644 index 2dc31ec2a59..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/GrouperFactory.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.sap.sailing.datamining.factories; - -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sailing.datamining.dimensions.DimensionManager; -import com.sap.sailing.datamining.dimensions.DimensionManagerProvider; -import com.sap.sailing.datamining.shared.DataTypes; -import com.sap.sailing.datamining.shared.DimensionIdentifier; -import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated; -import com.sap.sse.datamining.components.ParallelGrouper; -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.components.deprecated.PartitioningParallelGrouper; -import com.sap.sse.datamining.impl.workers.builders.MultiDimensionalGroupingWorkerBuilder; -import com.sap.sse.datamining.workers.GroupingWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public final class GrouperFactory { - - private GrouperFactory() { } - - public static ParallelGrouper createGrouper(QueryDefinitionDeprecated queryDefinition, ThreadPoolExecutor executor) { - WorkerBuilder> workerBuilder = createGroupingWorkerBuilder(queryDefinition); - return new PartitioningParallelGrouper(workerBuilder, executor); - } - - private static WorkerBuilder> createGroupingWorkerBuilder(QueryDefinitionDeprecated queryDefinition) { - switch (queryDefinition.getGrouperType()) { - case Dimensions: - return createMultiDimensionalGroupingWorkerBuilder(queryDefinition.getDataType(), queryDefinition.getDimensionsToGroupBy()); - } - throw new IllegalArgumentException("Not yet implemented for the given grouper type: " - + queryDefinition.getGrouperType().toString()); - } - - @SuppressWarnings("unchecked") - private static WorkerBuilder> createMultiDimensionalGroupingWorkerBuilder(DataTypes dataType, List dimensionsToGroupBy) { - DimensionManager dimensionManager = DimensionManagerProvider.getDimensionManagerFor(dataType); - Collection> dimensions = new LinkedHashSet>(); - for (DimensionIdentifier sharedDimension : dimensionsToGroupBy) { - Dimension dimension = (Dimension) dimensionManager.getDimensionFor(sharedDimension); - dimensions.add(dimension); - } - return new MultiDimensionalGroupingWorkerBuilder(dimensions); - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/WindStrengthClusterImpl.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/WindStrengthClusterImpl.java deleted file mode 100644 index 602cc87830c..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/WindStrengthClusterImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.sap.sailing.datamining.impl; - - -import com.sap.sailing.datamining.WindStrengthCluster; -import com.sap.sse.datamining.impl.data.deprecated.ClusterOfComparableImpl; - -public class WindStrengthClusterImpl extends ClusterOfComparableImpl implements WindStrengthCluster { - - public WindStrengthClusterImpl(String name, Double lowerRangeInBeaufort, Double upperRangeInBeaufort) { - super(name, upperRangeInBeaufort, lowerRangeInBeaufort); - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/AbstractLeaderboardGroupDataRetrievalWorker.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/AbstractLeaderboardGroupDataRetrievalWorker.java deleted file mode 100644 index 6288db145a6..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/AbstractLeaderboardGroupDataRetrievalWorker.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.sap.sailing.datamining.impl.components.deprecated; - -import java.util.ArrayList; -import java.util.Collection; - -import com.sap.sailing.datamining.data.HasTrackedLegContext; -import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; -import com.sap.sailing.datamining.impl.data.TrackedLegWithContext; -import com.sap.sailing.datamining.impl.data.TrackedLegOfCompetitorWithContext; -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CourseArea; -import com.sap.sailing.domain.base.Fleet; -import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.RaceColumn; -import com.sap.sailing.domain.common.impl.Util.Pair; -import com.sap.sailing.domain.leaderboard.Leaderboard; -import com.sap.sailing.domain.leaderboard.LeaderboardGroup; -import com.sap.sailing.domain.tracking.TrackedLeg; -import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; -import com.sap.sailing.domain.tracking.TrackedRace; -import com.sap.sse.datamining.impl.workers.retrievers.AbstractRetrievalWorker; -import com.sap.sse.datamining.workers.DataRetrievalWorker; - -public abstract class AbstractLeaderboardGroupDataRetrievalWorker - extends AbstractRetrievalWorker> - implements DataRetrievalWorker { - - private LeaderboardGroup group; - - @Override - public void setSource(LeaderboardGroup source) { - this.group = source; - } - - protected LeaderboardGroup getGroup() { - return group; - } - - private static Collection> retrieveDataTillTrackedLeg(LeaderboardGroup group) { - Collection> data = new ArrayList>(); - for (Leaderboard leaderboard : group.getLeaderboards()) { - CourseArea courseArea = leaderboard.getDefaultCourseArea(); - for (RaceColumn raceColumn : leaderboard.getRaceColumns()) { - for (Fleet fleet : raceColumn.getFleets()) { - TrackedRace trackedRace = raceColumn.getTrackedRace(fleet); - if (trackedRace != null) { - int legNumber = 1; - for (Leg leg : trackedRace.getRace().getCourse().getLegs()) { - TrackedLeg trackedLeg = trackedRace.getTrackedLeg(leg); - if (trackedLeg != null) { - HasTrackedLegContext dataContext = new TrackedLegWithContext(group, leaderboard, - courseArea, fleet, trackedRace, trackedLeg, legNumber); - data.add(new Pair(trackedLeg, dataContext)); - legNumber++; - } - } - } - } - } - } - return data; - } - - protected static Collection> retrieveDataTillTrackedLegOfCompetitor( - LeaderboardGroup group) { - Collection> data = new ArrayList>(); - Collection> baseData = retrieveDataTillTrackedLeg(group); - for (Pair baseDataEntry : baseData) { - TrackedLeg trackedLeg = baseDataEntry.getA(); - HasTrackedLegContext trackedLegContext = baseDataEntry.getB(); - for (Competitor competitor : trackedLegContext.getRace().getCompetitors()) { - TrackedLegOfCompetitor trackedLegOfCompetitor = trackedLeg.getTrackedLeg(competitor); - HasTrackedLegOfCompetitorContext dataContext = new TrackedLegOfCompetitorWithContext(trackedLegContext, - competitor); - data.add(new Pair(trackedLegOfCompetitor, - dataContext)); - } - } - return data; - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GPSFixLeaderboardGroupDataRetrievalWorker.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GPSFixLeaderboardGroupDataRetrievalWorker.java deleted file mode 100644 index 5eb4a26e43e..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GPSFixLeaderboardGroupDataRetrievalWorker.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.sap.sailing.datamining.impl.components.deprecated; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import com.sap.sailing.datamining.data.HasGPSFixContext; -import com.sap.sailing.datamining.data.GPSFixWithContext; -import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; -import com.sap.sailing.datamining.impl.data.GPSFixWithContext; -import com.sap.sailing.datamining.impl.gps_fix.GPSFixWithContextImpl; -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.impl.Util.Pair; -import com.sap.sailing.domain.tracking.GPSFixMoving; -import com.sap.sailing.domain.tracking.GPSFixTrack; -import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; - -public class GPSFixLeaderboardGroupDataRetrievalWorker extends AbstractLeaderboardGroupDataRetrievalWorker { - - @Override - public Collection doWork() { - Collection data = new ArrayList(); - Collection> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup()); - for (Pair baseDataEntry : baseData) { - HasGPSFixContext context = new GPSFixWithContext(baseDataEntry.getB()); - data.addAll(retrieveDataFor(context)); - } - return data; - } - - private Collection retrieveDataFor(HasGPSFixContext context) { - List data = new ArrayList(); - TrackedLegOfCompetitor trackedLegOfCompetitor = context.getTrackedLeg().getTrackedLeg(context.getCompetitor()); - GPSFixTrack competitorTrack = context.getTrackedRace().getTrack(context.getCompetitor()); - competitorTrack.lockForRead(); - try { - if (trackedLegOfCompetitor.getStartTime() != null && trackedLegOfCompetitor.getFinishTime() != null) { - for (GPSFixMoving gpsFix : competitorTrack.getFixes(trackedLegOfCompetitor.getStartTime(), true, trackedLegOfCompetitor.getFinishTime(), true)) { - data.add(new GPSFixWithContextImpl(gpsFix, context)); - } - } - } finally { - competitorTrack.unlockAfterRead(); - } - return data; - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GroupDividingParallelDataRetriever.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GroupDividingParallelDataRetriever.java deleted file mode 100644 index 603edaf75e0..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GroupDividingParallelDataRetriever.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.sap.sailing.datamining.impl.components.deprecated; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sailing.domain.leaderboard.LeaderboardGroup; -import com.sap.sailing.server.RacingEventService; -import com.sap.sse.datamining.components.ParallelDataRetriever; -import com.sap.sse.datamining.impl.components.deprecated.AbstractParallelComponent; -import com.sap.sse.datamining.workers.DataRetrievalWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -/** - * Retrieves elements of type DataType from all {@link LeaderboardGroup}s known to the - * {@link RacingEventSErvice} passed to this object's constructor. See also - * {@link RacingEventService#getLeaderboardGroups()}. - * - * @param - */ -public class GroupDividingParallelDataRetriever extends AbstractParallelComponent> - implements ParallelDataRetriever { - - private RacingEventService racingService; - private WorkerBuilder> workerBuilder; - - public GroupDividingParallelDataRetriever(RacingEventService racingService, WorkerBuilder> workerBuilder, ThreadPoolExecutor executor) { - super(executor); - this.racingService = racingService; - this.workerBuilder = workerBuilder; - } - - @Override - protected void setUpWorkersFor(Void v) { - for (LeaderboardGroup group : racingService.getLeaderboardGroups().values()) { - DataRetrievalWorker worker = workerBuilder.build(); - worker.setReceiver(this); - worker.setSource(group); - addWorker(worker); - } - } - - @Override - protected Collection finalizeData() { - Collection data = new ArrayList(); - for (Collection results : getResults()) { - data.addAll(results); - } - return Collections.unmodifiableCollection(new CopyOnWriteArrayList(data)); - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/SpeedInKnotsExtractionWorker.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/SpeedInKnotsExtractionWorker.java deleted file mode 100644 index ae7ab9b6ae4..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/SpeedInKnotsExtractionWorker.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.sap.sailing.datamining.impl.components.deprecated; - -import com.sap.sailing.domain.base.Moving; -import com.sap.sse.datamining.impl.workers.extractors.AbstractExtractionWorker; - -public class SpeedInKnotsExtractionWorker extends AbstractExtractionWorker { - - @Override - public Double extract(Moving dataEntry) { - return dataEntry.getSpeed().getKnots(); - } - -} \ No newline at end of file diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker.java deleted file mode 100644 index 16839eb2cc3..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.sap.sailing.datamining.impl.components.deprecated; - -import java.util.ArrayList; -import java.util.Collection; - -import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; -import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext; -import com.sap.sailing.datamining.impl.tracked_leg_of_competitor.TrackedLegOfCompetitorWithContextImpl; -import com.sap.sailing.domain.common.impl.Util.Pair; -import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; - -public class TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker extends AbstractLeaderboardGroupDataRetrievalWorker { - - @Override - public Collection doWork() { - Collection data = new ArrayList(); - Collection> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup()); - for (Pair baseDataEntry : baseData) { - data.add(new TrackedLegOfCompetitorWithContextImpl(baseDataEntry.getA(), baseDataEntry.getB())); - } - return data; - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixWithContextImpl.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixWithContextImpl.java deleted file mode 100644 index f640ed72741..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixWithContextImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.sap.sailing.datamining.impl.gps_fix; - -import com.sap.sailing.datamining.Clusters.WindStrength; -import com.sap.sailing.datamining.WindStrengthCluster; -import com.sap.sailing.datamining.data.HasGPSFixContext; -import com.sap.sailing.datamining.data.GPSFixWithContext; -import com.sap.sailing.domain.common.LegType; -import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.common.impl.DegreePosition; -import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; -import com.sap.sailing.domain.common.impl.MillisecondsTimePoint; -import com.sap.sailing.domain.tracking.GPSFixMoving; -import com.sap.sailing.domain.tracking.Wind; -import com.sap.sailing.domain.tracking.impl.GPSFixMovingImpl; - -public class GPSFixWithContextImpl extends GPSFixMovingImpl implements GPSFixWithContext { - private static final long serialVersionUID = -5551381302809417831L; - - private HasGPSFixContext context; - private Wind wind; - - private boolean windHasBeenInitialized; - - public GPSFixWithContextImpl(GPSFixMoving gpsFix, HasGPSFixContext context) { - super(copyPosition(gpsFix), copyTimePoint(gpsFix), copySpeed(gpsFix)); - this.context = context; - - windHasBeenInitialized= false; - } - - private static SpeedWithBearing copySpeed(GPSFixMoving gpsFix) { - return new KnotSpeedWithBearingImpl(gpsFix.getSpeed().getKnots(), gpsFix.getSpeed().getBearing()); - } - - private static TimePoint copyTimePoint(GPSFixMoving gpsFix) { - return new MillisecondsTimePoint(gpsFix.getTimePoint().asMillis()); - } - - private static Position copyPosition(GPSFixMoving gpsFix) { - return new DegreePosition(gpsFix.getPosition().getLatDeg(), gpsFix.getPosition().getLngDeg()); - } - - @Override - public String getRegattaName() { - return context.getRegatta().getName(); - } - - @Override - public String getRaceName() { - return context.getRace().getName(); - } - - @Override - public int getLegNumber() { - return context.getLegNumber(); - } - - @Override - public String getCourseAreaName() { - return context.getCourseArea().getName(); - } - - @Override - public String getFleetName() { - return context.getFleet().getName(); - } - - @Override - public String getBoatClassName() { - return context.getBoatClass().getName(); - } - - @Override - public Integer getYear() { - return context.getYear(); - } - - @Override - public LegType getLegType() { - return context.getLegType(); - } - - @Override - public String getCompetitorName() { - return context.getCompetitor().getName(); - } - - @Override - public String getCompetitorSailID() { - return context.getCompetitor().getBoat().getSailID(); - } - - @Override - public String getCompetitorNationality() { - return context.getCompetitor().getTeam().getNationality().getThreeLetterIOCAcronym(); - } - - @Override - public WindStrengthCluster getWindStrength() { - if (getWind() == null) { - return null; - } - - return WindStrength.getClusterFor(getWind().getBeaufort(), WindStrength.StandardClusters); - } - - public Wind getWind() { - if (!windHasBeenInitialized) { - wind = context.getTrackedRace().getWind(getPosition(), getTimePoint()); - windHasBeenInitialized = true; - } - - return wind; - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/DistanceTraveledExtractionWorker.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/DistanceTraveledExtractionWorker.java deleted file mode 100644 index ea79b20f949..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/DistanceTraveledExtractionWorker.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.sap.sailing.datamining.impl.tracked_leg_of_competitor; - -import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext; -import com.sap.sailing.domain.common.Distance; -import com.sap.sse.datamining.impl.workers.extractors.AbstractExtractionWorker; - -public class DistanceTraveledExtractionWorker extends AbstractExtractionWorker { - - @Override - public Double extract(TrackedLegOfCompetitorWithContext dataEntry) { - Distance distanceTraveled = dataEntry.getDistanceTraveled(); - return distanceTraveled != null ? distanceTraveled.getMeters() : 0; - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/TrackedLegOfCompetitorWithContextImpl.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/TrackedLegOfCompetitorWithContextImpl.java deleted file mode 100644 index e5ec19032d8..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/TrackedLegOfCompetitorWithContextImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.sap.sailing.datamining.impl.tracked_leg_of_competitor; - -import com.sap.sailing.datamining.WindStrengthCluster; -import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; -import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.LegType; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; - -public class TrackedLegOfCompetitorWithContextImpl implements TrackedLegOfCompetitorWithContext { - - private TrackedLegOfCompetitor trackedLegOfCompetitor; - private HasTrackedLegOfCompetitorContext context; - - public TrackedLegOfCompetitorWithContextImpl(TrackedLegOfCompetitor trackedLegOfCompetitor, HasTrackedLegOfCompetitorContext context) { - this.trackedLegOfCompetitor = trackedLegOfCompetitor; - this.context = context; - } - - @Override - public String getRegattaName() { - return context.getRegatta().getName(); - } - - @Override - public String getRaceName() { - return context.getRace().getName(); - } - - @Override - public int getLegNumber() { - return context.getLegNumber(); - } - - @Override - public String getCourseAreaName() { - return context.getCourseArea().getName(); - } - - @Override - public String getFleetName() { - return context.getFleet().getName(); - } - - @Override - public String getBoatClassName() { - return context.getCompetitor().getBoat().getBoatClass().getName(); - } - - @Override - public Integer getYear() { - return context.getYear(); - } - - @Override - public LegType getLegType() { - return context.getLegType(); - } - - @Override - public String getCompetitorName() { - return context.getCompetitor().getName(); - } - - @Override - public String getCompetitorSailID() { - return context.getCompetitor().getBoat().getSailID(); - } - - @Override - public String getCompetitorNationality() { - return context.getCompetitor().getTeam().getNationality().getThreeLetterIOCAcronym(); - } - - @Override - public WindStrengthCluster getWindStrength() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Distance getDistanceTraveled() { - TimePoint finishTime = trackedLegOfCompetitor.getFinishTime(); - return finishTime != null ? trackedLegOfCompetitor.getDistanceTraveled(finishTime) : null; - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/DataRetrieverWorkerBuilder.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/DataRetrieverWorkerBuilder.java deleted file mode 100644 index e0c5d0a5896..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/DataRetrieverWorkerBuilder.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.sap.sailing.datamining.impl.workers.builders.deprecated; - -import com.sap.sailing.datamining.impl.components.deprecated.GPSFixLeaderboardGroupDataRetrievalWorker; -import com.sap.sailing.datamining.impl.components.deprecated.TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker; -import com.sap.sailing.datamining.shared.DataTypes; -import com.sap.sailing.domain.leaderboard.LeaderboardGroup; -import com.sap.sse.datamining.workers.DataRetrievalWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class DataRetrieverWorkerBuilder implements WorkerBuilder> { - - private final DataTypes dataType; - - public DataRetrieverWorkerBuilder(DataTypes dataType) { - this.dataType = dataType; - } - - @Override - @SuppressWarnings("unchecked") - public DataRetrievalWorker build() { - switch (dataType) { - case GPSFix: - return (DataRetrievalWorker) new GPSFixLeaderboardGroupDataRetrievalWorker(); - case TrackedLegOfCompetitor: - return (DataRetrievalWorker) new TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker(); - } - throw new IllegalArgumentException("Not yet implemented for the given data type: " + dataType.toString()); - } - -} diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/ExtractionWorkerBuilder.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/ExtractionWorkerBuilder.java deleted file mode 100644 index 6e21a8e8a6a..00000000000 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/workers/builders/deprecated/ExtractionWorkerBuilder.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.sap.sailing.datamining.impl.workers.builders.deprecated; - -import com.sap.sailing.datamining.impl.components.deprecated.SpeedInKnotsExtractionWorker; -import com.sap.sailing.datamining.impl.tracked_leg_of_competitor.DistanceTraveledExtractionWorker; -import com.sap.sailing.datamining.shared.StatisticType; -import com.sap.sse.datamining.workers.ExtractionWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class ExtractionWorkerBuilder implements WorkerBuilder> { - - private StatisticType statisticType; - - public ExtractionWorkerBuilder(StatisticType statisticType) { - this.statisticType = statisticType; - } - - @Override - @SuppressWarnings("unchecked") - public ExtractionWorker build() { - switch (statisticType) { - case Speed: - return (ExtractionWorker) new SpeedInKnotsExtractionWorker(); - case Distance: - return (ExtractionWorker) new DistanceTraveledExtractionWorker(); - } - throw new IllegalArgumentException("Not yet implemented for the given statistic type: " - + statisticType.toString()); - } - -} diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/BaseDataType.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/BaseDataType.java deleted file mode 100644 index af1733b5ad3..00000000000 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/BaseDataType.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.sap.sse.datamining.shared.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface BaseDataType { - - public String groupKey(); - - public int level(); - -} diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/DataRetriever.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/DataRetriever.java deleted file mode 100644 index c7335954476..00000000000 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/DataRetriever.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.sap.sse.datamining.shared.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface DataRetriever { - - public String groupKey(); - - public int level(); - -} diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriterias.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriterias.java index 508bcbd03be..168918502f1 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriterias.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriterias.java @@ -11,11 +11,8 @@ import java.util.Collection; import org.junit.Test; import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.data.deprecated.ClusterOfComparable; import com.sap.sse.datamining.factories.FunctionFactory; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.impl.criterias.deprecated.SimpleRangeFilterCriteria; -import com.sap.sse.datamining.impl.data.deprecated.ClusterOfComparableImpl; import com.sap.sse.datamining.test.functions.test_classes.DataTypeWithContext; import com.sap.sse.datamining.test.functions.test_classes.DataTypeWithContextImpl; import com.sap.sse.datamining.test.util.FunctionTestsUtil; @@ -44,19 +41,6 @@ public class TestFilterCriterias { assertFalse("'Regatta (29ER)' shouldn't be matched", regexFilterCriteria.matches("Regatta (29ER)")); } - @Test - public void testRangeFilterCriteria() { - ClusterOfComparable cluster = new ClusterOfComparableImpl("Test", 3, 1); - FilterCriteria rangeFilterCriteria = new SimpleRangeFilterCriteria(cluster); - - assertTrue(rangeFilterCriteria.matches(1)); - assertTrue(rangeFilterCriteria.matches(2)); - assertTrue(rangeFilterCriteria.matches(3)); - - assertFalse(rangeFilterCriteria.matches(0)); - assertFalse(rangeFilterCriteria.matches(4)); - } - @Test public void testCompoundFilterCriterias() { StringRegexFilterCriteria startsWithBar = new StringRegexFilterCriteria("Bar.*"); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestDimensionGroupers.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestDimensionGroupers.java deleted file mode 100644 index 4d7c24012ee..00000000000 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestDimensionGroupers.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import org.junit.Test; - -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.data.deprecated.AbstractDimension; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.impl.CompoundGroupKey; -import com.sap.sse.datamining.shared.impl.GenericGroupKey; -import com.sap.sse.datamining.test.util.OpenDataReceiver; -import com.sap.sse.datamining.test.util.OpenGrouper; -import com.sap.sse.datamining.workers.GroupingWorker; - -public class TestDimensionGroupers { - - @Test - public void testGroupByDimension() { - Dimension crossSum = createCrossSumDimension(); - GroupingWorker groupByDimension = new OpenGrouper(Arrays.asList(crossSum)); - - OpenDataReceiver>> receiver = new OpenDataReceiver<>(); - groupByDimension.setReceiver(receiver); - - Collection data = Arrays.asList(11, 2, 13, 4, 22, 3, 21, 111); - groupByDimension.setDataToGroup(data); - - Map> expectedGroups = new HashMap>(); - Collection group = new ArrayList(); - group.add(11); - group.add(2); - expectedGroups.put(new GenericGroupKey("2"), group); - group = new ArrayList(); - group.add(3); - group.add(21); - group.add(111); - expectedGroups.put(new GenericGroupKey("3"), group); - group = new ArrayList(); - group.add(13); - group.add(4); - group.add(22); - expectedGroups.put(new GenericGroupKey("4"), group); - - groupByDimension.run(); - assertEquals(expectedGroups, receiver.result); - } - - @Test - public void testGroupKeyGeneration() { - Dimension first = new AbstractDimension("First") { - @Override - public String getDimensionValueFrom(Integer data) { - return "First"; - } - }; - Dimension second = new AbstractDimension("Second") { - @Override - public String getDimensionValueFrom(Integer data) { - return "Second"; - } - }; - Dimension third = new AbstractDimension("Third") { - @Override - public String getDimensionValueFrom(Integer data) { - return "Third"; - } - }; - - OpenGrouper grouper = new OpenGrouper(Arrays.asList(first, second, third)); - GroupKey expectedGroupKey = new CompoundGroupKey(new GenericGroupKey("First"), new CompoundGroupKey(new GenericGroupKey("Second"), new GenericGroupKey("Third"))); - assertEquals(expectedGroupKey, grouper.getGroupKey(1)); - } - - @Test - public void testGroupByMultipleDimensions() { - Dimension crossSum = createCrossSumDimension(); - Dimension signum = createSignumDimension(); - GroupingWorker groupByDimensions = new OpenGrouper(Arrays.asList(crossSum, signum)); - - OpenDataReceiver>> receiver = new OpenDataReceiver<>(); - groupByDimensions.setReceiver(receiver); - - Collection data = Arrays.asList(13, -4, 22, -3, 21, -111); - groupByDimensions.setDataToGroup(data); - - Map> expectedGroups = new HashMap>(); - Collection expectedGroup = new ArrayList(); - expectedGroup.add(-3); - expectedGroup.add(-111); - expectedGroups.put(new CompoundGroupKey(new GenericGroupKey("3"), new GenericGroupKey("-1")), expectedGroup); - expectedGroup = new ArrayList(); - expectedGroup.add(13); - expectedGroup.add(22); - expectedGroups.put(new CompoundGroupKey(new GenericGroupKey("4"), new GenericGroupKey("1")), expectedGroup); - expectedGroup = new ArrayList(); - expectedGroup.add(21); - expectedGroups.put(new CompoundGroupKey(new GenericGroupKey("3"), new GenericGroupKey("1")), expectedGroup); - expectedGroup = new ArrayList(); - expectedGroup.add(-4); - expectedGroups.put(new CompoundGroupKey(new GenericGroupKey("4"), new GenericGroupKey("-1")), expectedGroup); - - groupByDimensions.run(); - Map> groups = receiver.result; - for (Entry> expectedGroupEntry : expectedGroups.entrySet()) { - Collection group = groups.get(expectedGroupEntry.getKey()); - assertNotNull("No group for key: " + expectedGroupEntry.getKey().asString(), group); - assertEquals(expectedGroupEntry.getValue(), group); - } - } - - private Dimension createCrossSumDimension() { - return new AbstractDimension("Cross Sum") { - @Override - public String getDimensionValueFrom(Integer data) { - int crossSum = 0; - int value = Math.abs(data); - while (value > 0) { - crossSum += value % 10; - value /= 10; - } - return crossSum + ""; - } - }; - } - - private AbstractDimension createSignumDimension() { - return new AbstractDimension("Signum") { - @Override - public String getDimensionValueFrom(Integer data) { - return ((int) Math.signum(data)) + ""; - } - }; - } - -} diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestExtractors.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestExtractors.java deleted file mode 100644 index 5812757a77f..00000000000 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestExtractors.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Test; - -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.impl.GenericGroupKey; -import com.sap.sse.datamining.test.util.OpenDataReceiver; -import com.sap.sse.datamining.test.util.StringLengthExtractor; -import com.sap.sse.datamining.workers.ExtractionWorker; - -public class TestExtractors { - - @Test - public void testAbstractExtractor() { - ExtractionWorker lengthExtractor = new StringLengthExtractor(); - OpenDataReceiver>> receiver = new OpenDataReceiver>>(); - lengthExtractor.setReceiver(receiver); - - Collection dataEntries = Arrays.asList("Fu", "Bar", "Blub"); - Map> data = new HashMap>(); - data.put(new GenericGroupKey(100), dataEntries); - lengthExtractor.setDataToExtractFrom(data); - - - Collection expectedExtractedDataEntries = Arrays.asList(2, 3, 4); - Map> expectedExtractedData = new HashMap>(); - expectedExtractedData.put(new GenericGroupKey(100), expectedExtractedDataEntries); - lengthExtractor.run(); - assertEquals(expectedExtractedData, receiver.result); - } - -} diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestFilters.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestFilters.java deleted file mode 100644 index 550973e9607..00000000000 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/TestFilters.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import org.junit.Test; - -import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.data.deprecated.ClusterOfComparable; -import com.sap.sse.datamining.impl.criterias.deprecated.SimpleRangeFilterCriteria; -import com.sap.sse.datamining.impl.data.deprecated.ClusterOfComparableImpl; -import com.sap.sse.datamining.test.util.OpenDataReceiver; -import com.sap.sse.datamining.workers.FiltrationWorker; - -public class TestFilters { - - @Test - public void testFilterByCriteria() { - List data = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10); - - ClusterOfComparable cluster = new ClusterOfComparableImpl("Test", 5, 1); - FilterCriteria criteria = new SimpleRangeFilterCriteria(cluster); - FiltrationWorker filter = new CriteriaFiltrationWorker(criteria); - filter.setDataToFilter(data); - - OpenDataReceiver> receiver = new OpenDataReceiver<>(); - filter.setReceiver(receiver); - - filter.run(); - Collection expectedFilteredData = Arrays.asList(1, 2, 3, 4, 5); - assertEquals(expectedFilteredData, receiver.result); - } - -} diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/aggregators/TestAggregators.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/aggregators/TestAggregators.java deleted file mode 100644 index b8f0d038616..00000000000 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/workers/aggregators/TestAggregators.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Test; - -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SimpleIntegerSumAggregationHelper; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.impl.GenericGroupKey; -import com.sap.sse.datamining.test.util.OpenDataReceiver; -import com.sap.sse.datamining.workers.AggregationWorker; - -public class TestAggregators { - - @Test - public void testSumAggregator() { - AggregationWorker sumAggregator = new SumAggregationWorker(new SimpleIntegerSumAggregationHelper()); - Map> data = asDataToAggregate(1, 7, 6, 3); - sumAggregator.setDataToAggregate(data); - OpenDataReceiver> receiver = new OpenDataReceiver<>(); - sumAggregator.setReceiver(receiver); - - sumAggregator.run(); - Map expectedAggregation = asAggregatedData(17); - assertEquals(expectedAggregation, receiver.result); - - data = asDataToAggregate(7); - sumAggregator.setDataToAggregate(data); - sumAggregator.run(); - expectedAggregation = asAggregatedData(7); - assertEquals(expectedAggregation, receiver.result); - } - - @Test - public void testAverageAggregator() { - AggregationWorker averageAggregator = new SimpleIntegerArithmeticAverageAggregationWorker(); - Map> data = asDataToAggregate(1, 7, 6, 3); - averageAggregator.setDataToAggregate(data); - OpenDataReceiver> receiver = new OpenDataReceiver<>(); - averageAggregator.setReceiver(receiver); - - averageAggregator.run(); - Map expectedAggregation = asAggregatedData(4); - assertEquals(expectedAggregation, receiver.result); - } - - private Map> asDataToAggregate(Integer... values) { - Collection dataEntries = Arrays.asList(values); - Map> data = new HashMap>(); - data.put(new GenericGroupKey(100), dataEntries); - return data; - } - - private Map asAggregatedData(Integer value) { - Map data = new HashMap(); - data.put(new GenericGroupKey(100), value); - return data; - } - -} diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenDataReceiver.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenDataReceiver.java deleted file mode 100644 index a564868808a..00000000000 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenDataReceiver.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.sap.sse.datamining.test.util; - -import com.sap.sse.datamining.workers.WorkReceiver; - -public class OpenDataReceiver implements WorkReceiver { - - public ResultType result; - - @Override - public void receiveWork(ResultType result) { - this.result = result; - } - -} \ No newline at end of file diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenGrouper.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenGrouper.java deleted file mode 100644 index 4790f0e22e2..00000000000 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenGrouper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sap.sse.datamining.test.util; - -import java.util.Collection; - -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.workers.MultiDimensionalGroupingWorker; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.impl.GenericGroupKey; - -public class OpenGrouper extends MultiDimensionalGroupingWorker { - - public OpenGrouper(Collection> dimensions) { - super(dimensions); - } - - @Override - protected GroupKey createGroupKeyFor(DataType dataEntry, Dimension dimension) { - return new GenericGroupKey(dimension.getDimensionValueFrom(dataEntry)); - } - - public GroupKey getGroupKey(DataType dataEntry) { - return getGroupKeyFor(dataEntry); - } - -} \ No newline at end of file diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/StringLengthExtractor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/StringLengthExtractor.java deleted file mode 100644 index c7fbfd296f4..00000000000 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/StringLengthExtractor.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.sap.sse.datamining.test.util; - -import com.sap.sse.datamining.impl.workers.extractors.AbstractExtractionWorker; - -public class StringLengthExtractor extends AbstractExtractionWorker { - - @Override - public Integer extract(String dataEntry) { - return dataEntry.length(); - } - -} \ No newline at end of file diff --git a/java/com.sap.sse.datamining/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining/META-INF/MANIFEST.MF index 9efd0c25a72..0ccc142dc87 100644 --- a/java/com.sap.sse.datamining/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining/META-INF/MANIFEST.MF @@ -6,32 +6,20 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.osgi.framework;version="1.7.0" -Export-Package: com.sap.sse.datamining;uses:="com.sap.sse.datamining.functions,com.sap.sse.datamining.shared", - com.sap.sse.datamining.components;uses:="com.sap.sse.datamining.shared", - com.sap.sse.datamining.data.deprecated, - com.sap.sse.datamining.factories;uses:="com.sap.sse.datamining.impl.functions", - com.sap.sse.datamining.functions;uses:="com.sap.sse.datamining.shared.dto,com.sap.sse.datamining.i18n,com.sap.sse.datamining.components", - com.sap.sse.datamining.i18n;uses:="com.sap.sse.datamining.shared", - com.sap.sse.datamining.impl; - uses:="com.sap.sse.datamining, - com.sap.sse.datamining.functions, - org.osgi.framework, - com.sap.sse.datamining.shared, - com.sap.sse.datamining.i18n, - com.sap.sse.datamining.components", - com.sap.sse.datamining.impl.components;uses:="com.sap.sse.datamining.workers,com.sap.sse.datamining.shared,com.sap.sse.datamining.components", - com.sap.sse.datamining.impl.components.deprecated, - com.sap.sse.datamining.impl.criterias;uses:="com.sap.sse.datamining.data,com.sap.sse.datamining.functions,com.sap.sse.datamining.components", - com.sap.sse.datamining.impl.criterias.deprecated, - com.sap.sse.datamining.impl.data.deprecated;uses:="com.sap.sse.datamining.data", - com.sap.sse.datamining.impl.deprecated, - com.sap.sse.datamining.impl.i18n;uses:="com.sap.sse.datamining.shared,com.sap.sse.datamining.i18n", - com.sap.sse.datamining.impl.workers, - com.sap.sse.datamining.impl.workers.aggregators, - com.sap.sse.datamining.impl.workers.aggregators.helpers, - com.sap.sse.datamining.impl.workers.builders;uses:="com.sap.sse.datamining.workers,com.sap.sse.datamining.components", - com.sap.sse.datamining.impl.workers.extractors, - com.sap.sse.datamining.impl.workers.retrievers, - com.sap.sse.datamining.workers +Export-Package: com.sap.sse.datamining, + com.sap.sse.datamining.components, + com.sap.sse.datamining.data, + com.sap.sse.datamining.factories, + com.sap.sse.datamining.functions, + com.sap.sse.datamining.i18n, + com.sap.sse.datamining.impl, + com.sap.sse.datamining.impl.components, + com.sap.sse.datamining.impl.components.aggregators, + com.sap.sse.datamining.impl.criterias, + com.sap.sse.datamining.impl.data, + com.sap.sse.datamining.impl.functions, + com.sap.sse.datamining.impl.functions.components, + com.sap.sse.datamining.impl.functions.criterias, + com.sap.sse.datamining.impl.i18n Require-Bundle: com.sap.sse.datamining.shared;bundle-version="1.0.0" Bundle-Activator: com.sap.sse.datamining.impl.DataMiningActivator diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelAggregator.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelAggregator.java deleted file mode 100644 index 6c2d45a6f7a..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelAggregator.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.sap.sse.datamining.components; - -import java.util.Collection; -import java.util.Map; - -import com.sap.sse.datamining.shared.GroupKey; - -public interface ParallelAggregator extends ParallelComponent>, - Map> { - - public String getName(); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelComponent.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelComponent.java deleted file mode 100644 index 2f91f214029..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelComponent.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.sap.sse.datamining.components; - -import java.util.concurrent.Future; - -public interface ParallelComponent extends Future { - /** - * @return this object - */ - public ParallelComponent start(WorkingType data); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelDataRetriever.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelDataRetriever.java deleted file mode 100644 index c1ce09a9e45..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelDataRetriever.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.sap.sse.datamining.components; - -import java.util.Collection; - - -public interface ParallelDataRetriever extends ParallelComponent> { - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelExtractor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelExtractor.java deleted file mode 100644 index 1b2f597b5e8..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelExtractor.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.sap.sse.datamining.components; - -import java.util.Collection; -import java.util.Map; - -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.Unit; - -public interface ParallelExtractor extends ParallelComponent>, - Map>> { - - public Unit getUnit(); - - public int getValueDecimals(); - - public String getSignifier(); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelFilter.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelFilter.java deleted file mode 100644 index c7d20abc29c..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelFilter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sse.datamining.components; - -import java.util.Collection; - -public interface ParallelFilter extends ParallelComponent, Collection> { - -} \ No newline at end of file diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelGrouper.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelGrouper.java deleted file mode 100644 index b4a0b2e08fc..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/ParallelGrouper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.sap.sse.datamining.components; - -import java.util.Collection; -import java.util.Map; - -import com.sap.sse.datamining.shared.GroupKey; - -public interface ParallelGrouper extends ParallelComponent, Map>> { - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Cluster.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Cluster.java deleted file mode 100644 index aa2b0d7f4a1..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Cluster.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.sap.sse.datamining.data.deprecated; - -import java.util.Comparator; - -public interface Cluster { - - public String getName(); - public ValueType getUpperRange(); - public ValueType getLowerRange(); - - public boolean isInRange(ValueType value, Comparator comparator); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/ClusterOfComparable.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/ClusterOfComparable.java deleted file mode 100644 index 023512605e6..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/ClusterOfComparable.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sse.datamining.data.deprecated; - -public interface ClusterOfComparable> extends Cluster { - - public boolean isInRange(ValueType value); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Dimension.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Dimension.java deleted file mode 100644 index a6b2b56105d..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/deprecated/Dimension.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sse.datamining.data.deprecated; - -public interface Dimension { - - public String getName(); - - public ValueType getDimensionValueFrom(DataType dataEntry); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java deleted file mode 100644 index 0695142ab68..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.sap.sse.datamining.factories; - -import java.util.Locale; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sse.datamining.components.ParallelAggregator; -import com.sap.sse.datamining.i18n.DataMiningStringMessages; -import com.sap.sse.datamining.impl.components.deprecated.GroupDividingParallelAggregator; -import com.sap.sse.datamining.impl.workers.builders.AggregationWorkerBuilder; -import com.sap.sse.datamining.shared.components.AggregatorType; -import com.sap.sse.datamining.shared.components.ElementType; -import com.sap.sse.datamining.workers.AggregationWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public final class AggregatorFactory { - - private AggregatorFactory() { } - - public static ParallelAggregator createAggregator(DataMiningStringMessages stringMessages, - Locale locale, - ElementType valueType, AggregatorType aggregatorType, ThreadPoolExecutor executor) { - WorkerBuilder> workerBuilder = new AggregationWorkerBuilder(valueType, aggregatorType); - return new GroupDividingParallelAggregator(stringMessages.get(locale, aggregatorType.getNameMessage()), workerBuilder, executor); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/AbstractParallelComponent.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/AbstractParallelComponent.java deleted file mode 100644 index 9b6e40e9356..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/AbstractParallelComponent.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.sap.sse.datamining.impl.components.deprecated; - -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import com.sap.sse.datamining.components.ParallelComponent; -import com.sap.sse.datamining.workers.ComponentWorker; -import com.sap.sse.datamining.workers.WorkReceiver; - -public abstract class AbstractParallelComponent implements ParallelComponent, - WorkReceiver { - - private ThreadPoolExecutor executor; - private Collection> workers; - private Set results; - - public AbstractParallelComponent(ThreadPoolExecutor executor) { - this.executor = executor; - workers = new HashSet>(); - results = Collections.newSetFromMap(new ConcurrentHashMap()); - } - - @Override - public ParallelComponent start(WorkingType data) { - setUpWorkersFor(data); - for (ComponentWorker worker : workers) { - executor.execute(worker); - } - return this; - } - - protected abstract void setUpWorkersFor(WorkingType data); - - @Override - public void receiveWork(ResultType result) { - results.add(result); - } - - protected Collection getResults() { - return results; - } - - @Override - public ResultType get() throws InterruptedException, ExecutionException { - while (!isDone()) { - Thread.sleep(100); - } - return finalizeData(); - } - - @Override - public ResultType get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, - TimeoutException { - long timeRun = 0; - long timeoutInMillis = unit.toMillis(timeout); - while (!isDone() && timeRun < timeoutInMillis) { - Thread.sleep(100); - timeRun = timeRun + 100; - } - if (timeRun >= timeoutInMillis) { - throw new TimeoutException(); - } - return finalizeData(); - } - - protected abstract ResultType finalizeData(); - - @Override - public boolean isDone() { - for (ComponentWorker worker : workers) { - if (!worker.isDone()) { - return false; - } - } - return true; - } - - protected ThreadPoolExecutor getExecutor() { - return executor; - } - - protected void addWorker(ComponentWorker worker) { - workers.add(worker); - } - - @Override - public boolean cancel(boolean mayInterruptIfRunning) { - return false; - } - - @Override - public boolean isCancelled() { - return false; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelAggregator.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelAggregator.java deleted file mode 100644 index be6bd921a9c..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelAggregator.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.sap.sse.datamining.impl.components.deprecated; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sse.datamining.components.ParallelAggregator; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.workers.AggregationWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class GroupDividingParallelAggregator extends AbstractParallelComponent>, - Map> - implements ParallelAggregator { - - private String name; - - private WorkerBuilder> workerBuilder; - - public GroupDividingParallelAggregator(String name, WorkerBuilder> workerBuilder, ThreadPoolExecutor executor) { - super(executor); - this.name = name; - this.workerBuilder = workerBuilder; - } - - @Override - public String getName() { - return name; - } - - @Override - protected void setUpWorkersFor(Map> data) { - for (Entry> entry : data.entrySet()) { - AggregationWorker worker = workerBuilder.build(); - worker.setReceiver(this); - - Map> dataToExtractFrom = new HashMap>(); - dataToExtractFrom.put(entry.getKey(), entry.getValue()); - worker.setDataToAggregate(dataToExtractFrom); - - addWorker(worker); - } - } - - @Override - protected Map finalizeData() { - Map data = new HashMap(); - for (Map result : getResults()) { - data.putAll(result); - } - return data; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelExtractor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelExtractor.java deleted file mode 100644 index dc3b37dc8f9..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/GroupDividingParallelExtractor.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.sap.sse.datamining.impl.components.deprecated; - -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sse.datamining.components.ParallelExtractor; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.Unit; -import com.sap.sse.datamining.workers.ExtractionWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class GroupDividingParallelExtractor extends AbstractParallelComponent>, - Map>> - implements ParallelExtractor { - - private String signifier; - private Unit unit; - private int valueDecimals; - - private WorkerBuilder> workerBuilder; - - public GroupDividingParallelExtractor(String signifier, Unit unit, int valueDecimals, - WorkerBuilder> workerBuilder, ThreadPoolExecutor executor) { - super(executor); - this.signifier = signifier; - this.unit = unit; - this.valueDecimals = valueDecimals; - this.workerBuilder = workerBuilder; - } - - @Override - protected void setUpWorkersFor(Map> data) { - for (Entry> entry : data.entrySet()) { - ExtractionWorker worker = workerBuilder.build(); - worker.setReceiver(this); - - Map> dataToExtractFrom = new HashMap>(); - dataToExtractFrom.put(entry.getKey(), entry.getValue()); - worker.setDataToExtractFrom(dataToExtractFrom); - - addWorker(worker); - } - } - - @Override - protected Map> finalizeData() { - Map> data = new HashMap>(); - for (Map> result : getResults()) { - data.putAll(result); - } - return Collections.unmodifiableMap(new ConcurrentHashMap>(data)); - } - - @Override - public String getSignifier() { - return signifier; - } - - @Override - public Unit getUnit() { - return unit; - } - - @Override - public int getValueDecimals() { - return valueDecimals; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/NonFilteringFilter.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/NonFilteringFilter.java deleted file mode 100644 index d6ac73e08a0..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/NonFilteringFilter.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.sap.sse.datamining.impl.components.deprecated; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import com.sap.sse.datamining.components.ParallelFilter; - -public class NonFilteringFilter implements ParallelFilter { - - private Collection data; - - public NonFilteringFilter() { - data = new ArrayList(); - } - - @Override - public boolean cancel(boolean mayInterruptIfRunning) { - return false; - } - - @Override - public boolean isCancelled() { - return false; - } - - @Override - public boolean isDone() { - return true; - } - - @Override - public Collection get() { - return data; - } - - @Override - public Collection get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, - TimeoutException { - long timeRun = 0; - long timeoutInMillis = unit.toMillis(timeout); - while (!isDone() && timeRun < timeoutInMillis) { - Thread.sleep(100); - timeRun = timeRun + 100; - } - if (timeRun >= timeoutInMillis) { - throw new TimeoutException(); - } - return data; - } - - @Override - public ParallelFilter start(Collection data) { - this.data = data; - return this; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelFilter.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelFilter.java deleted file mode 100644 index 42986e8f77e..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelFilter.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.sap.sse.datamining.impl.components.deprecated; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sse.datamining.components.ParallelFilter; -import com.sap.sse.datamining.workers.FiltrationWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class PartitioningParallelFilter extends AbstractParallelComponent, Collection> - implements ParallelFilter { - - private final WorkerBuilder> workerBuilder; - - public PartitioningParallelFilter(WorkerBuilder> workerBuilder, ThreadPoolExecutor executor) { - super(executor); - this.workerBuilder = workerBuilder; - } - - @Override - protected void setUpWorkersFor(Collection data) { - List dataAsList = new ArrayList(data); - final int workerAmount = (int) (getExecutor().getCorePoolSize() * 0.5); - final int partitionSize = (int) Math.ceil((double) dataAsList.size() / workerAmount); - for (int i = 0; i < dataAsList.size(); i += partitionSize) { - List partition = dataAsList.subList(i, i + Math.min(partitionSize, dataAsList.size() - i)); - - FiltrationWorker worker = workerBuilder.build(); - worker.setReceiver(this); - worker.setDataToFilter(partition); - addWorker(worker); - } - } - - @Override - protected Collection finalizeData() { - Collection data = new ArrayList(); - for (Collection results : getResults()) { - data.addAll(results); - } - return Collections.unmodifiableCollection(new CopyOnWriteArrayList(data)); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelGrouper.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelGrouper.java deleted file mode 100644 index bbdfe61f248..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/deprecated/PartitioningParallelGrouper.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.sap.sse.datamining.impl.components.deprecated; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ThreadPoolExecutor; - -import com.sap.sse.datamining.components.ParallelGrouper; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.workers.GroupingWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class PartitioningParallelGrouper extends AbstractParallelComponent, Map>> - implements ParallelGrouper { - - private WorkerBuilder> workerBuilder; - - public PartitioningParallelGrouper(WorkerBuilder> workerBuilder, ThreadPoolExecutor executor) { - super(executor); - this.workerBuilder = workerBuilder; - } - - @Override - protected void setUpWorkersFor(Collection data) { - List dataAsList = new ArrayList(data); - final int workerAmount = (int) (getExecutor().getCorePoolSize() * 0.5); - final int partitionSize = (int) Math.ceil((double) dataAsList.size() / workerAmount); - for (int i = 0; i < dataAsList.size(); i += partitionSize) { - List partition = dataAsList.subList(i, i + Math.min(partitionSize, dataAsList.size() - i)); - - GroupingWorker worker = workerBuilder.build(); - worker.setReceiver(this); - worker.setDataToGroup(partition); - addWorker(worker); - } - } - - @Override - protected Map> finalizeData() { - Map> data = new HashMap>(); - for (Map> result : getResults()) { - data.putAll(result); - } - return Collections.unmodifiableMap(new ConcurrentHashMap>(data)); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionRegexFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionRegexFilterCriteria.java deleted file mode 100644 index 81400b726dd..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionRegexFilterCriteria.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.sap.sse.datamining.impl.criterias.deprecated; - -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.criterias.RegexFilterCriteria; - -public class DimensionRegexFilterCriteria extends RegexFilterCriteria { - - private Dimension dimension; - - public DimensionRegexFilterCriteria(String regex, Dimension dimension) { - super(regex); - this.dimension = dimension; - } - - @Override - protected String getValueToMatch(DataType data) { - return dimension.getDimensionValueFrom(data); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionValuesFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionValuesFilterCriteria.java deleted file mode 100644 index 30e24b0a8e2..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/DimensionValuesFilterCriteria.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.sap.sse.datamining.impl.criterias.deprecated; - -import java.util.Collection; -import java.util.HashSet; - -import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.data.deprecated.Dimension; - -public class DimensionValuesFilterCriteria implements FilterCriteria { - - private Dimension dimension; - private Collection values; - - public DimensionValuesFilterCriteria(Dimension dimension, Collection values) { - this.dimension = dimension; - this.values = new HashSet(values); - } - - @Override - public boolean matches(DataType data) { - ValueType dataValue = dimension.getDimensionValueFrom(data); - if (dataValue == null) { - return false; - } - - for (ValueType value : values) { - if (value.equals(dataValue)) { - return true; - } - } - return false; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/RangeFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/RangeFilterCriteria.java deleted file mode 100644 index 4c25392e3ec..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/RangeFilterCriteria.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sap.sse.datamining.impl.criterias.deprecated; - -import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.data.deprecated.ClusterOfComparable; - -public abstract class RangeFilterCriteria> implements FilterCriteria { - - private ClusterOfComparable cluster; - - public RangeFilterCriteria(ClusterOfComparable cluster) { - this.cluster = cluster; - } - - @Override - public boolean matches(DataType data) { - return isInRange(data); - } - - protected boolean isInRange(DataType data) { - return cluster.isInRange(getValue(data)); - } - - public abstract ValueType getValue(DataType data); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/SimpleRangeFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/SimpleRangeFilterCriteria.java deleted file mode 100644 index 49260be8484..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/deprecated/SimpleRangeFilterCriteria.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.sap.sse.datamining.impl.criterias.deprecated; - -import com.sap.sse.datamining.data.deprecated.ClusterOfComparable; - -public class SimpleRangeFilterCriteria> extends RangeFilterCriteria { - - public SimpleRangeFilterCriteria(ClusterOfComparable cluster) { - super(cluster); - } - - @Override - public DataType getValue(DataType data) { - return data; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/AbstractDimension.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/AbstractDimension.java deleted file mode 100644 index 83961fe5b4e..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/AbstractDimension.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.sap.sse.datamining.impl.data.deprecated; - -import com.sap.sse.datamining.data.deprecated.Dimension; - -public abstract class AbstractDimension implements Dimension { - - private String name; - - public AbstractDimension(String name) { - this.name = name; - } - - @Override - public String getName() { - return name; - } - - @Override - public String toString() { - return getName(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AbstractDimension other = (AbstractDimension) obj; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - return true; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterImpl.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterImpl.java deleted file mode 100644 index 968bfeac281..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.sap.sse.datamining.impl.data.deprecated; - -import java.util.Comparator; - -import com.sap.sse.datamining.data.deprecated.Cluster; - -public class ClusterImpl implements Cluster { - - private String name; - private ValueType upperRange; - private ValueType lowerRange; - - public ClusterImpl(String name, ValueType upperRange, ValueType lowerRange) { - this.name = name; - this.upperRange = upperRange; - this.lowerRange = lowerRange; - } - - @Override - public String getName() { - return name; - } - - @Override - public ValueType getUpperRange() { - return upperRange; - } - - @Override - public ValueType getLowerRange() { - return lowerRange; - } - - @Override - public boolean isInRange(ValueType value, Comparator comparator) { - return comparator.compare(value, getLowerRange()) >= 0 && comparator.compare(value, getUpperRange()) <= 0; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterOfComparableImpl.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterOfComparableImpl.java deleted file mode 100644 index 2c49655d88e..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/deprecated/ClusterOfComparableImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.sap.sse.datamining.impl.data.deprecated; - -import com.sap.sse.datamining.data.deprecated.ClusterOfComparable; - -public class ClusterOfComparableImpl> extends ClusterImpl implements - ClusterOfComparable { - - public ClusterOfComparableImpl(String name, ValueType upperRange, ValueType lowerRange) { - super(name, upperRange, lowerRange); - } - - @Override - public boolean isInRange(ValueType value) { - return value != null && value.compareTo(getLowerRange()) >= 0 && value.compareTo(getUpperRange()) <= 0; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/deprecated/QueryImpl.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/deprecated/QueryImpl.java deleted file mode 100644 index 2fca1f34d76..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/deprecated/QueryImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.sap.sse.datamining.impl.deprecated; - -import java.util.Collection; -import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import com.sap.sse.datamining.Query; -import com.sap.sse.datamining.components.ParallelAggregator; -import com.sap.sse.datamining.components.ParallelDataRetriever; -import com.sap.sse.datamining.components.ParallelExtractor; -import com.sap.sse.datamining.components.ParallelFilter; -import com.sap.sse.datamining.components.ParallelGrouper; -import com.sap.sse.datamining.i18n.DataMiningStringMessages; -import com.sap.sse.datamining.shared.AdditionalResultData; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.Message; -import com.sap.sse.datamining.shared.QueryResult; -import com.sap.sse.datamining.shared.impl.AdditionalResultDataImpl; -import com.sap.sse.datamining.shared.impl.QueryResultImpl; - -public class QueryImpl implements Query { - - private DataMiningStringMessages stringMessages; - private Locale locale; - - private ParallelDataRetriever retriever; - private ParallelFilter filter; - private ParallelGrouper grouper; - - private ParallelExtractor extractor; - private ParallelAggregator aggregator; - - public QueryImpl(DataMiningStringMessages stringMessages, Locale locale, ParallelDataRetriever retriever, ParallelFilter filter, - ParallelGrouper grouper, ParallelExtractor extractor, ParallelAggregator aggregator) { - this.stringMessages = stringMessages; - this.locale = locale; - this.retriever = retriever; - this.filter = filter; - this.grouper = grouper; - this.extractor = extractor; - this.aggregator = aggregator; - } - - @Override - public QueryResult run() throws InterruptedException, ExecutionException { - final long startTime = System.nanoTime(); - Collection retrievedData = retriever.start(null).get(); - Collection filteredData = filter.start(retrievedData).get(); - Map> groupedData = grouper.start(filteredData).get(); - Map> extractedData = extractor.start(groupedData).get(); - Map aggregatedData = aggregator.start(extractedData).get(); - final long endTime = System.nanoTime(); - - long calculationTimeInNanos = endTime - startTime; - AdditionalResultData additionalData = new AdditionalResultDataImpl(retrievedData.size(), filteredData.size(), - createResultSignifier(), extractor.getUnit(), extractor.getValueDecimals(), calculationTimeInNanos); - QueryResult result = new QueryResultImpl(aggregatedData, additionalData); - - return result; - } - - @Override - public QueryResult run(long timeout, TimeUnit unit) throws TimeoutException { - throw new UnsupportedOperationException("This query implementation is deprecated."); - } - - private String createResultSignifier() { - return stringMessages.get(locale, Message.ResultSignifier, extractor.getSignifier(), aggregator.getName()); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractComponentWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractComponentWorker.java deleted file mode 100644 index 0aa2865c56f..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractComponentWorker.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import com.sap.sse.datamining.workers.ComponentWorker; -import com.sap.sse.datamining.workers.WorkReceiver; - -public abstract class AbstractComponentWorker implements ComponentWorker { - - private WorkReceiver receiver; - private boolean done; - - @Override - public void run() { - receiver.receiveWork(doWork()); - done = true; - } - - protected abstract ResultType doWork(); - - @Override - public void setReceiver(WorkReceiver receiver) { - this.receiver = receiver; - } - - @Override - public boolean isDone() { - return done; - } - - protected WorkReceiver getReceiver() { - return receiver; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractFiltrationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractFiltrationWorker.java deleted file mode 100644 index 4fcbf51f093..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractFiltrationWorker.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import java.util.ArrayList; -import java.util.Collection; - -import com.sap.sse.datamining.workers.FiltrationWorker; - -public abstract class AbstractFiltrationWorker extends AbstractComponentWorker> - implements FiltrationWorker { - - private Collection data; - - @Override - protected Collection doWork() { - Collection filteredData = new ArrayList(); - for (DataType dataEntry : data) { - if (matches(dataEntry)) { - filteredData.add(dataEntry); - } - } - return filteredData; - } - - protected abstract boolean matches(DataType dataEntry); - - @Override - public void setDataToFilter(Collection data) { - this.data = data; - } - -} \ No newline at end of file diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractGroupingWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractGroupingWorker.java deleted file mode 100644 index 8e9e0c0b9b9..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/AbstractGroupingWorker.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.workers.GroupingWorker; - -public abstract class AbstractGroupingWorker extends AbstractComponentWorker>> - implements GroupingWorker { - - private Collection data; - - @Override - public void setDataToGroup(Collection data) { - this.data = data; - } - - @Override - protected Map> doWork() { - Map> groupedData = new HashMap>(); - for (DataType dataEntry : data) { - GroupKey key = getGroupKeyFor(dataEntry); - if (key != null) { - if (!groupedData.containsKey(key)) { - groupedData.put(key, new ArrayList()); - } - groupedData.get(key).add(dataEntry); - } - } - return groupedData; - } - - protected abstract GroupKey getGroupKeyFor(DataType dataEntry); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/CriteriaFiltrationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/CriteriaFiltrationWorker.java deleted file mode 100644 index c746bc3e96a..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/CriteriaFiltrationWorker.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import com.sap.sse.datamining.components.FilterCriteria; - -public class CriteriaFiltrationWorker extends AbstractFiltrationWorker { - - private FilterCriteria criteria; - - public CriteriaFiltrationWorker(FilterCriteria criteria) { - this.criteria = criteria; - } - - @Override - protected boolean matches(DataType dataEntry) { - return criteria.matches(dataEntry); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/MultiDimensionalGroupingWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/MultiDimensionalGroupingWorker.java deleted file mode 100644 index 9ddd8697ee5..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/MultiDimensionalGroupingWorker.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.sap.sse.datamining.impl.workers; - -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashSet; - -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.shared.impl.CompoundGroupKey; -import com.sap.sse.datamining.shared.impl.GenericGroupKey; - -public class MultiDimensionalGroupingWorker extends AbstractGroupingWorker { - - private Collection> dimensions; - - public MultiDimensionalGroupingWorker(Collection> dimensions) { - this.dimensions = new LinkedHashSet>(dimensions); - } - - @Override - protected GroupKey getGroupKeyFor(DataType dataEntry) { - return createCompoundGroupKey(dataEntry, dimensions.iterator()); - } - - private GroupKey createCompoundGroupKey(DataType dataEntry, Iterator> iterator) { - Dimension mainDimension = iterator.next(); - if (iterator.hasNext()) { - return new CompoundGroupKey(createGroupKeyFor(dataEntry, mainDimension), createCompoundGroupKey(dataEntry, iterator)); - } else { - return createGroupKeyFor(dataEntry, mainDimension); - } - } - - protected GroupKey createGroupKeyFor(DataType dataEntry, Dimension dimension){ - return new GenericGroupKey(dimension.getDimensionValueFrom(dataEntry)); - }; - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/AbstractAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/AbstractAggregationWorker.java deleted file mode 100644 index 3e59e41fa5c..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/AbstractAggregationWorker.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import com.sap.sse.datamining.impl.workers.AbstractComponentWorker; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.workers.AggregationWorker; - -public abstract class AbstractAggregationWorker extends AbstractComponentWorker> - implements AggregationWorker { - - private Map> data; - - @Override - protected Map doWork() { - Map aggregatedData = new HashMap(); - for (Entry> dataEntry : getData().entrySet()) { - AggregatedType aggregation = aggregate(dataEntry.getValue()); - aggregatedData.put(dataEntry.getKey(), aggregation); - } - return aggregatedData; - } - - protected abstract AggregatedType aggregate(Collection value); - - @Override - public void setDataToAggregate(Map> data) { - this.data = data; - } - - public Map> getData() { - return data; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/ArithmeticAverageAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/ArithmeticAverageAggregationWorker.java deleted file mode 100644 index a9b3c7a6e07..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/ArithmeticAverageAggregationWorker.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import java.util.Collection; - -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SumAggregationHelper; - -public abstract class ArithmeticAverageAggregationWorker - extends AbstractAggregationWorker { - - private SumAggregationHelper sumAggregator; - - public ArithmeticAverageAggregationWorker(SumAggregationHelper sumAggregator) { - this.sumAggregator = sumAggregator; - } - - @Override - protected AggregatedType aggregate(Collection data) { - return divide(sumAggregator.aggregate(data), data.size()); - } - - protected abstract AggregatedType divide(AggregatedType sum, int dataAmount); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/MedianAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/MedianAggregationWorker.java deleted file mode 100644 index cb937b0a6a3..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/MedianAggregationWorker.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -public abstract class MedianAggregationWorker, AggregatedType> - extends AbstractAggregationWorker { - - @Override - protected AggregatedType aggregate(Collection data) { - List dataAsList = new ArrayList(data); - Collections.sort(dataAsList); - - if (lengthIsEven(dataAsList)) { - AggregatedType value1 = getAggregatedValueFor(dataAsList.get((dataAsList.size() - 1) / 2)); - AggregatedType value2 = getAggregatedValueFor(dataAsList.get(((dataAsList.size() - 1) / 2) + 1)); - return divideByTwo(add(value1, value2)); - } else { - return getAggregatedValueFor(dataAsList.get((dataAsList.size()) / 2)); - } - } - - private boolean lengthIsEven(Collection data) { - return data.size() % 2 == 0; - } - - protected abstract AggregatedType getAggregatedValueFor(ExtractedType extractedType); - protected abstract AggregatedType add(AggregatedType value1, AggregatedType value2); - protected abstract AggregatedType divideByTwo(AggregatedType value); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleArithmeticAverageAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleArithmeticAverageAggregationWorker.java deleted file mode 100644 index b67281f923b..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleArithmeticAverageAggregationWorker.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SumAggregationHelper; - -public abstract class SimpleArithmeticAverageAggregationWorker extends ArithmeticAverageAggregationWorker { - - public SimpleArithmeticAverageAggregationWorker(SumAggregationHelper sumAggregator) { - super(sumAggregator); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleArithmeticAverageAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleArithmeticAverageAggregationWorker.java deleted file mode 100644 index b8fdc79d893..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleArithmeticAverageAggregationWorker.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SimpleDoubleSumAggregationHelper; -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SumAggregationHelper; - -public class SimpleDoubleArithmeticAverageAggregationWorker extends SimpleArithmeticAverageAggregationWorker { - - public SimpleDoubleArithmeticAverageAggregationWorker() { - super((SumAggregationHelper) new SimpleDoubleSumAggregationHelper()); - } - - @Override - protected Double divide(Double sum, int dataAmount) { - return sum / dataAmount; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleMedianAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleMedianAggregationWorker.java deleted file mode 100644 index cfbbeaf3664..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleDoubleMedianAggregationWorker.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -public class SimpleDoubleMedianAggregationWorker extends SimpleMedianAggregationWorker { - - @Override - protected Double add(Double value1, Double value2) { - return value1 + value2; - } - - @Override - protected Double divideByTwo(Double value) { - return value / 2.0; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerArithmeticAverageAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerArithmeticAverageAggregationWorker.java deleted file mode 100644 index e19af304686..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerArithmeticAverageAggregationWorker.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SimpleIntegerSumAggregationHelper; -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SumAggregationHelper; - -public class SimpleIntegerArithmeticAverageAggregationWorker extends SimpleArithmeticAverageAggregationWorker { - - public SimpleIntegerArithmeticAverageAggregationWorker() { - super((SumAggregationHelper) new SimpleIntegerSumAggregationHelper()); - } - - @Override - protected Integer divide(Integer sum, int dataAmount) { - return sum / dataAmount; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerMedianAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerMedianAggregationWorker.java deleted file mode 100644 index 3db031f238d..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleIntegerMedianAggregationWorker.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - - -public class SimpleIntegerMedianAggregationWorker extends SimpleMedianAggregationWorker { - - @Override - protected Integer add(Integer value1, Integer value2) { - return value1 + value2; - } - - @Override - protected Integer divideByTwo(Integer value) { - return value / 2; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleMedianAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleMedianAggregationWorker.java deleted file mode 100644 index 0db105d1d21..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SimpleMedianAggregationWorker.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -public abstract class SimpleMedianAggregationWorker> - extends MedianAggregationWorker { - - @Override - protected T getAggregatedValueFor(T extractedType) { - return extractedType; - } - -} \ No newline at end of file diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SumAggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SumAggregationWorker.java deleted file mode 100644 index 9fd64e957cc..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/SumAggregationWorker.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators; - -import java.util.Collection; - -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SumAggregationHelper; - -public class SumAggregationWorker - extends AbstractAggregationWorker { - - private SumAggregationHelper aggregator; - - public SumAggregationWorker(SumAggregationHelper aggregator) { - this.aggregator = aggregator; - } - - @Override - protected AggregatedType aggregate(Collection data) { - return aggregator.aggregate(data); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleDoubleSumAggregationHelper.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleDoubleSumAggregationHelper.java deleted file mode 100644 index 1a4501e1204..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleDoubleSumAggregationHelper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators.helpers; - - -public class SimpleDoubleSumAggregationHelper extends SimpleSumAggregationHelper { - - @Override - protected Double add(Double value1, Double value2) { - return value1 + value2; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleIntegerSumAggregationHelper.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleIntegerSumAggregationHelper.java deleted file mode 100644 index f42c5fb5ffc..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleIntegerSumAggregationHelper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators.helpers; - - -public class SimpleIntegerSumAggregationHelper extends SimpleSumAggregationHelper { - - @Override - protected Integer add(Integer value1, Integer value2) { - return value1 + value2; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleSumAggregationHelper.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleSumAggregationHelper.java deleted file mode 100644 index a7c24e49abc..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SimpleSumAggregationHelper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators.helpers; - - -public abstract class SimpleSumAggregationHelper extends SumAggregationHelper { - - @Override - protected T getValueFor(T extractedValue) { - return extractedValue; - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SumAggregationHelper.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SumAggregationHelper.java deleted file mode 100644 index 130120725a4..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/aggregators/helpers/SumAggregationHelper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.sap.sse.datamining.impl.workers.aggregators.helpers; - -import java.util.Collection; -import java.util.Iterator; - -public abstract class SumAggregationHelper { - - public AggregatedType aggregate(Collection data) { - Iterator dataIterator = data.iterator(); - AggregatedType sum = dataIterator.hasNext() ? getValueFor(dataIterator.next()) : null; - - while (dataIterator.hasNext()) { - sum = add(sum, getValueFor(dataIterator.next())); - } - return sum; - } - - protected abstract AggregatedType add(AggregatedType value1, AggregatedType value2); - protected abstract AggregatedType getValueFor(ExtractedType extractedValue); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java deleted file mode 100644 index 34efabd469c..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.sap.sse.datamining.impl.workers.builders; - -import com.sap.sse.datamining.impl.workers.aggregators.SimpleDoubleArithmeticAverageAggregationWorker; -import com.sap.sse.datamining.impl.workers.aggregators.SimpleDoubleMedianAggregationWorker; -import com.sap.sse.datamining.impl.workers.aggregators.SimpleIntegerArithmeticAverageAggregationWorker; -import com.sap.sse.datamining.impl.workers.aggregators.SimpleIntegerMedianAggregationWorker; -import com.sap.sse.datamining.impl.workers.aggregators.SumAggregationWorker; -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SimpleDoubleSumAggregationHelper; -import com.sap.sse.datamining.impl.workers.aggregators.helpers.SimpleIntegerSumAggregationHelper; -import com.sap.sse.datamining.shared.components.AggregatorType; -import com.sap.sse.datamining.shared.components.ElementType; -import com.sap.sse.datamining.workers.AggregationWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class AggregationWorkerBuilder implements WorkerBuilder> { - - private ElementType valueType; - private AggregatorType aggregatorType; - - public AggregationWorkerBuilder(ElementType valueType, AggregatorType aggregatorType) { - this.valueType = valueType; - this.aggregatorType = aggregatorType; - } - - @Override - @SuppressWarnings("unchecked") - public AggregationWorker build() { - switch (valueType) { - case Double: - return (AggregationWorker) createDoubleAggregationWorker(aggregatorType); - case Integer: - return (AggregationWorker) createIntegerAggregationWorker(aggregatorType); - } - throw new IllegalArgumentException("Not yet implemented for the given statistics value type: " - + valueType.toString()); - } - - public static AggregationWorker createIntegerAggregationWorker(AggregatorType aggregatorType) { - switch (aggregatorType) { - case Average: - return new SimpleIntegerArithmeticAverageAggregationWorker(); - case Sum: - return new SumAggregationWorker(new SimpleIntegerSumAggregationHelper()); - case Median: - return new SimpleIntegerMedianAggregationWorker(); - } - throw new IllegalArgumentException("Not yet implemented for the given aggregator type: " - + aggregatorType.toString()); - } - - public static AggregationWorker createDoubleAggregationWorker(AggregatorType aggregatorType) { - switch (aggregatorType) { - case Average: - return new SimpleDoubleArithmeticAverageAggregationWorker(); - case Sum: - return new SumAggregationWorker(new SimpleDoubleSumAggregationHelper()); - case Median: - return new SimpleDoubleMedianAggregationWorker(); - } - throw new IllegalArgumentException("Not yet implemented for the given aggregator type: " - + aggregatorType.toString()); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/FilterByCriteriaBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/FilterByCriteriaBuilder.java deleted file mode 100644 index 1011243c76c..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/FilterByCriteriaBuilder.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.sap.sse.datamining.impl.workers.builders; - -import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.impl.workers.CriteriaFiltrationWorker; -import com.sap.sse.datamining.workers.FiltrationWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class FilterByCriteriaBuilder implements WorkerBuilder> { - - private FilterCriteria criteria; - - public FilterByCriteriaBuilder(FilterCriteria criteria) { - this.criteria = criteria; - } - - @Override - public FiltrationWorker build() { - return new CriteriaFiltrationWorker(criteria); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/MultiDimensionalGroupingWorkerBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/MultiDimensionalGroupingWorkerBuilder.java deleted file mode 100644 index 9364a29d180..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/MultiDimensionalGroupingWorkerBuilder.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.sap.sse.datamining.impl.workers.builders; - -import java.util.Collection; - -import com.sap.sse.datamining.data.deprecated.Dimension; -import com.sap.sse.datamining.impl.workers.MultiDimensionalGroupingWorker; -import com.sap.sse.datamining.workers.GroupingWorker; -import com.sap.sse.datamining.workers.WorkerBuilder; - -public class MultiDimensionalGroupingWorkerBuilder implements WorkerBuilder> { - - private Collection> dimensions; - - public MultiDimensionalGroupingWorkerBuilder(Collection> dimensions) { - this.dimensions = dimensions; - } - - @Override - public GroupingWorker build() { - return new MultiDimensionalGroupingWorker(dimensions); - } - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/extractors/AbstractExtractionWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/extractors/AbstractExtractionWorker.java deleted file mode 100644 index edc24024aed..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/extractors/AbstractExtractionWorker.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.sap.sse.datamining.impl.workers.extractors; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import com.sap.sse.datamining.impl.workers.AbstractComponentWorker; -import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.workers.ExtractionWorker; - -public abstract class AbstractExtractionWorker extends AbstractComponentWorker>> - implements ExtractionWorker { - - private Map> data; - - @Override - public void setDataToExtractFrom(Map> data) { - this.data = data; - } - - @Override - protected Map> doWork() { - Map> extractedData = new HashMap>(); - for (Entry> dataEntry : data.entrySet()) { - GroupKey key = dataEntry.getKey(); - if (!extractedData.containsKey(key)) { - extractedData.put(key, new ArrayList()); - }; - - for (DataType dateElement : dataEntry.getValue()) { - ExtractedType extractedDataElement = extract(dateElement); - if (extractedDataElement != null) { - extractedData.get(key).add(extractedDataElement); - } - } - } - return extractedData; - } - - protected abstract ExtractedType extract(DataType dataEntry); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/retrievers/AbstractRetrievalWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/retrievers/AbstractRetrievalWorker.java deleted file mode 100644 index 1d305939d87..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/retrievers/AbstractRetrievalWorker.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sse.datamining.impl.workers.retrievers; - -import com.sap.sse.datamining.impl.workers.AbstractComponentWorker; - -//Empty class to decouple the specific domain bundles from the domain independent sse bundle -public abstract class AbstractRetrievalWorker - extends AbstractComponentWorker { - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/AggregationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/AggregationWorker.java deleted file mode 100644 index 43f807a68a5..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/AggregationWorker.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.sap.sse.datamining.workers; - -import java.util.Collection; -import java.util.Map; - -import com.sap.sse.datamining.shared.GroupKey; - -public interface AggregationWorker extends ComponentWorker> { - - public void setDataToAggregate(Map> data); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ComponentWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ComponentWorker.java deleted file mode 100644 index 0f16d168aa9..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ComponentWorker.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sse.datamining.workers; - -public interface ComponentWorker extends Runnable { - - public void setReceiver(WorkReceiver receiver); - - public boolean isDone(); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/DataRetrievalWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/DataRetrievalWorker.java deleted file mode 100644 index 93e3c0a018e..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/DataRetrievalWorker.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sse.datamining.workers; - -import java.util.Collection; - -public interface DataRetrievalWorker extends ComponentWorker> { - - public void setSource(SourceType source); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ExtractionWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ExtractionWorker.java deleted file mode 100644 index d28c0526298..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/ExtractionWorker.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.sap.sse.datamining.workers; - -import java.util.Collection; -import java.util.Map; - -import com.sap.sse.datamining.shared.GroupKey; - -public interface ExtractionWorker extends ComponentWorker>> { - - public void setDataToExtractFrom(Map> data); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/FiltrationWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/FiltrationWorker.java deleted file mode 100644 index 14972220c31..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/FiltrationWorker.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sse.datamining.workers; - -import java.util.Collection; - -public interface FiltrationWorker extends ComponentWorker> { - - public void setDataToFilter(Collection data); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/GroupingWorker.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/GroupingWorker.java deleted file mode 100644 index 6bfa6a9eb97..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/GroupingWorker.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.sap.sse.datamining.workers; - -import java.util.Collection; -import java.util.Map; - -import com.sap.sse.datamining.shared.GroupKey; - -public interface GroupingWorker extends ComponentWorker>> { - - public void setDataToGroup(Collection data); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkReceiver.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkReceiver.java deleted file mode 100644 index ffe73121862..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkReceiver.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sse.datamining.workers; - -public interface WorkReceiver { - - public void receiveWork(ResultType result); - -} diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkerBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkerBuilder.java deleted file mode 100644 index 04c1be4c267..00000000000 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/workers/WorkerBuilder.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.sap.sse.datamining.workers; - - -public interface WorkerBuilder { - - public WorkerType build(); - -}