summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2010-06-29 13:24:03 +0200
committermguetlein <martin.guetlein@gmail.com>2010-06-29 13:24:03 +0200
commit818e97b33178f5fe0a0b02b6db26e0b1bcb4a7ec (patch)
treef9595b28bbd2df0011cb8857320da32af780c746 /lib
parent6fb9ec6db40d25d2892d4d1bb9de33e56979a945 (diff)
enhance model title parsing
Diffstat (limited to 'lib')
-rw-r--r--lib/model.rb4
-rw-r--r--lib/templates/config.yaml5
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/model.rb b/lib/model.rb
index e3ddeb0..b6cef46 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -61,8 +61,10 @@ module OpenTox
def classification?
#HACK replace with request to ontology server
- if @title =~ /lazar classification/
+ if @title =~ /(?i)classification/
return true
+ elsif @title =~ /(?i)regression/
+ return false
elsif @uri =~/ntua/ and @title =~ /mlr/
return false
elsif @uri =~/tu-muenchen/ and @title =~ /regression|M5P|GaussP/
diff --git a/lib/templates/config.yaml b/lib/templates/config.yaml
index 3b97983..dba0bf3 100644
--- a/lib/templates/config.yaml
+++ b/lib/templates/config.yaml
@@ -43,23 +43,18 @@
- "text/plain"
opentox-dataset:
- "application/x-yaml"
- - "text/x-yaml"
- "application/rdf+xml"
opentox-algorithm:
- "application/x-yaml"
- - "text/x-yaml"
- "application/rdf+xml"
opentox-model:
- "application/x-yaml"
- - "text/x-yaml"
- "application/rdf+xml"
opentox-task:
- "application/x-yaml"
- - "text/x-yaml"
- "application/rdf+xml"
opentox-validation:
- "application/x-yaml"
- - "text/x-yaml"
- "application/rdf+xml"
# Timeouts: