summaryrefslogtreecommitdiff
path: root/src/de/lmu/ifi/dbs/elki/visualization/projector
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/visualization/projector')
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java28
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java18
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java4
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotFactory.java64
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotProjector.java100
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/Projector.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java27
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java32
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/projector/package-info.java2
11 files changed, 216 insertions, 65 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java
index 3836379a..3f487e0e 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -23,9 +23,10 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+import java.util.ArrayList;
+
import de.lmu.ifi.dbs.elki.data.NumberVector;
import de.lmu.ifi.dbs.elki.data.type.TypeUtil;
-import de.lmu.ifi.dbs.elki.database.Database;
import de.lmu.ifi.dbs.elki.database.relation.Relation;
import de.lmu.ifi.dbs.elki.result.HierarchicalResult;
import de.lmu.ifi.dbs.elki.result.Result;
@@ -40,7 +41,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter;
* Produce one-dimensional projections.
*
* @author Erich Schubert
- *
+ *
* @apiviz.has HistogramProjector
*/
public class HistogramFactory implements ProjectorFactory {
@@ -51,6 +52,7 @@ public class HistogramFactory implements ProjectorFactory {
/**
* Constructor.
+ *
* @param maxdim Maximum dimensionality
*/
public HistogramFactory(int maxdim) {
@@ -60,16 +62,14 @@ public class HistogramFactory implements ProjectorFactory {
@Override
public void processNewResult(HierarchicalResult baseResult, Result newResult) {
- Database db = ResultUtil.findDatabase(newResult);
- if(db != null) {
- for(Relation<?> rel : db.getRelations()) {
- if(TypeUtil.NUMBER_VECTOR_FIELD.isAssignableFromType(rel.getDataTypeInformation())) {
- @SuppressWarnings("unchecked")
- Relation<NumberVector<?, ?>> vrel = (Relation<NumberVector<?, ?>>) rel;
- final int dim = DatabaseUtil.dimensionality(vrel);
- HistogramProjector<NumberVector<?, ?>> proj = new HistogramProjector<NumberVector<?, ?>>(vrel, Math.min(dim, maxdim));
- baseResult.getHierarchy().add(vrel, proj);
- }
+ ArrayList<Relation<?>> rels = ResultUtil.filterResults(newResult, Relation.class);
+ for(Relation<?> rel : rels) {
+ if(TypeUtil.NUMBER_VECTOR_FIELD.isAssignableFromType(rel.getDataTypeInformation())) {
+ @SuppressWarnings("unchecked")
+ Relation<NumberVector<?, ?>> vrel = (Relation<NumberVector<?, ?>>) rel;
+ final int dim = DatabaseUtil.dimensionality(vrel);
+ HistogramProjector<NumberVector<?, ?>> proj = new HistogramProjector<NumberVector<?, ?>>(vrel, Math.min(dim, maxdim));
+ baseResult.getHierarchy().add(vrel, proj);
}
}
}
@@ -78,7 +78,7 @@ public class HistogramFactory implements ProjectorFactory {
* Parameterization class.
*
* @author Erich Schubert
- *
+ *
* @apiviz.exclude
*/
public static class Parameterizer extends AbstractParameterizer {
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java
index 40bd55ee..95105895 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -31,13 +31,12 @@ import de.lmu.ifi.dbs.elki.data.NumberVector;
import de.lmu.ifi.dbs.elki.database.relation.Relation;
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.Projection1D;
import de.lmu.ifi.dbs.elki.visualization.projections.Simple1D;
-import de.lmu.ifi.dbs.elki.visualization.scales.LinearScale;
-import de.lmu.ifi.dbs.elki.visualization.scales.Scales;
import de.lmu.ifi.dbs.elki.visualization.visualizers.visunproj.LabelVisFactory;
/**
@@ -62,11 +61,6 @@ public class HistogramProjector<V extends NumberVector<?, ?>> extends AbstractHi
int dmax;
/**
- * Axis scales
- */
- LinearScale[] scales;
-
- /**
* Constructor.
*
* @param rel Relation
@@ -76,7 +70,6 @@ public class HistogramProjector<V extends NumberVector<?, ?>> extends AbstractHi
super();
this.rel = rel;
this.dmax = maxdim;
- this.scales = Scales.calcScales(rel);
assert (maxdim <= DatabaseUtil.dimensionality(rel)) : "Requested dimensionality larger than data dimensionality?!?";
}
@@ -89,10 +82,11 @@ public class HistogramProjector<V extends NumberVector<?, ?>> extends AbstractHi
final double hheight = .5;
final double lheight = .1;
PlotItem master = new PlotItem(dmax + xoff, hheight + lheight, null);
+ ScalesResult scales = ResultUtil.getScalesResult(rel);
for(int d1 = 0; d1 < dmax; d1++) {
- Projection1D proj = new Simple1D(scales, d1 + 1);
+ Projection1D proj = new Simple1D(scales.getScales(), d1 + 1);
final PlotItem it = new PlotItem(d1 + xoff, lheight, 1., hheight, proj);
- it.visualizations = tasks;
+ it.tasks = tasks;
master.subitems.add(it);
}
layout.add(master);
@@ -104,7 +98,7 @@ public class HistogramProjector<V extends NumberVector<?, ?>> extends AbstractHi
task.height = lheight;
task.width = 1;
task.put(VisualizationTask.META_NODETAIL, true);
- it.visualizations.add(task);
+ it.tasks.add(task);
master.subitems.add(it);
}
}
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java
index 21b9c227..297b7b12 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -78,7 +78,7 @@ public class OPTICSProjector<D extends Distance<D>> extends AbstractHierarchical
List<VisualizationTask> tasks = ResultUtil.filterResults(this, VisualizationTask.class);
if (tasks.size() > 0) {
final PlotItem it = new PlotItem(4., 1., null);
- it.visualizations = tasks;
+ it.tasks = tasks;
col.add(it);
}
return col;
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java
index 25023029..488c20e0 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotFactory.java
new file mode 100644
index 00000000..6dcb6271
--- /dev/null
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotFactory.java
@@ -0,0 +1,64 @@
+package de.lmu.ifi.dbs.elki.visualization.projector;
+
+/*
+ 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.Iterator;
+
+import de.lmu.ifi.dbs.elki.data.NumberVector;
+import de.lmu.ifi.dbs.elki.data.type.TypeUtil;
+import de.lmu.ifi.dbs.elki.database.relation.Relation;
+import de.lmu.ifi.dbs.elki.result.HierarchicalResult;
+import de.lmu.ifi.dbs.elki.result.Result;
+import de.lmu.ifi.dbs.elki.result.ResultUtil;
+
+/**
+ * Produce parallel axes projections.
+ *
+ * @author Robert Rödler
+ *
+ * @apiviz.has ParallelPlotProjector
+ */
+public class ParallelPlotFactory implements ProjectorFactory {
+ /**
+ * Constructor.
+ */
+ public ParallelPlotFactory() {
+ super();
+ }
+
+ @Override
+ public void processNewResult(HierarchicalResult baseResult, Result newResult) {
+ Iterator<Relation<?>> rels = ResultUtil.filteredResults(newResult, Relation.class);
+ while (rels.hasNext()) {
+ Relation<?> rel = rels.next();
+ // TODO: multi-relational parallel plots
+ if(TypeUtil.NUMBER_VECTOR_FIELD.isAssignableFromType(rel.getDataTypeInformation())) {
+ @SuppressWarnings("unchecked")
+ Relation<NumberVector<?, ?>> vrel = (Relation<NumberVector<?, ?>>) rel;
+ ParallelPlotProjector<NumberVector<?, ?>> proj = new ParallelPlotProjector<NumberVector<?, ?>>(vrel);
+ baseResult.getHierarchy().add(vrel, proj);
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotProjector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotProjector.java
new file mode 100644
index 00000000..2076655b
--- /dev/null
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ParallelPlotProjector.java
@@ -0,0 +1,100 @@
+package de.lmu.ifi.dbs.elki.visualization.projector;
+
+/*
+ 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.ArrayList;
+import java.util.Collection;
+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.math.MathUtil;
+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.visualization.VisualizationTask;
+import de.lmu.ifi.dbs.elki.visualization.gui.overview.PlotItem;
+import de.lmu.ifi.dbs.elki.visualization.projections.ProjectionParallel;
+import de.lmu.ifi.dbs.elki.visualization.projections.SimpleParallel;
+
+/**
+ * ParallelPlotProjector is responsible for producing a parallel axes
+ * visualization.
+ *
+ * @author Robert Rödler
+ *
+ * @param <V> Vector type
+ */
+// TODO: support categorical features, and multiple relations too
+public class ParallelPlotProjector<V extends NumberVector<?, ?>> extends AbstractHierarchicalResult implements Projector {
+ /**
+ * Relation we project
+ */
+ Relation<V> rel;
+
+ /**
+ * Constructor.
+ *
+ * @param rel Relation
+ */
+ public ParallelPlotProjector(Relation<V> rel) {
+ super();
+ this.rel = rel;
+ }
+
+ @Override
+ public Collection<PlotItem> arrange() {
+ List<PlotItem> col = new ArrayList<PlotItem>(1);
+ List<VisualizationTask> tasks = ResultUtil.filterResults(this, VisualizationTask.class);
+ if(tasks.size() > 0) {
+ ScalesResult scales = ResultUtil.getScalesResult(rel);
+ ProjectionParallel proj = new SimpleParallel(scales.getScales());
+
+ final double width = Math.ceil(Math.log(scales.getScales().length) / MathUtil.LOG2);
+ final PlotItem it = new PlotItem(width, 1., proj);
+ it.tasks = tasks;
+ col.add(it);
+ }
+ return col;
+ }
+
+ @Override
+ public String getLongName() {
+ return "Parallelplot";
+ }
+
+ @Override
+ public String getShortName() {
+ return "parallelplot";
+ }
+
+ /**
+ * The relation we project.
+ *
+ * @return Relation
+ */
+ public Relation<V> getRelation() {
+ return rel;
+ }
+} \ No newline at end of file
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/Projector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/Projector.java
index 646adda5..6435bf60 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/Projector.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/Projector.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java
index 3dbb803f..4fb6bf9e 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java
index 5957233d..6e1a899b 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -23,9 +23,10 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+import java.util.ArrayList;
+
import de.lmu.ifi.dbs.elki.data.NumberVector;
import de.lmu.ifi.dbs.elki.data.type.TypeUtil;
-import de.lmu.ifi.dbs.elki.database.Database;
import de.lmu.ifi.dbs.elki.database.relation.Relation;
import de.lmu.ifi.dbs.elki.result.HierarchicalResult;
import de.lmu.ifi.dbs.elki.result.Result;
@@ -69,25 +70,23 @@ public class ScatterPlotFactory implements ProjectorFactory {
@Override
public void processNewResult(HierarchicalResult baseResult, Result newResult) {
- Database db = ResultUtil.findDatabase(newResult);
- if(db != null) {
- for(Relation<?> rel : db.getRelations()) {
- if(TypeUtil.NUMBER_VECTOR_FIELD.isAssignableFromType(rel.getDataTypeInformation())) {
- @SuppressWarnings("unchecked")
- Relation<NumberVector<?, ?>> vrel = (Relation<NumberVector<?, ?>>) rel;
- final int dim = DatabaseUtil.dimensionality(vrel);
- ScatterPlotProjector<NumberVector<?, ?>> proj = new ScatterPlotProjector<NumberVector<?, ?>>(vrel, Math.min(maxdim, dim));
- baseResult.getHierarchy().add(vrel, proj);
- }
+ ArrayList<Relation<?>> rels = ResultUtil.filterResults(newResult, Relation.class);
+ for(Relation<?> rel : rels) {
+ if(TypeUtil.NUMBER_VECTOR_FIELD.isAssignableFromType(rel.getDataTypeInformation())) {
+ @SuppressWarnings("unchecked")
+ Relation<NumberVector<?, ?>> vrel = (Relation<NumberVector<?, ?>>) rel;
+ final int dim = DatabaseUtil.dimensionality(vrel);
+ ScatterPlotProjector<NumberVector<?, ?>> proj = new ScatterPlotProjector<NumberVector<?, ?>>(vrel, Math.min(maxdim, dim));
+ baseResult.getHierarchy().add(vrel, proj);
}
}
}
-
+
/**
* Parameterization class.
*
* @author Erich Schubert
- *
+ *
* @apiviz.exclude
*/
public static class Parameterizer extends AbstractParameterizer {
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 a090f523..755b6fd2 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2011
+ Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -32,14 +32,13 @@ import de.lmu.ifi.dbs.elki.database.relation.Relation;
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.scales.LinearScale;
-import de.lmu.ifi.dbs.elki.visualization.scales.Scales;
import de.lmu.ifi.dbs.elki.visualization.visualizers.visunproj.LabelVisFactory;
/**
@@ -64,11 +63,6 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
int dmax;
/**
- * Axis scales
- */
- LinearScale[] scales;
-
- /**
* Constructor.
*
* @param rel Relation
@@ -78,7 +72,6 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
super();
this.rel = rel;
this.dmax = maxdim;
- this.scales = Scales.calcScales(rel);
assert (maxdim <= DatabaseUtil.dimensionality(rel)) : "Requested dimensionality larger than data dimensionality?!?";
}
@@ -87,14 +80,15 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
List<PlotItem> layout = new ArrayList<PlotItem>(1);
List<VisualizationTask> tasks = ResultUtil.filterResults(this, VisualizationTask.class);
if(tasks.size() > 0) {
+ ScalesResult scales = ResultUtil.getScalesResult(rel);
final PlotItem master;
if(dmax == 2) {
// In 2d, make the plot twice as big.
master = new PlotItem(2 + .1, 2 + .1, null);
{
- Projection2D proj = new Simple2D(scales, 1, 2);
+ Projection2D proj = new Simple2D(scales.getScales(), 1, 2);
PlotItem it = new PlotItem(.1, 0, 2., 2., proj);
- it.visualizations = tasks;
+ it.tasks = tasks;
master.subitems.add(it);
}
// Label at bottom
@@ -104,7 +98,7 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
task.height = .1;
task.width = 2.;
task.put(VisualizationTask.META_NODETAIL, true);
- it.visualizations.add(task);
+ it.tasks.add(task);
master.subitems.add(it);
}
// Label on left
@@ -114,7 +108,7 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
task.height = 2.;
task.width = .1;
task.put(VisualizationTask.META_NODETAIL, true);
- it.visualizations.add(task);
+ it.tasks.add(task);
master.subitems.add(it);
}
}
@@ -124,9 +118,9 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
for(int d1 = 1; d1 < dmax; d1++) {
for(int d2 = d1 + 1; d2 <= dmax; d2++) {
- Projection2D proj = new Simple2D(scales, d1, d2);
+ Projection2D proj = new Simple2D(scales.getScales(), d1, d2);
PlotItem it = new PlotItem(d1 - 1 + .1, d2 - 2, 1., 1., proj);
- it.visualizations = tasks;
+ it.tasks = tasks;
master.subitems.add(it);
}
}
@@ -137,9 +131,9 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
// Wanna try 4d? go ahead:
// p.addRotation(0, 3, Math.PI / 180 * -20.);
// p.addRotation(1, 3, Math.PI / 180 * 30.);
- Projection2D proj = new AffineProjection(scales, p);
+ Projection2D proj = new AffineProjection(scales.getScales(), p);
PlotItem it = new PlotItem(sizeh + .1, 0, sizeh, sizeh, proj);
- it.visualizations = tasks;
+ it.tasks = tasks;
master.subitems.add(it);
}
// Labels at bottom
@@ -149,7 +143,7 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
task.height = .1;
task.width = 1;
task.put(VisualizationTask.META_NODETAIL, true);
- it.visualizations.add(task);
+ it.tasks.add(task);
master.subitems.add(it);
}
// Labels on left
@@ -159,7 +153,7 @@ public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends Abstract
task.height = 1;
task.width = .1;
task.put(VisualizationTask.META_NODETAIL, true);
- it.visualizations.add(task);
+ it.tasks.add(task);
master.subitems.add(it);
}
}
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/package-info.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/package-info.java
index 5975089c..9fbc2852 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/package-info.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/package-info.java
@@ -5,7 +5,7 @@
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
-Copyright (C) 2011
+Copyright (C) 2012
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 11:30:22 +0000