diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel')
6 files changed, 17 insertions, 17 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterface.java b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterface.java index 363c6c3b..7988ade4 100644 --- a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterface.java +++ b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterface.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data.synthetic.bymodel; 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 diff --git a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterfaceDynamic.java b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterfaceDynamic.java index cd3f18b7..5523355f 100644 --- a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterfaceDynamic.java +++ b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorInterfaceDynamic.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data.synthetic.bymodel; 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 diff --git a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorMain.java b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorMain.java index 603507c1..0dccaf77 100644 --- a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorMain.java +++ b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorMain.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data.synthetic.bymodel; 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 @@ -70,7 +70,7 @@ public class GeneratorMain { /** * List of clusters to generate. */ - protected LinkedList<GeneratorInterface> generators = new LinkedList<GeneratorInterface>(); + protected LinkedList<GeneratorInterface> generators = new LinkedList<>(); /** * Controls whether points are tested against the model during generation. @@ -109,9 +109,9 @@ public class GeneratorMain { } // Prepare result bundle MultipleObjectsBundle bundle = new MultipleObjectsBundle(); - VectorFieldTypeInformation<DoubleVector> type = new VectorFieldTypeInformation<DoubleVector>(DoubleVector.FACTORY, dim); - bundle.appendColumn(type, new ArrayList<Object>()); - bundle.appendColumn(TypeUtil.CLASSLABEL, new ArrayList<Object>()); + VectorFieldTypeInformation<DoubleVector> type = new VectorFieldTypeInformation<>(DoubleVector.FACTORY, dim); + bundle.appendColumn(type, new ArrayList<>()); + bundle.appendColumn(TypeUtil.CLASSLABEL, new ArrayList<>()); bundle.appendColumn(TypeUtil.MODEL, new ArrayList<Model>()); // generate clusters diff --git a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorSingleCluster.java b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorSingleCluster.java index d2970de7..ccbeb9b7 100644 --- a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorSingleCluster.java +++ b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorSingleCluster.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data.synthetic.bymodel; 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 @@ -30,7 +30,7 @@ import java.util.Random; import de.lmu.ifi.dbs.elki.data.model.Model; import de.lmu.ifi.dbs.elki.math.linearalgebra.AffineTransformation; import de.lmu.ifi.dbs.elki.math.linearalgebra.Vector; -import de.lmu.ifi.dbs.elki.math.statistics.distribution.DistributionWithRandom; +import de.lmu.ifi.dbs.elki.math.statistics.distribution.Distribution; import de.lmu.ifi.dbs.elki.utilities.exceptions.UnableToComplyException; /** @@ -47,7 +47,7 @@ public class GeneratorSingleCluster implements GeneratorInterfaceDynamic, Model /** * The distribution generators for each axis */ - private List<DistributionWithRandom> axes = new ArrayList<DistributionWithRandom>(); + private List<Distribution> axes = new ArrayList<>(); /** * The transformation matrix @@ -121,7 +121,7 @@ public class GeneratorSingleCluster implements GeneratorInterfaceDynamic, Model * @throws UnableToComplyException thrown when no new generators may be added * anymore */ - public void addGenerator(DistributionWithRandom gen) throws UnableToComplyException { + public void addGenerator(Distribution gen) throws UnableToComplyException { if(trans != null) { throw new UnableToComplyException("Generators may no longer be added when transformations have been applied."); } @@ -231,11 +231,11 @@ public class GeneratorSingleCluster implements GeneratorInterfaceDynamic, Model */ @Override public List<Vector> generate(int count) throws UnableToComplyException { - ArrayList<Vector> result = new ArrayList<Vector>(count); + ArrayList<Vector> result = new ArrayList<>(count); while(result.size() < count) { double[] d = new double[dim]; int i = 0; - for(DistributionWithRandom axis : axes) { + for(Distribution axis : axes) { d[i] = axis.nextRandom(); i++; } @@ -269,7 +269,7 @@ public class GeneratorSingleCluster implements GeneratorInterfaceDynamic, Model double density = 1.0; int i = 0; - for(DistributionWithRandom axis : axes) { + for(Distribution axis : axes) { density = density * axis.pdf(o.get(i)); i++; } @@ -400,7 +400,7 @@ public class GeneratorSingleCluster implements GeneratorInterfaceDynamic, Model * @param i Generator axis i * @return Distribution */ - public DistributionWithRandom getDistribution(int i) { + public Distribution getDistribution(int i) { return axes.get(i); } }
\ No newline at end of file diff --git a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorStatic.java b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorStatic.java index 7075bcb4..b8b0dff0 100644 --- a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorStatic.java +++ b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/GeneratorStatic.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data.synthetic.bymodel; 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 diff --git a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/package-info.java b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/package-info.java index 51dcd8e8..714a7835 100644 --- a/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/data/synthetic/bymodel/package-info.java @@ -13,7 +13,7 @@ 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 |