Import Debian changes 0.5.5-1

elki (0.5.5-1) unstable; urgency=low

  * New upstream release: 0.5.5 interim release.

1 files changed, 24 insertions, 24 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java
index f251733e..e97ad653 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java
@@ -29,17 +29,17 @@ import java.util.List;
 
 import de.lmu.ifi.dbs.elki.data.NumberVector;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
+import de.lmu.ifi.dbs.elki.database.relation.RelationUtil;
 import de.lmu.ifi.dbs.elki.math.linearalgebra.AffineTransformation;
 import de.lmu.ifi.dbs.elki.result.AbstractHierarchicalResult;
 import de.lmu.ifi.dbs.elki.result.ResultUtil;
 import de.lmu.ifi.dbs.elki.result.ScalesResult;
-import de.lmu.ifi.dbs.elki.utilities.DatabaseUtil;
 import de.lmu.ifi.dbs.elki.visualization.VisualizationTask;
 import de.lmu.ifi.dbs.elki.visualization.gui.overview.PlotItem;
 import de.lmu.ifi.dbs.elki.visualization.projections.AffineProjection;
 import de.lmu.ifi.dbs.elki.visualization.projections.Projection2D;
 import de.lmu.ifi.dbs.elki.visualization.projections.Simple2D;
-import de.lmu.ifi.dbs.elki.visualization.visualizers.visunproj.LabelVisFactory;
+import de.lmu.ifi.dbs.elki.visualization.visualizers.visunproj.LabelVisualization;
 
 /**
  * ScatterPlotProjector is responsible for producing a set of scatterplot
@@ -52,14 +52,14 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.visunproj.LabelVisFactory;
  * 
  * @param <V> Vector type
  */
-public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends AbstractHierarchicalResult implements Projector {
+public class ScatterPlotProjector<V extends NumberVector<?>> extends AbstractHierarchicalResult implements Projector {
   /**
-   * Relation we project
+   * Relation we project.
    */
   Relation<V> rel;
 
   /**
-   * Database dimensionality
+   * Database dimensionality.
    */
   int dmax;
 
@@ -73,7 +73,7 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
     super();
     this.rel = rel;
     this.dmax = maxdim;
-    assert (maxdim <= DatabaseUtil.dimensionality(rel)) : "Requested dimensionality larger than data dimensionality?!?";
+    assert (maxdim <= RelationUtil.dimensionality(rel)) : "Requested dimensionality larger than data dimensionality?!?";
   }
 
   @Override
@@ -87,7 +87,7 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
         // In 2d, make the plot twice as big.
         master = new PlotItem(2 + .1, 2 + .1, null);
         {
-          Projection2D proj = new Simple2D(scales.getScales(), 1, 2);
+          Projection2D proj = new Simple2D(scales.getScales(), 0, 1);
           PlotItem it = new PlotItem(.1, 0, 2., 2., proj);
           it.tasks = tasks;
           master.subitems.add(it);
@@ -95,38 +95,38 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
         // Label at bottom
         {
           PlotItem it = new PlotItem(.1, 2., 2., .1, null);
-          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisFactory(DatabaseUtil.getColumnLabel(rel, 1)));
+          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisualization(RelationUtil.getColumnLabel(rel, 0)));
           task.height = .1;
           task.width = 2.;
-          task.put(VisualizationTask.META_NODETAIL, true);
+          task.nodetail = true;
           it.tasks.add(task);
           master.subitems.add(it);
         }
         // Label on left
         {
           PlotItem it = new PlotItem(0, 0, .1, 2, null);
-          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisFactory(DatabaseUtil.getColumnLabel(rel, 2), true));
+          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisualization(RelationUtil.getColumnLabel(rel, 1), true));
           task.height = 2.;
           task.width = .1;
-          task.put(VisualizationTask.META_NODETAIL, true);
+          task.nodetail = true;
           it.tasks.add(task);
           master.subitems.add(it);
         }
       }
       else {
         final double sizeh = Math.ceil((dmax - 1) / 2.0);
-        master = new PlotItem(sizeh * 2 + .1, dmax - 1 + .1, null);
+        master = new PlotItem(sizeh * 2. + .1, dmax - 1 + .1, null);
 
-        for(int d1 = 1; d1 < dmax; d1++) {
-          for(int d2 = d1 + 1; d2 <= dmax; d2++) {
+        for(int d1 = 0; d1 < dmax - 1; d1++) {
+          for(int d2 = d1 + 1; d2 < dmax; d2++) {
             Projection2D proj = new Simple2D(scales.getScales(), d1, d2);
-            PlotItem it = new PlotItem(d1 - 1 + .1, d2 - 2, 1., 1., proj);
+            PlotItem it = new PlotItem(d1 + .1, d2 - 1, 1., 1., proj);
             it.tasks = tasks;
             master.subitems.add(it);
           }
         }
         if(dmax >= 3) {
-          AffineTransformation p = AffineProjection.axisProjection(DatabaseUtil.dimensionality(rel), 1, 2);
+          AffineTransformation p = AffineProjection.axisProjection(RelationUtil.dimensionality(rel), 1, 2);
           p.addRotation(0, 2, Math.PI / 180 * -10.);
           p.addRotation(1, 2, Math.PI / 180 * 15.);
           // Wanna try 4d? go ahead:
@@ -138,22 +138,22 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
           master.subitems.add(it);
         }
         // Labels at bottom
-        for(int d1 = 1; d1 < dmax; d1++) {
-          PlotItem it = new PlotItem(d1 - 1 + .1, dmax - 1, 1., .1, null);
-          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisFactory(DatabaseUtil.getColumnLabel(rel, d1)));
+        for(int d1 = 0; d1 < dmax - 1; d1++) {
+          PlotItem it = new PlotItem(d1 + .1, dmax - 1, 1., .1, null);
+          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisualization(RelationUtil.getColumnLabel(rel, d1)));
           task.height = .1;
           task.width = 1;
-          task.put(VisualizationTask.META_NODETAIL, true);
+          task.nodetail = true;
           it.tasks.add(task);
           master.subitems.add(it);
         }
         // Labels on left
-        for(int d2 = 2; d2 <= dmax; d2++) {
-          PlotItem it = new PlotItem(0, d2 - 2, .1, 1, null);
-          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisFactory(DatabaseUtil.getColumnLabel(rel, d2), true));
+        for(int d2 = 1; d2 < dmax; d2++) {
+          PlotItem it = new PlotItem(0, d2 - 1, .1, 1, null);
+          final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisualization(RelationUtil.getColumnLabel(rel, d2), true));
           task.height = 1;
           task.width = .1;
-          task.put(VisualizationTask.META_NODETAIL, true);
+          task.nodetail = true;
           it.tasks.add(task);
           master.subitems.add(it);
         }