From 2a7668fbf5a020cadf88bbf819588ce180f9a83b Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Fri, 4 Sep 2015 08:35:29 +0200 Subject: [PATCH] more detailed measuring time of accumulation in TransmissionEngineDistribution for performance testing --- .../description/TransmissionEngineDistribution.java | 9 +++++++-- .../api/service/TransmissionEngineDistributionTest.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java index dc075760e3..0993946c36 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java @@ -335,14 +335,19 @@ public class TransmissionEngineDistribution { //TODO extends IoBase? accumulateByArea(superAreas, classification, new SubProgressMonitor(monitor, 200), mode.equals(AggregationMode.byAreas) || mode.equals(AggregationMode.byAreasAndRanks)); } + double end1 = System.currentTimeMillis(); + logger.info("Time elapsed for accumulateByArea() : " + (end1 - start) / (1000) + "s"); + + double start2 = System.currentTimeMillis(); monitor.subTask("Accumulating distributions to higher ranks"); if (mode.equals(AggregationMode.byRanks) || mode.equals(AggregationMode.byAreasAndRanks)) { accumulateByRank(lowerRank, upperRank, classification, new SubProgressMonitor(monitor, 200), mode.equals(AggregationMode.byRanks)); } - double end = System.currentTimeMillis(); - logger.info("Time elapsed for accumulation: " + (end - start) / (1000) + "s"); + double end2 = System.currentTimeMillis(); + logger.info("Time elapsed for accumulateByRank() : " + (end2 - start2) / (1000) + "s"); + logger.info("Time elapsed for accumulate(): " + (end2 - start) / (1000) + "s"); } /** diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.java index 98e5cde5b4..44ba2ac8aa 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TransmissionEngineDistributionTest.java @@ -185,7 +185,7 @@ public class TransmissionEngineDistributionTest extends CdmTransactionalIntegrat Taxon lapsana_communis_alpina = (Taxon) taxonService.load(T_LAPSANA_COMMUNIS_ALPINA_UUID); assertEquals(1, lapsana_communis_alpina.getDescriptions().size()); - engine.accumulate(AggregationMode.byAreasAndRanks, superAreas, lowerRank, upperRank, classification, null); + engine.accumulate(AggregationMode.byAreas, superAreas, lowerRank, upperRank, classification, null); lapsana_communis_alpina = (Taxon) taxonService.load(T_LAPSANA_COMMUNIS_ALPINA_UUID); assertEquals(2, lapsana_communis_alpina.getDescriptions().size()); -- 2.34.1