diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java b/src/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java index 9ef9d34f..8873c9a1 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.filter; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2013 + Copyright (C) 2014 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -27,7 +27,7 @@ import java.lang.reflect.Field; import de.lmu.ifi.dbs.elki.data.NumberVector; import de.lmu.ifi.dbs.elki.data.type.SimpleTypeInformation; -import de.lmu.ifi.dbs.elki.data.type.VectorFieldTypeInformation; +import de.lmu.ifi.dbs.elki.data.type.VectorTypeInformation; import de.lmu.ifi.dbs.elki.logging.LoggingUtil; /** @@ -51,16 +51,16 @@ public final class FilterUtil { * @return Factory */ @SuppressWarnings("unchecked") - public static <V extends NumberVector<?>> NumberVector.Factory<V, ?> guessFactory(SimpleTypeInformation<V> in) { - NumberVector.Factory<V, ?> factory = null; - if(in instanceof VectorFieldTypeInformation) { - factory = (NumberVector.Factory<V, ?>) ((VectorFieldTypeInformation<V>) in).getFactory(); + public static <V extends NumberVector> NumberVector.Factory<V> guessFactory(SimpleTypeInformation<V> in) { + NumberVector.Factory<V> factory = null; + if(in instanceof VectorTypeInformation) { + factory = (NumberVector.Factory<V> ) ((VectorTypeInformation<V>) in).getFactory(); } if(factory == null) { // FIXME: hack. Add factories to simple type information, too? try { Field f = in.getRestrictionClass().getField("FACTORY"); - factory = (NumberVector.Factory<V, ?>) f.get(null); + factory = (NumberVector.Factory<V> ) f.get(null); } catch(Exception e) { LoggingUtil.warning("Cannot determine factory for type " + in.getRestrictionClass(), e); |