Import Upstream version 0.5.0

1 files changed, 4 insertions, 6 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java b/src/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java
index 8e0be062..36bbb823 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java
@@ -26,7 +26,6 @@ package de.lmu.ifi.dbs.elki.visualization;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 import java.util.regex.Pattern;
@@ -165,12 +164,10 @@ public class VisualizerParameterizer implements Parameterizable {
    * @return New context
    */
   public VisualizerContext newContext(HierarchicalResult result) {
-    VisualizerContext context = new VisualizerContext(result, stylelib, projectors, factories);
     if(samplesize > 0) {
-      Iterator<Relation<?>> iter = ResultUtil.filteredResults(result, Relation.class);
-      while(iter.hasNext()) {
-        Relation<?> rel = iter.next();
-        if(ResultUtil.filteredResults(rel, SamplingResult.class).hasNext()) {
+      Collection<Relation<?>> rels = ResultUtil.filterResults(result, Relation.class);
+      for(Relation<?> rel : rels) {
+        if(!ResultUtil.filterResults(rel, SamplingResult.class).isEmpty()) {
           continue;
         }
         int size = rel.size();
@@ -181,6 +178,7 @@ public class VisualizerParameterizer implements Parameterizable {
         }
       }
     }
+    VisualizerContext context = new VisualizerContext(result, stylelib, projectors, factories);
     return context;
   }