From d04cc6fbd4247b3d602eec1f018d0ab3786d36b0 Mon Sep 17 00:00:00 2001 From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04> Date: Wed, 17 Mar 2010 16:20:25 +0000 Subject: [PATCH] allow negative data values git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13517 ee4ac58c-ac51-4696-9907-e4b3aa274f04 --- uk/ac/sanger/artemis/plot/UserDataAlgorithm.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uk/ac/sanger/artemis/plot/UserDataAlgorithm.java b/uk/ac/sanger/artemis/plot/UserDataAlgorithm.java index 6cb14113b..986a37ad3 100644 --- a/uk/ac/sanger/artemis/plot/UserDataAlgorithm.java +++ b/uk/ac/sanger/artemis/plot/UserDataAlgorithm.java @@ -120,13 +120,13 @@ public class UserDataAlgorithm extends BaseAlgorithm LinePushBackReader pushback_reader = new LinePushBackReader (document_reader); String first_line = pushback_reader.readLine (); - - Pattern dataPattern = Pattern.compile("^\\s*([\\d\\.]+\\s*)+$"); + + Pattern dataPattern = Pattern.compile("^\\s*([\\d\\.-]+\\s*)+$"); Pattern blastPattern = Pattern.compile( "^(\\S+\\t+){2}[\\d\\.]+\\t+(\\d+\\t+){7}\\S+\\t+(\\s*\\d+)$"); Pattern mspCrunchPattern = Pattern.compile( "^\\d+\\s[\\d\\.]+(\\s\\d+){2}\\s\\D\\S+(\\s\\d+){2}\\s\\D\\S+.*"); - + if(dataPattern.matcher(first_line).matches()) FORMAT = BASE_PER_LINE_FORMAT; else if(blastPattern.matcher(first_line).matches()) -- GitLab