From c802bfd6c899d4d37e3bd2ee274c1bc3ffb7cd94 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 16 Mar 2011 14:11:37 +0100 Subject: doc for Feature.find, load_features in feature_type --- lib/algorithm.rb | 3 +-- lib/dataset.rb | 3 ++- lib/feature.rb | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3 From fae1c053a76d501dc9a3deac09e7c60433980b51 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 16 Mar 2011 14:16:47 +0100 Subject: Version bump to 0.0.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index afaf360..bd52db8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +0.0.0 \ No newline at end of file -- cgit v1.2.3 From b0ccc26edde30bb2ec459fbe952887a674a23a8c Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 16 Mar 2011 14:17:10 +0100 Subject: Version bump to 1.0.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bd52db8..afaf360 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.0 \ No newline at end of file +1.0.0 \ No newline at end of file -- cgit v1.2.3 From a99b6421f51c9f084dd554fa7d5dc93929d9d2d8 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 16 Mar 2011 14:17:21 +0100 Subject: Version bump to 1.0.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index afaf360..7f20734 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 \ No newline at end of file -- cgit v1.2.3 From c295a3d01a9241c772d7fa7495a3e215a9c69b7e Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 16 Mar 2011 14:19:19 +0100 Subject: v1.0.1 built --- opentox-ruby.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"] -- cgit v1.2.3