Import Debian changes 0.6.0~beta2-1

elki (0.6.0~beta2-1) unstable; urgency=low

  * New upstream beta release.
  * 3DPC extension is not yet included.

1 files changed, 18 insertions, 6 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AttributeWiseVarianceNormalization.java b/src/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AttributeWiseVarianceNormalization.java
index 0671231d..072d1a68 100644
--- a/src/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AttributeWiseVarianceNormalization.java
+++ b/src/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AttributeWiseVarianceNormalization.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.filter.normalization;
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2012
+ Copyright (C) 2013
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team
@@ -96,15 +96,22 @@ public class AttributeWiseVarianceNormalization<V extends NumberVector<?>> exten
     this.stddev = stddev;
   }
 
+  /**
+   * Constructor.
+   */
+  public AttributeWiseVarianceNormalization() {
+    super();
+  }
+
   @Override
   protected boolean prepareStart(SimpleTypeInformation<V> in) {
-    return (mean.length == 0 || stddev.length == 0);
+    return (mean == null || stddev == null || mean.length == 0 || stddev.length == 0);
   }
 
   @Override
   protected void prepareProcessInstance(V featureVector) {
     // First object? Then init. (We didn't have a dimensionality before!)
-    if(mvs == null) {
+    if(mvs == null || mvs.length == 0) {
       int dimensionality = featureVector.getDimensionality();
       mvs = MeanVariance.newArray(dimensionality);
     }
@@ -231,6 +238,11 @@ public class AttributeWiseVarianceNormalization<V extends NumberVector<?>> exten
     return result.toString();
   }
 
+  @Override
+  protected Logging getLogger() {
+    return LOG;
+  }
+
   /**
    * Parameterization class.
    * 
@@ -268,12 +280,12 @@ public class AttributeWiseVarianceNormalization<V extends NumberVector<?>> exten
         }
       }
 
-      ArrayList<Parameter<?>> global_1 = new ArrayList<Parameter<?>>();
+      ArrayList<Parameter<?>> global_1 = new ArrayList<>();
       global_1.add(meanP);
       global_1.add(stddevP);
       config.checkConstraint(new AllOrNoneMustBeSetGlobalConstraint(global_1));
 
-      ArrayList<ListParameter<?>> global = new ArrayList<ListParameter<?>>();
+      ArrayList<ListParameter<?>> global = new ArrayList<>();
       global.add(meanP);
       global.add(stddevP);
       config.checkConstraint(new EqualSizeGlobalConstraint(global));
@@ -281,7 +293,7 @@ public class AttributeWiseVarianceNormalization<V extends NumberVector<?>> exten
 
     @Override
     protected AttributeWiseVarianceNormalization<V> makeInstance() {
-      return new AttributeWiseVarianceNormalization<V>(mean, stddev);
+      return new AttributeWiseVarianceNormalization<>(mean, stddev);
     }
   }
 }
\ No newline at end of file