diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-03-16 14:19:35 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-03-16 14:19:35 +0100 |
| commit | 54867c288a046c0a747779fb6d6bcb4fe8f1d0a9 (patch) | |
| tree | 00ec365c9d7af53eb672e0e5d3cbb55a7ef9b5a8 | |
| parent | 349dd03693bfc357b011e9ebb5b459f6aa893f95 (diff) | |
| parent | c295a3d01a9241c772d7fa7495a3e215a9c69b7e (diff) | |
Merge branch 'release/v1.0.1'v1.0.1
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/algorithm.rb | 3 | ||||
| -rw-r--r-- | lib/dataset.rb | 3 | ||||
| -rw-r--r-- | lib/feature.rb | 3 | ||||
| -rw-r--r-- | opentox-ruby.gemspec | 4 |
5 files changed, 9 insertions, 6 deletions
@@ -1 +1 @@ -1.0.0
\ No newline at end of file +1.0.1
\ No newline at end of file diff --git a/lib/algorithm.rb b/lib/algorithm.rb index af8dfaf..c8cb116 100644 --- a/lib/algorithm.rb +++ b/lib/algorithm.rb @@ -190,8 +190,7 @@ module OpenTox gram_matrix[i][i] = 1.0 end - LOGGER.debug gram_matrix.to_yaml - + #LOGGER.debug gram_matrix.to_yaml @r = RinRuby.new(false,false) # global R instance leads to Socket errors after a large number of requests @r.eval "library('kernlab')" # this requires R package "kernlab" to be installed LOGGER.debug "Setting R data ..." diff --git a/lib/dataset.rb b/lib/dataset.rb index 2c47502..c61d86f 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -165,7 +165,8 @@ module OpenTox # Detect feature type(s) in the dataset # @return [String] `classification", "regression", "mixed" or unknown` - def feature_type + def feature_type(subjectid=nil) + load_features(subjectid) feature_types = @features.collect{|f,metadata| metadata[OT.isA]}.uniq if feature_types.size > 1 "mixed" diff --git a/lib/feature.rb b/lib/feature.rb index c0729a7..e768f7b 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -2,6 +2,9 @@ module OpenTox class Feature include OpenTox + # Find a feature + # @param [String] uri Feature URI + # @return [OpenTox::Task] Feature object def self.find(uri, subjectid=nil) return nil unless uri feature = Feature.new uri diff --git a/opentox-ruby.gemspec b/opentox-ruby.gemspec index 75fa877..2f4370a 100644 --- a/opentox-ruby.gemspec +++ b/opentox-ruby.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{opentox-ruby} - s.version = "1.0.0" + s.version = "1.0.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Christoph Helma, Martin Guetlein, Andreas Maunz, Micha Rautenberg, David Vorgrimmler"] - s.date = %q{2011-03-09} + s.date = %q{2011-03-16} s.description = %q{Ruby wrapper for the OpenTox REST API (http://www.opentox.org)} s.email = %q{helma@in-silico.ch} s.executables = ["opentox-install-debian.sh", "opentox-install-ubuntu.sh"] |