From 4d6083e0cf39c4989e08bdaf9384e9d44c0da607 Mon Sep 17 00:00:00 2001 From: pvtroshin Date: Thu, 3 Feb 2011 17:17:42 +0000 Subject: [PATCH] Parser for DisEMBL results and finished runner, few test cases. DisemblTester has all tests "green" git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@3695 e3abac25-378b-4346-85de-24260fe3988d --- .classpath | 4 +- build.xml | 10 +- conf/Executable.properties | 2 +- conf/settings/DisemblParameters.xml | 6 +- datamodel/compbio/data/sequence/SequenceUtil.java | 49 +- runner/compbio/runner/disorder/Disembl.java | 92 +- runtests.sh | 4 +- .../compbio/data/sequence/SequenceUtilTester.java | 28 +- testsrc/compbio/runner/disorder/DisemblTester.java | 59 +- testsrc/testdata/disembl_default.out | 21 + testsrc/testdata/scores.out | 1568 ++++++++++++++++++++ 11 files changed, 1718 insertions(+), 125 deletions(-) create mode 100644 testsrc/testdata/disembl_default.out create mode 100644 testsrc/testdata/scores.out diff --git a/.classpath b/.classpath index 0ace127..4820b06 100644 --- a/.classpath +++ b/.classpath @@ -1,10 +1,10 @@ + + - - diff --git a/build.xml b/build.xml index 02298e0..5597457 100644 --- a/build.xml +++ b/build.xml @@ -87,18 +87,18 @@ - - + - - - + + diff --git a/conf/Executable.properties b/conf/Executable.properties index 4b1cb00..548507c 100644 --- a/conf/Executable.properties +++ b/conf/Executable.properties @@ -75,7 +75,7 @@ jronn.cluster.settings=-q 64bit-pri.q -pe smp 4 -l h_vmem=1700M -l ram=1700M -l ### Disembl configuration Tisean - Disembl dependancy cannot be redistributed (!) ### #local.disembl.bin.windows= local.disembl.bin=binaries/src/disembl/DisEMBL.py -cluster.disembl.bin=/homes/pvtroshin/jaba2/binaries/src/disembl/DisEMBL.py +cluster.disembl.bin=/homes/pvtroshin/workspace/jaba2/binaries/src/disembl/DisEMBL.py disembl.parameters.file=conf/settings/DisemblParameters.xml disembl.limits.file=conf/settings/DisemblLimits.xml disembl.cluster.settings=-l h_cpu=24:00:00 -l h_vmem=6000M -l ram=6000M diff --git a/conf/settings/DisemblParameters.xml b/conf/settings/DisemblParameters.xml index 3820a35..676395e 100644 --- a/conf/settings/DisemblParameters.xml +++ b/conf/settings/DisemblParameters.xml @@ -1,5 +1,9 @@ +