Import Debian changes 0.5.0~beta2-1

elki (0.5.0~beta2-1) unstable; urgency=low

  * New upstream beta release.
  * Needs GNU Trove 3, in NEW.
  * Build with OpenJDK7, as OpenJDK6 complains.

elki (0.5.0~beta1-1) unstable; urgency=low

  * New upstream beta release.
  * Needs GNU Trove 3, not yet in Debian (private package)
  * Build with OpenJDK7, as OpenJDK6 complains.

1 files changed, 149 insertions, 0 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/cluster/ClusterOrderVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/cluster/ClusterOrderVisualization.java
new file mode 100644
index 00000000..1ac55851
--- /dev/null
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/cluster/ClusterOrderVisualization.java
@@ -0,0 +1,149 @@
+package de.lmu.ifi.dbs.elki.visualization.visualizers.scatterplot.cluster;
+
+/*
+ This file is part of ELKI:
+ Environment for Developing KDD-Applications Supported by Index-Structures
+
+ Copyright (C) 2012
+ Ludwig-Maximilians-Universität München
+ Lehr- und Forschungseinheit für Datenbanksysteme
+ ELKI Development Team
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.util.Collection;
+
+import org.w3c.dom.Element;
+
+import de.lmu.ifi.dbs.elki.database.datastore.DataStoreListener;
+import de.lmu.ifi.dbs.elki.database.ids.DBID;
+import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
+import de.lmu.ifi.dbs.elki.result.HierarchicalResult;
+import de.lmu.ifi.dbs.elki.result.Result;
+import de.lmu.ifi.dbs.elki.result.ResultUtil;
+import de.lmu.ifi.dbs.elki.result.optics.ClusterOrderEntry;
+import de.lmu.ifi.dbs.elki.result.optics.ClusterOrderResult;
+import de.lmu.ifi.dbs.elki.utilities.iterator.IterableIterator;
+import de.lmu.ifi.dbs.elki.visualization.VisualizationTask;
+import de.lmu.ifi.dbs.elki.visualization.css.CSSClass;
+import de.lmu.ifi.dbs.elki.visualization.projector.ScatterPlotProjector;
+import de.lmu.ifi.dbs.elki.visualization.style.StyleLibrary;
+import de.lmu.ifi.dbs.elki.visualization.svg.SVGUtil;
+import de.lmu.ifi.dbs.elki.visualization.visualizers.AbstractVisFactory;
+import de.lmu.ifi.dbs.elki.visualization.visualizers.Visualization;
+import de.lmu.ifi.dbs.elki.visualization.visualizers.scatterplot.AbstractScatterplotVisualization;
+
+/**
+ * Cluster order visualizer.
+ * 
+ * @author Erich Schubert
+ * 
+ * @apiviz.has ClusterOrderResult oneway - - visualizes
+ */
+// TODO: listen for CLUSTER ORDER changes.
+public class ClusterOrderVisualization extends AbstractScatterplotVisualization implements DataStoreListener {
+  /**
+   * A short name characterizing this Visualizer.
+   */
+  private static final String NAME = "Predecessor Graph";
+
+  /**
+   * CSS class name
+   */
+  private static final String CSSNAME = "predecessor";
+
+  /**
+   * The result we visualize
+   */
+  protected ClusterOrderResult<?> result;
+
+  public ClusterOrderVisualization(VisualizationTask task) {
+    super(task);
+    result = task.getResult();
+    context.addDataStoreListener(this);
+    incrementalRedraw();
+  }
+
+  @Override
+  public void destroy() {
+    super.destroy();
+    context.removeDataStoreListener(this);
+  }
+
+  @Override
+  public void redraw() {
+    CSSClass cls = new CSSClass(this, CSSNAME);
+    context.getStyleLibrary().lines().formatCSSClass(cls, 0, context.getStyleLibrary().getLineWidth(StyleLibrary.CLUSTERORDER));
+
+    svgp.addCSSClassOrLogError(cls);
+
+    for(ClusterOrderEntry<?> ce : result) {
+      DBID thisId = ce.getID();
+      DBID prevId = ce.getPredecessorID();
+      if(thisId == null || prevId == null) {
+        continue;
+      }
+      double[] thisVec = proj.fastProjectDataToRenderSpace(rel.get(thisId));
+      double[] prevVec = proj.fastProjectDataToRenderSpace(rel.get(prevId));
+      
+      // FIXME: DO NOT COMMIT
+      thisVec[0] = thisVec[0] * 0.95 + prevVec[0] * 0.05;
+      thisVec[1] = thisVec[1] * 0.95 + prevVec[1] * 0.05;
+
+      Element arrow = svgp.svgLine(prevVec[0], prevVec[1], thisVec[0], thisVec[1]);
+      SVGUtil.setCSSClass(arrow, cls.getName());
+
+      layer.appendChild(arrow);
+    }
+  }
+
+  /**
+   * Visualize an OPTICS cluster order by drawing connection lines.
+   * 
+   * @author Erich Schubert
+   * 
+   * @apiviz.stereotype factory
+   * @apiviz.uses ClusterOrderVisualization oneway - - «create»
+   */
+  public static class Factory extends AbstractVisFactory {
+    /**
+     * Constructor, adhering to
+     * {@link de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable}
+     */
+    public Factory() {
+      super();
+    }
+
+    @Override
+    public Visualization makeVisualization(VisualizationTask task) {
+      return new ClusterOrderVisualization(task);
+    }
+
+    @Override
+    public void processNewResult(HierarchicalResult baseResult, Result result) {
+      Collection<ClusterOrderResult<DoubleDistance>> cos = ResultUtil.filterResults(result, ClusterOrderResult.class);
+      for(ClusterOrderResult<DoubleDistance> co : cos) {
+        IterableIterator<ScatterPlotProjector<?>> ps = ResultUtil.filteredResults(baseResult, ScatterPlotProjector.class);
+        for(ScatterPlotProjector<?> p : ps) {
+          final VisualizationTask task = new VisualizationTask(NAME, co, p.getRelation(), this);
+          task.put(VisualizationTask.META_VISIBLE_DEFAULT, false);
+          task.put(VisualizationTask.META_LEVEL, VisualizationTask.LEVEL_DATA - 1);
+          baseResult.getHierarchy().add(co, task);
+          baseResult.getHierarchy().add(p, task);
+        }
+      }
+    }
+  }
+}
\ No newline at end of file