Import Debian changes 0.4.0~beta2-1

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

  * New upstream release.
  * Build with OpenJDK 7, which just entered unstable.
  * Move to main, since we can now build with free software only.
  * Drop Vcs-Browser used incorrectly (pointing to upstream VCS, not
    Debian packaging) (Closes: #638516)

1 files changed, 39 insertions, 21 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java b/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java
index ffb539ce..199c1048 100644
--- a/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java
+++ b/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java
@@ -1,26 +1,27 @@
 package de.lmu.ifi.dbs.elki.utilities;
-/*
-This file is part of ELKI:
-Environment for Developing KDD-Applications Supported by Index-Structures
-
-Copyright (C) 2011
-Ludwig-Maximilians-Universität München
-Lehr- und Forschungseinheit für Datenbanksysteme
-ELKI Development Team
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/*
+ This file is part of ELKI:
+ Environment for Developing KDD-Applications Supported by Index-Structures
+
+ Copyright (C) 2011
+ Ludwig-Maximilians-Universität München
+ Lehr- und Forschungseinheit für Datenbanksysteme
+ ELKI Development Team
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 import java.util.AbstractCollection;
 import java.util.ArrayList;
@@ -530,6 +531,23 @@ public final class DatabaseUtil {
   }
 
   /**
+   * Get the column name or produce a generic label "Column XY".
+   * 
+   * @param rel Relation
+   * @param col Column
+   * @return Label
+   */
+  public static <V extends FeatureVector<?, ?>> String getColumnLabel(Relation<? extends V> rel, int col) {
+    String lbl = assumeVectorField(rel).getLabel(col);
+    if(lbl != null) {
+      return lbl;
+    }
+    else {
+      return "Column " + col;
+    }
+  }
+
+  /**
    * Iterator class that retrieves the given objects from the database.
    * 
    * @author Erich Schubert