Import Debian changes 0.5.0-1

elki (0.5.0-1) unstable; urgency=low

  * New upstream release: 0.5.0 final.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/datasource/parser/AbstractParser.java b/src/de/lmu/ifi/dbs/elki/datasource/parser/AbstractParser.java
index dcfb8245..3c294ca4 100644
--- a/src/de/lmu/ifi/dbs/elki/datasource/parser/AbstractParser.java
+++ b/src/de/lmu/ifi/dbs/elki/datasource/parser/AbstractParser.java
@@ -46,12 +46,12 @@ public abstract class AbstractParser {
   /**
    * A pattern defining whitespace.
    */
-  public static final String WHITESPACE_PATTERN = "\\s+";
+  public static final String DEFAULT_SEPARATOR = "(\\s+|\\s*[,;]\\s*)";
 
   /**
    * A quote pattern
    */
-  public static final String QUOTE_CHAR = "\"";
+  public static final char QUOTE_CHAR = '\"';
 
   /**
    * A pattern catching most numbers that can be parsed using Double.parseDouble:
@@ -63,7 +63,7 @@ public abstract class AbstractParser {
 
   /**
    * OptionID for the column separator parameter (defaults to whitespace as in
-   * {@link #WHITESPACE_PATTERN}.
+   * {@link #DEFAULT_SEPARATOR}.
    */
   public static final OptionID COLUMN_SEPARATOR_ID = OptionID.getOrCreateOptionID("parser.colsep", "Column separator pattern. The default assumes whitespace separated data.");
 
@@ -81,7 +81,7 @@ public abstract class AbstractParser {
   /**
    * Stores the quotation character
    */
-  protected char quoteChar = QUOTE_CHAR.charAt(0);
+  protected char quoteChar = QUOTE_CHAR;
 
   /**
    * The comment character.
@@ -205,16 +205,16 @@ public abstract class AbstractParser {
     /**
      * Stores the quotation character
      */
-    protected char quoteChar = QUOTE_CHAR.charAt(0);
+    protected char quoteChar = QUOTE_CHAR;
 
     @Override
     protected void makeOptions(Parameterization config) {
       super.makeOptions(config);
-      PatternParameter colParam = new PatternParameter(COLUMN_SEPARATOR_ID, WHITESPACE_PATTERN);
+      PatternParameter colParam = new PatternParameter(COLUMN_SEPARATOR_ID, DEFAULT_SEPARATOR);
       if(config.grab(colParam)) {
         colSep = colParam.getValue();
       }
-      StringParameter quoteParam = new StringParameter(QUOTE_ID, new StringLengthConstraint(1, 1), QUOTE_CHAR);
+      StringParameter quoteParam = new StringParameter(QUOTE_ID, new StringLengthConstraint(1, 1), ""+QUOTE_CHAR);
       if(config.grab(quoteParam)) {
         quoteChar = quoteParam.getValue().charAt(0);
       }