diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/logging')
30 files changed, 127 insertions, 98 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java b/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java index 36ed3d64..81d6f96d 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java +++ b/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java b/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java index 53540ec2..f18dceae 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java +++ b/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/ErrorFormatter.java b/src/de/lmu/ifi/dbs/elki/logging/ErrorFormatter.java index b4530c25..8888bdd1 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/ErrorFormatter.java +++ b/src/de/lmu/ifi/dbs/elki/logging/ErrorFormatter.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/Logging.java b/src/de/lmu/ifi/dbs/elki/logging/Logging.java index b9cbc16d..99b6152b 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/Logging.java +++ b/src/de/lmu/ifi/dbs/elki/logging/Logging.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -27,8 +27,12 @@ import java.util.HashMap; import java.util.logging.LogRecord; import java.util.logging.Logger; +import de.lmu.ifi.dbs.elki.logging.progress.AbstractProgress; +import de.lmu.ifi.dbs.elki.logging.progress.FiniteProgress; +import de.lmu.ifi.dbs.elki.logging.progress.IndefiniteProgress; import de.lmu.ifi.dbs.elki.logging.progress.Progress; import de.lmu.ifi.dbs.elki.logging.progress.ProgressLogRecord; +import de.lmu.ifi.dbs.elki.logging.progress.StepProgress; import de.lmu.ifi.dbs.elki.logging.statistics.Counter; import de.lmu.ifi.dbs.elki.logging.statistics.Duration; import de.lmu.ifi.dbs.elki.logging.statistics.MillisTimeDuration; @@ -111,6 +115,19 @@ public class Logging { public Level(String name, int value) { super(name, value); } + + /** + * Parse a logging level. + * + * @param levelName Name of level to parse. + * @return {@link java.util.logging.Level} level + */ + public static java.util.logging.Level parse(String levelName) { + // While this is a pass-through to the parent class, + // it ensures our own level have been added. + // Otherwise, levels such as "STATISTICS" might not work! + return java.util.logging.Level.parse(levelName); + } } /** @@ -140,7 +157,7 @@ public class Logging { */ public synchronized static Logging getLogger(final String name) { Logging logger = loggers.get(name); - if (logger == null) { + if(logger == null) { logger = new Logging(Logger.getLogger(name)); loggers.put(name, logger); } @@ -607,6 +624,67 @@ public class Logging { } /** + * Increment a progress (unless {@code null}). + * + * @param prog Progress to increment, may be {@code null}. + */ + public void incrementProcessed(AbstractProgress prog) { + if(prog != null) { + prog.incrementProcessed(this); + } + } + + /** + * Increment a progress (unless {@code null}). + * + * @param prog Progress to complete, may be {@code null}. + */ + public void ensureCompleted(FiniteProgress prog) { + if(prog != null) { + prog.ensureCompleted(this); + } + } + + /** + * Begin a new algorithm step (unless {@code null}). + * + * <b>Important:</b> Do not use this method when the parameter are not static. + * In these cases, check whether logging is enabled first, to avoid computing + * method parameters! + * + * @param prog Progress to increment, may be {@code null}. + * @param step Step number + * @param title Step title + */ + public void beginStep(StepProgress prog, int step, String title) { + if(prog != null) { + prog.beginStep(step, title, this); + } + } + + /** + * Finish a progress (unless {@code null}). + * + * @param prog Progress to complete, may be {@code null}. + */ + public void setCompleted(StepProgress prog) { + if(prog != null) { + prog.setCompleted(this); + } + } + + /** + * Finish a progress (unless {@code null}). + * + * @param prog Progress to complete, may be {@code null}. + */ + public void setCompleted(IndefiniteProgress prog) { + if(prog != null) { + prog.setCompleted(this); + } + } + + /** * Log a statistics object. * * @param stats Statistics object to report. diff --git a/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java b/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java index 1c609b80..dfe5df9a 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java +++ b/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java b/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java index ce62f419..a7980532 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java +++ b/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java b/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java index 6df68224..7ec0320d 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java +++ b/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -36,8 +36,7 @@ import de.lmu.ifi.dbs.elki.logging.progress.ProgressLogRecord; */ public class MessageFormatter extends Formatter { /** - * Provides a message formatter to simply retrieve the message of an - * LogRecord. + * Constructor. */ public MessageFormatter() { super(); diff --git a/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java b/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java index 7c618ec1..9dc26247 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java +++ b/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/package-info.java b/src/de/lmu/ifi/dbs/elki/logging/package-info.java index 8e20cb09..8c9547f6 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/logging/package-info.java @@ -56,7 +56,7 @@ if (verbose) { This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures -Copyright (C) 2013 +Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java index ce97b84c..18612c87 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -75,7 +75,7 @@ public abstract class AbstractProgress implements Progress { * @param processed the number of items already processed at a time being * @throws IllegalArgumentException if an invalid value was passed. */ - public void setProcessed(int processed) throws IllegalArgumentException { + protected void setProcessed(int processed) throws IllegalArgumentException { this.processed.set(processed); } @@ -119,16 +119,7 @@ public abstract class AbstractProgress implements Progress { */ @Override public String toString() { - StringBuilder message = new StringBuilder(); - appendToBuffer(message); - return message.toString(); - } - - /** - * Increment the processed counter. - */ - public void incrementProcessed() { - this.processed.incrementAndGet(); + return appendToBuffer(new StringBuilder()).toString(); } /** @@ -137,7 +128,7 @@ public abstract class AbstractProgress implements Progress { * @param logger Logger to report to. */ public void incrementProcessed(Logging logger) { - incrementProcessed(); + this.processed.incrementAndGet(); if(testLoggingRate()) { logger.progress(this); } diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java index 83419ef4..c9cae77f 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -47,13 +47,12 @@ public class FiniteProgress extends AbstractProgress { private final int totalLength; /** - * A progress object for a given overall number of items to process. + * Constructor. * * @param task the name of the task * @param total the overall number of items to process */ - @Deprecated - public FiniteProgress(String task, int total) { + protected FiniteProgress(String task, int total) { super(task); this.total = total; this.totalLength = Integer.toString(total).length(); @@ -81,7 +80,7 @@ public class FiniteProgress extends AbstractProgress { * the overall number of items to process */ @Override - public void setProcessed(int processed) throws IllegalArgumentException { + protected void setProcessed(int processed) throws IllegalArgumentException { if (processed > total) { throw new IllegalArgumentException(processed + " exceeds total: " + total); } diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java index 673ceea7..bd00a328 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -37,16 +37,6 @@ public class IndefiniteProgress extends AbstractProgress { private boolean completed = false; /** - * Constructor. - * - * @param task Task name. - */ - @Deprecated - public IndefiniteProgress(String task) { - super(task); - } - - /** * Constructor with logging. * * @param task Task name. @@ -79,14 +69,6 @@ public class IndefiniteProgress extends AbstractProgress { } /** - * Set the completion flag. - */ - @Deprecated - public void setCompleted() { - this.completed = true; - } - - /** * Set the completion flag and log it * * @param logger Logger to report to. diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/MutableProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/MutableProgress.java index a89d7b43..8b653592 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/MutableProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/MutableProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java index bb2151ba..a1efc65b 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java index 8512ba9f..348b39f6 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java index c44fd1fd..dabb279e 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java index ee1225b6..26a5aaf4 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -42,7 +42,6 @@ public class StepProgress extends FiniteProgress { * * @param total Total number of steps. */ - @SuppressWarnings("deprecation") public StepProgress(int total) { super("Step", total); } @@ -54,7 +53,6 @@ public class StepProgress extends FiniteProgress { * @param task Task title * @param total Total number of steps. */ - @SuppressWarnings("deprecation") public StepProgress(String task, int total) { super(task, total); } @@ -75,18 +73,6 @@ public class StepProgress extends FiniteProgress { } /** - * Do a new step. - * - * @param step Step number - * @param stepTitle Step title - */ - @Deprecated - public void beginStep(int step, String stepTitle) { - setProcessed(step - 1); - this.stepTitle = stepTitle; - } - - /** * Do a new step and log it * * @param step Step number @@ -100,14 +86,6 @@ public class StepProgress extends FiniteProgress { } /** - * Mark the progress as completed. - */ - @Deprecated - public void setCompleted() { - setProcessed(getTotal()); - } - - /** * Mark the progress as completed and log it. * * @param logger Logger to report to. diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java b/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java index 61c53d8d..ab1a44c9 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java @@ -5,7 +5,7 @@ This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures -Copyright (C) 2013 +Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/AbstractStatistic.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/AbstractStatistic.java index 8f0b7939..a88056fe 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/AbstractStatistic.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/AbstractStatistic.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/AtomicLongCounter.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/AtomicLongCounter.java index e200d93e..be898904 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/AtomicLongCounter.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/AtomicLongCounter.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/Counter.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/Counter.java index 0a39f1bd..893ff120 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/Counter.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/Counter.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/DoubleStatistic.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/DoubleStatistic.java index 7754ccf1..25383c12 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/DoubleStatistic.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/DoubleStatistic.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -23,8 +23,6 @@ package de.lmu.ifi.dbs.elki.logging.statistics; along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import de.lmu.ifi.dbs.elki.utilities.FormatUtil; - /** * Trivial double-valued statistic. * @@ -67,6 +65,6 @@ public class DoubleStatistic extends AbstractStatistic { @Override public String formatValue() { - return FormatUtil.NF.format(value); + return Double.toString(value); } } diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/Duration.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/Duration.java index 24799408..279cd686 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/Duration.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/Duration.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -34,12 +34,12 @@ public interface Duration extends Statistic { /** * Start the timer. */ - void begin(); + Duration begin(); /** * Finish the timer. */ - void end(); + Duration end(); /** * Get the begin of the interval. diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/LongStatistic.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/LongStatistic.java index 5ac805e8..15ce1ec0 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/LongStatistic.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/LongStatistic.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/MillisTimeDuration.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/MillisTimeDuration.java index 9f2cfd64..11e30724 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/MillisTimeDuration.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/MillisTimeDuration.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -44,13 +44,15 @@ public class MillisTimeDuration extends AbstractStatistic implements Duration { } @Override - public void begin() { + public MillisTimeDuration begin() { begin = System.currentTimeMillis(); + return this; } @Override - public void end() { + public MillisTimeDuration end() { end = System.currentTimeMillis(); + return this; } @Override diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/NanoDuration.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/NanoDuration.java index 77acbbdb..07c074f0 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/NanoDuration.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/NanoDuration.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -44,13 +44,15 @@ public class NanoDuration extends AbstractStatistic implements Duration { } @Override - public void begin() { + public NanoDuration begin() { begin = System.nanoTime(); + return this; } @Override - public void end() { + public NanoDuration end() { end = System.nanoTime(); + return this; } @Override diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/Statistic.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/Statistic.java index 0d1a191a..de7219c5 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/Statistic.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/Statistic.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/StringStatistic.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/StringStatistic.java index 2b7faed3..b8dff132 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/StringStatistic.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/StringStatistic.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/UnsynchronizedLongCounter.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/UnsynchronizedLongCounter.java index 6068b652..0942592f 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/UnsynchronizedLongCounter.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/UnsynchronizedLongCounter.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.statistics; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/statistics/package-info.java b/src/de/lmu/ifi/dbs/elki/logging/statistics/package-info.java index ef9f5d98..1f664391 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/statistics/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/logging/statistics/package-info.java @@ -3,7 +3,7 @@ This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team |