1 files changed, 8 insertions, 5 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/utilities/scaling/outlier/OutlierLinearScaling.java b/src/de/lmu/ifi/dbs/elki/utilities/scaling/outlier/OutlierLinearScaling.java
index 8f215ec3..e7222b96 100644
--- a/src/de/lmu/ifi/dbs/elki/utilities/scaling/outlier/OutlierLinearScaling.java
+++ b/src/de/lmu/ifi/dbs/elki/utilities/scaling/outlier/OutlierLinearScaling.java
@@ -26,6 +26,7 @@ package de.lmu.ifi.dbs.elki.utilities.scaling.outlier;
 import java.util.ArrayList;
 
 import de.lmu.ifi.dbs.elki.database.ids.DBID;
+import de.lmu.ifi.dbs.elki.database.ids.DBIDIter;
 import de.lmu.ifi.dbs.elki.math.DoubleMinMax;
 import de.lmu.ifi.dbs.elki.math.MeanVariance;
 import de.lmu.ifi.dbs.elki.result.outlier.OutlierResult;
@@ -39,7 +40,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.Flag;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.Parameter;
 
 /**
- * Scaling that can map arbitrary values to a probability in the range of [0:1].
+ * Scaling that can map arbitrary values to a value in the range of [0:1].
  * 
  * Transformation is done by linear mapping onto 0:1 using the minimum and
  * maximum values.
@@ -53,10 +54,10 @@ public class OutlierLinearScaling implements OutlierScalingFunction {
    * Key: {@code -linearscale.min}
    * </p>
    */
-  public static final OptionID MIN_ID = OptionID.getOrCreateOptionID("linearscale.min", "Fixed minimum to use in lienar scaling.");
+  public static final OptionID MIN_ID = OptionID.getOrCreateOptionID("linearscale.min", "Fixed minimum to use in linear scaling.");
 
   /**
-   * Parameter to specify the maximum value
+   * Parameter to specify the maximum value.
    * <p>
    * Key: {@code -linearscale.max}
    * </p>
@@ -147,7 +148,8 @@ public class OutlierLinearScaling implements OutlierScalingFunction {
       MeanVariance mv = new MeanVariance();
       DoubleMinMax mm = (max == null) ? new DoubleMinMax() : null;
       boolean skippedzeros = false;
-      for(DBID id : or.getScores().iterDBIDs()) {
+      for(DBIDIter iditer = or.getScores().iterDBIDs(); iditer.valid(); iditer.advance()) {
+        DBID id  = iditer.getDBID();
         double val = or.getScores().get(id);
         if(nozeros && val == 0.0) {
           skippedzeros = true;
@@ -173,7 +175,8 @@ public class OutlierLinearScaling implements OutlierScalingFunction {
       if(min == null || max == null) {
         boolean skippedzeros = false;
         DoubleMinMax mm = new DoubleMinMax();
-        for(DBID id : or.getScores().iterDBIDs()) {
+        for(DBIDIter iditer = or.getScores().iterDBIDs(); iditer.valid(); iditer.advance()) {
+          DBID id  = iditer.getDBID();
           double val = or.getScores().get(id);
           if(nozeros && val == 0.0) {
             skippedzeros = true;