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.

8 files changed, 29 insertions, 21 deletions

diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestINFLO.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestINFLO.java
index 8a1e84ef..99b97d92 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestINFLO.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestINFLO.java
@@ -1,4 +1,4 @@
-package de.lmu.ifi.dbs.elki.algorithm.outlier;
+package de.lmu.ifi.dbs.elki.algorithm.outlier.lof;
 
 /*
  This file is part of ELKI:
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
 import de.lmu.ifi.dbs.elki.algorithm.AbstractSimpleAlgorithmTest;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.INFLO;
 import de.lmu.ifi.dbs.elki.data.DoubleVector;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLDOF.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLDOF.java
index 70a5b170..370054ea 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLDOF.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLDOF.java
@@ -1,4 +1,4 @@
-package de.lmu.ifi.dbs.elki.algorithm.outlier;
+package de.lmu.ifi.dbs.elki.algorithm.outlier.lof;
 
 /*
  This file is part of ELKI:
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
 import de.lmu.ifi.dbs.elki.algorithm.AbstractSimpleAlgorithmTest;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.LDOF;
 import de.lmu.ifi.dbs.elki.data.DoubleVector;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLOCI.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLOCI.java
index d95b362c..05206f55 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLOCI.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLOCI.java
@@ -1,4 +1,4 @@
-package de.lmu.ifi.dbs.elki.algorithm.outlier;
+package de.lmu.ifi.dbs.elki.algorithm.outlier.lof;
 
 /*
  This file is part of ELKI:
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
 import de.lmu.ifi.dbs.elki.algorithm.AbstractSimpleAlgorithmTest;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.LOCI;
 import de.lmu.ifi.dbs.elki.data.DoubleVector;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLOF.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLOF.java
index a1ef967b..2c7bbd1d 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLOF.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLOF.java
@@ -1,4 +1,4 @@
-package de.lmu.ifi.dbs.elki.algorithm.outlier;
+package de.lmu.ifi.dbs.elki.algorithm.outlier.lof;
 
 /*
  This file is part of ELKI:
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
 import de.lmu.ifi.dbs.elki.algorithm.AbstractSimpleAlgorithmTest;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.LOF;
 import de.lmu.ifi.dbs.elki.data.DoubleVector;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
@@ -46,7 +47,7 @@ public class TestLOF extends AbstractSimpleAlgorithmTest implements JUnit4Test {
 
     // Parameterization
     ListParameterization params = new ListParameterization();
-    params.addParameter(LOF.K_ID, 10);
+    params.addParameter(LOF.Parameterizer.K_ID, 10);
 
     // setup Algorithm
     LOF<DoubleVector, DoubleDistance> lof = ClassGenericsUtil.parameterizeOrAbort(LOF.class, params);
diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLoOP.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLoOP.java
index 653f4a29..e6670eb7 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestLoOP.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestLoOP.java
@@ -1,4 +1,4 @@
-package de.lmu.ifi.dbs.elki.algorithm.outlier;
+package de.lmu.ifi.dbs.elki.algorithm.outlier.lof;
 
 /*
  This file is part of ELKI:
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
 import de.lmu.ifi.dbs.elki.algorithm.AbstractSimpleAlgorithmTest;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.LoOP;
 import de.lmu.ifi.dbs.elki.data.DoubleVector;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestOnlineLOF.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestOnlineLOF.java
index 5b9881e3..cd60a58f 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/TestOnlineLOF.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/lof/TestOnlineLOF.java
@@ -1,4 +1,4 @@
-package de.lmu.ifi.dbs.elki.algorithm.outlier;
+package de.lmu.ifi.dbs.elki.algorithm.outlier.lof;
 
 /*
  This file is part of ELKI:
@@ -32,6 +32,9 @@ import java.util.Random;
 import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.FlexibleLOF;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.LOF;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.OnlineLOF;
 import de.lmu.ifi.dbs.elki.data.DoubleVector;
 import de.lmu.ifi.dbs.elki.data.NumberVector;
 import de.lmu.ifi.dbs.elki.data.VectorUtil;
@@ -47,7 +50,7 @@ import de.lmu.ifi.dbs.elki.datasource.FileBasedDatabaseConnection;
 import de.lmu.ifi.dbs.elki.datasource.bundle.MultipleObjectsBundle;
 import de.lmu.ifi.dbs.elki.distance.distancefunction.CosineDistanceFunction;
 import de.lmu.ifi.dbs.elki.distance.distancefunction.DistanceFunction;
-import de.lmu.ifi.dbs.elki.distance.distancefunction.EuclideanDistanceFunction;
+import de.lmu.ifi.dbs.elki.distance.distancefunction.minkowski.EuclideanDistanceFunction;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
 import de.lmu.ifi.dbs.elki.result.outlier.OutlierResult;
 import de.lmu.ifi.dbs.elki.utilities.ClassGenericsUtil;
@@ -97,7 +100,7 @@ public class TestOnlineLOF implements JUnit4Test {
     UpdatableDatabase db = getDatabase();
 
     // 1. Run LOF
-    LOF<DoubleVector, DoubleDistance> lof = new LOF<DoubleVector, DoubleDistance>(k, neighborhoodDistanceFunction, reachabilityDistanceFunction);
+    FlexibleLOF<DoubleVector, DoubleDistance> lof = new FlexibleLOF<>(k, k, neighborhoodDistanceFunction, reachabilityDistanceFunction);
     OutlierResult result1 = lof.run(db);
 
     // 2. Run OnlineLOF (with insertions and removals) on database
@@ -122,13 +125,13 @@ public class TestOnlineLOF implements JUnit4Test {
     Relation<DoubleVector> rep = db.getRelation(TypeUtil.DOUBLE_VECTOR_FIELD);
 
     // setup algorithm
-    OnlineLOF<DoubleVector, DoubleDistance> lof = new OnlineLOF<DoubleVector, DoubleDistance>(k, neighborhoodDistanceFunction, reachabilityDistanceFunction);
+    OnlineLOF<DoubleVector, DoubleDistance> lof = new OnlineLOF<>(k, k, neighborhoodDistanceFunction, reachabilityDistanceFunction);
 
     // run OnlineLOF on database
     OutlierResult result = lof.run(db);
 
     // insert new objects
-    ArrayList<DoubleVector> insertions = new ArrayList<DoubleVector>();
+    ArrayList<DoubleVector> insertions = new ArrayList<>();
     NumberVector.Factory<DoubleVector, ?> o = RelationUtil.getNumberVectorFactory(rep);
     int dim = RelationUtil.dimensionality(rep);
     Random random = new Random(seed);
diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestFeatureBagging.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestFeatureBagging.java
index 18e5c6ac..c3d9f7a0 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestFeatureBagging.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestFeatureBagging.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
 import de.lmu.ifi.dbs.elki.algorithm.AbstractSimpleAlgorithmTest;
-import de.lmu.ifi.dbs.elki.algorithm.outlier.LOF;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.LOF;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.result.outlier.OutlierResult;
 import de.lmu.ifi.dbs.elki.utilities.ClassGenericsUtil;
@@ -45,7 +45,7 @@ public class TestFeatureBagging extends AbstractSimpleAlgorithmTest implements J
 
     // Parameterization
     ListParameterization params = new ListParameterization();
-    params.addParameter(LOF.K_ID, 10);
+    params.addParameter(LOF.Parameterizer.K_ID, 10);
     params.addParameter(FeatureBagging.Parameterizer.NUM_ID, 10);
     params.addParameter(FeatureBagging.Parameterizer.SEED_ID, 1);
 
@@ -66,7 +66,7 @@ public class TestFeatureBagging extends AbstractSimpleAlgorithmTest implements J
 
     // Parameterization
     ListParameterization params = new ListParameterization();
-    params.addParameter(LOF.K_ID, 10);
+    params.addParameter(LOF.Parameterizer.K_ID, 10);
     params.addParameter(FeatureBagging.Parameterizer.NUM_ID, 10);
     params.addParameter(FeatureBagging.Parameterizer.SEED_ID, 5);
     params.addFlag(FeatureBagging.Parameterizer.BREADTH_ID);
diff --git a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestHiCS.java b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestHiCS.java
index 40240ec4..e1ed1f37 100644
--- a/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestHiCS.java
+++ b/test/de/lmu/ifi/dbs/elki/algorithm/outlier/meta/TestHiCS.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import de.lmu.ifi.dbs.elki.JUnit4Test;
 import de.lmu.ifi.dbs.elki.algorithm.AbstractSimpleAlgorithmTest;
-import de.lmu.ifi.dbs.elki.algorithm.outlier.LOF;
+import de.lmu.ifi.dbs.elki.algorithm.outlier.lof.LOF;
 import de.lmu.ifi.dbs.elki.data.DoubleVector;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.math.statistics.tests.KolmogorovSmirnovTest;
@@ -48,7 +48,7 @@ public class TestHiCS extends AbstractSimpleAlgorithmTest implements JUnit4Test
 
     // Parameterization
     ListParameterization params = new ListParameterization();
-    params.addParameter(LOF.K_ID, 10);
+    params.addParameter(LOF.Parameterizer.K_ID, 10);
     params.addParameter(HiCS.Parameterizer.LIMIT_ID, 10);
     params.addParameter(HiCS.Parameterizer.SEED_ID, 0);
     params.addParameter(HiCS.Parameterizer.TEST_ID, KolmogorovSmirnovTest.STATIC);
@@ -60,8 +60,8 @@ public class TestHiCS extends AbstractSimpleAlgorithmTest implements JUnit4Test
     // run HiCS on database
     OutlierResult result = fb.run(db);
 
-    testAUC(db, "Noise", result, 0.9024537815126049);
-    testSingleScore(result, 1293, 5.0754391836);
+    testAUC(db, "Noise", result, 0.85340056);
+    testSingleScore(result, 1293, 4.935802);
   }
 
   @Test
@@ -70,7 +70,7 @@ public class TestHiCS extends AbstractSimpleAlgorithmTest implements JUnit4Test
 
     // Parameterization
     ListParameterization params = new ListParameterization();
-    params.addParameter(LOF.K_ID, 10);
+    params.addParameter(LOF.Parameterizer.K_ID, 10);
     params.addParameter(HiCS.Parameterizer.LIMIT_ID, 10);
     params.addParameter(HiCS.Parameterizer.SEED_ID, 0);
     params.addParameter(HiCS.Parameterizer.TEST_ID, WelchTTest.STATIC);
@@ -82,7 +82,7 @@ public class TestHiCS extends AbstractSimpleAlgorithmTest implements JUnit4Test
     // run HiCS on database
     OutlierResult result = fb.run(db);
 
-    testAUC(db, "Noise", result, 0.6597983193);
-    testSingleScore(result, 1293, 2.6993476951);
+    testAUC(db, "Noise", result, 0.6255238);
+    testSingleScore(result, 1293, 2.542272);
   }
 }
\ No newline at end of file