opentox-ruby 3.1.0 → 4.0.0
Sign up to get free protection for your applications and to get access to all the features.
- data/ChangeLog +19 -9
- data/README.markdown +1 -1
- data/Rakefile +2 -1
- data/VERSION +1 -1
- data/lib/algorithm.rb +143 -37
- data/lib/compound.rb +66 -18
- data/lib/dataset.rb +38 -3
- data/lib/model.rb +36 -13
- data/lib/parser.rb +34 -19
- data/lib/r-util.rb +93 -34
- data/lib/serializer.rb +70 -22
- data/lib/stratification.R +71 -7
- data/lib/transform.rb +5 -3
- data/lib/utils.rb +356 -97
- data/lib/validation.rb +6 -4
- metadata +20 -4
data/lib/validation.rb
CHANGED
@@ -19,8 +19,9 @@ module OpenTox
|
|
19
19
|
def self.list( params={} )
|
20
20
|
filter_string = ""
|
21
21
|
params.each do |k,v|
|
22
|
-
filter_string
|
23
|
-
|
22
|
+
filter_string += (filter_string.length==0 ? "?" : "&")
|
23
|
+
v = v.to_s.gsub(/;/, "%3b") if v.to_s =~ /;/
|
24
|
+
filter_string += k.to_s+"="+v.to_s
|
24
25
|
end
|
25
26
|
(OpenTox::RestClientWrapper.get(CONFIG[:services]["opentox-validation"]+filter_string).split("\n"))
|
26
27
|
end
|
@@ -156,8 +157,9 @@ module OpenTox
|
|
156
157
|
def self.list( params={} )
|
157
158
|
filter_string = ""
|
158
159
|
params.each do |k,v|
|
159
|
-
filter_string
|
160
|
-
|
160
|
+
filter_string += (filter_string.length==0 ? "?" : "&")
|
161
|
+
v = v.to_s.gsub(/;/, "%3b") if v.to_s =~ /;/
|
162
|
+
filter_string += k.to_s+"="+v.to_s
|
161
163
|
end
|
162
164
|
(OpenTox::RestClientWrapper.get(File.join(CONFIG[:services]["opentox-validation"],"crossvalidation")+filter_string).split("\n"))
|
163
165
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: opentox-ruby
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 4.0.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-07-16 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: sinatra
|
@@ -466,7 +466,7 @@ dependencies:
|
|
466
466
|
requirements:
|
467
467
|
- - '='
|
468
468
|
- !ruby/object:Gem::Version
|
469
|
-
version: 0.6.
|
469
|
+
version: 0.6.1
|
470
470
|
type: :runtime
|
471
471
|
prerelease: false
|
472
472
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -474,7 +474,7 @@ dependencies:
|
|
474
474
|
requirements:
|
475
475
|
- - '='
|
476
476
|
- !ruby/object:Gem::Version
|
477
|
-
version: 0.6.
|
477
|
+
version: 0.6.1
|
478
478
|
- !ruby/object:Gem::Dependency
|
479
479
|
name: gsl
|
480
480
|
requirement: !ruby/object:Gem::Requirement
|
@@ -507,6 +507,22 @@ dependencies:
|
|
507
507
|
- - '='
|
508
508
|
- !ruby/object:Gem::Version
|
509
509
|
version: 1.1.0
|
510
|
+
- !ruby/object:Gem::Dependency
|
511
|
+
name: redis
|
512
|
+
requirement: !ruby/object:Gem::Requirement
|
513
|
+
none: false
|
514
|
+
requirements:
|
515
|
+
- - '='
|
516
|
+
- !ruby/object:Gem::Version
|
517
|
+
version: 2.2.2
|
518
|
+
type: :runtime
|
519
|
+
prerelease: false
|
520
|
+
version_requirements: !ruby/object:Gem::Requirement
|
521
|
+
none: false
|
522
|
+
requirements:
|
523
|
+
- - '='
|
524
|
+
- !ruby/object:Gem::Version
|
525
|
+
version: 2.2.2
|
510
526
|
- !ruby/object:Gem::Dependency
|
511
527
|
name: jeweler
|
512
528
|
requirement: !ruby/object:Gem::Requirement
|