1 files changed, 12 insertions, 9 deletions

diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/utilities/optionhandling/constraints/GlobalVectorListElementSizeConstraint.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/utilities/optionhandling/constraints/GlobalVectorListElementSizeConstraint.java
index 79d67a2c..b162fc4a 100644
--- a/elki/src/main/java/de/lmu/ifi/dbs/elki/utilities/optionhandling/constraints/GlobalVectorListElementSizeConstraint.java
+++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/utilities/optionhandling/constraints/GlobalVectorListElementSizeConstraint.java
@@ -23,24 +23,24 @@ package de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints;
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import de.lmu.ifi.dbs.elki.math.linearalgebra.Vector;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.ParameterException;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.WrongParameterValueException;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter;
-import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.VectorListParameter;
+import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleArrayListParameter;
 
 /**
  * Global parameter constraint for testing if the dimensions of each vector
- * specified by a given vector list parameter ({@link VectorListParameter})
+ * specified by a given vector list parameter ({@link DoubleArrayListParameter})
  * correspond to the value of a integer parameter ({@link IntParameter}) given.
  * 
  * @author Steffi Wanka
+ * @since 0.2
  */
 public class GlobalVectorListElementSizeConstraint implements GlobalParameterConstraint {
   /**
    * Vector list parameter.
    */
-  private VectorListParameter vector;
+  private DoubleArrayListParameter vector;
 
   /**
    * Integer parameter providing the size constraint.
@@ -56,7 +56,7 @@ public class GlobalVectorListElementSizeConstraint implements GlobalParameterCon
    * @param vector the vector list parameter
    * @param sizeConstraint the integer parameter providing the size constraint
    */
-  public GlobalVectorListElementSizeConstraint(VectorListParameter vector, IntParameter sizeConstraint) {
+  public GlobalVectorListElementSizeConstraint(DoubleArrayListParameter vector, IntParameter sizeConstraint) {
     this.vector = vector;
     this.size = sizeConstraint;
   }
@@ -73,9 +73,12 @@ public class GlobalVectorListElementSizeConstraint implements GlobalParameterCon
       return;
     }
 
-    for(Vector vec : vector.getValue()) {
-      if(vec.getDimensionality() != size.intValue()) {
-        throw new WrongParameterValueException("Global Parameter Constraint Error.\n" + "The vectors of vector list parameter " + vector.getName() + " have not the required dimension of " + size.getValue() + " given by integer parameter " + size.getName() + ".");
+    for(double[] vec : vector.getValue()) {
+      if(vec.length != size.intValue()) {
+        throw new WrongParameterValueException("Global Parameter Constraint Error.\n" //
+        + "The vectors of vector list parameter " + vector.getName() //
+        + " have not the required dimension of " + size.getValue() //
+        + " given by integer parameter " + size.getName() + ".");
       }
     }
   }
@@ -84,4 +87,4 @@ public class GlobalVectorListElementSizeConstraint implements GlobalParameterCon
   public String getDescription() {
     return "The dimensionality of the vectors of vector list parameter " + vector.getName() + " must have the value of integer parameter " + size.getName();
   }
-}
\ No newline at end of file
+}