1 files changed, 7 insertions, 10 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/cluster/VoronoiVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/cluster/VoronoiVisualization.java
index 7c4b57f2..4c41759d 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/cluster/VoronoiVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/cluster/VoronoiVisualization.java
@@ -32,8 +32,6 @@ import org.w3c.dom.Element;
 

 import de.lmu.ifi.dbs.elki.data.Cluster;

 import de.lmu.ifi.dbs.elki.data.Clustering;

-import de.lmu.ifi.dbs.elki.data.NumberVector;

-import de.lmu.ifi.dbs.elki.data.model.KMeansModel;

 import de.lmu.ifi.dbs.elki.data.model.MeanModel;

 import de.lmu.ifi.dbs.elki.data.model.MedoidModel;

 import de.lmu.ifi.dbs.elki.data.model.Model;

@@ -152,7 +150,7 @@ public class VoronoiVisualization extends AbstractVisFactory {
    */

   private static boolean testMeanModel(Clustering<?> c) {

     Model firstmodel = c.getAllClusters().get(0).getModel();

-    if (firstmodel instanceof KMeansModel<?>) {

+    if (firstmodel instanceof MeanModel) {

       return true;

     }

     if (firstmodel instanceof MedoidModel) {

@@ -209,12 +207,11 @@ public class VoronoiVisualization extends AbstractVisFactory {
             Model model = clus.getModel();

             double[] mean;

             if (model instanceof MeanModel) {

-              @SuppressWarnings("unchecked")

-              MeanModel<? extends NumberVector<?>> mmodel = (MeanModel<? extends NumberVector<?>>) model;

-              mean = proj.fastProjectDataToRenderSpace(mmodel.getMean());

+              MeanModel mmodel = (MeanModel) model;

+              mean = mmodel.getMean().getArrayRef();

             } else if (model instanceof MedoidModel) {

               MedoidModel mmodel = (MedoidModel) model;

-              mean = proj.fastProjectDataToRenderSpace(rel.get(mmodel.getMedoid()));

+              mean = rel.get(mmodel.getMedoid()).getColumnVector().getArrayRef();

             } else {

               continue;

             }

@@ -227,7 +224,8 @@ public class VoronoiVisualization extends AbstractVisFactory {
           layer.appendChild(path);

         }

         if (settings.mode == Mode.DELAUNAY || settings.mode == Mode.V_AND_D) {

-          Element path = new SVGPath(means.get(0)).drawTo(means.get(1)).makeElement(svgp);

+          Element path = new SVGPath(proj.fastProjectDataToRenderSpace(means.get(0)))//

+          .drawTo(proj.fastProjectDataToRenderSpace(means.get(1))).makeElement(svgp);

           SVGUtil.addCSSClass(path, KMEANSBORDER);

           layer.appendChild(path);

         }

@@ -239,8 +237,7 @@ public class VoronoiVisualization extends AbstractVisFactory {
             Model model = clus.getModel();

             Vector mean;

             if (model instanceof MeanModel) {

-              @SuppressWarnings("unchecked")

-              MeanModel<? extends NumberVector<?>> mmodel = (MeanModel<? extends NumberVector<?>>) model;

+              MeanModel mmodel = (MeanModel) model;

               mean = mmodel.getMean().getColumnVector();

             } else if (model instanceof MedoidModel) {

               MedoidModel mmodel = (MedoidModel) model;