summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2016-12-08 13:08:55 +0100
committerChristoph Helma <helma@in-silico.ch>2016-12-08 13:08:55 +0100
commit2176251f76703cc9953a408938e846de026b3d4c (patch)
treecaf7a125a4d8387e22414a1ce8a5ba98dc92073d
parentbd0d062a05b97a6d875b6f94bdb77da4de9b512a (diff)
parent4570f11444bc10da88d849e9a2812e95a8933c8a (diff)
merged origin/development
-rw-r--r--lazar.gemspec12
-rw-r--r--lib/model.rb4
2 files changed, 8 insertions, 8 deletions
diff --git a/lazar.gemspec b/lazar.gemspec
index dfdaac8..90f1cf2 100644
--- a/lazar.gemspec
+++ b/lazar.gemspec
@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
# specify any dependencies here; for example:
- s.add_runtime_dependency 'bundler', '~> 1.11'
- s.add_runtime_dependency 'rest-client', '~> 1.8'
- s.add_runtime_dependency 'nokogiri', '~> 1.6'
- s.add_runtime_dependency 'rserve-client', '~> 0.3'
- s.add_runtime_dependency 'mongoid', '~> 5.0'
- s.add_runtime_dependency 'openbabel', '~> 2.3', '>= 2.3.2.2'
+ s.add_runtime_dependency 'bundler'
+ s.add_runtime_dependency 'rest-client'
+ s.add_runtime_dependency 'nokogiri'
+ s.add_runtime_dependency 'rserve-client'
+ s.add_runtime_dependency 'mongoid'
+ s.add_runtime_dependency 'openbabel'
end
diff --git a/lib/model.rb b/lib/model.rb
index 76ca0c9..5a1c191 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -364,7 +364,7 @@ module OpenTox
end
def repeated_crossvalidation
- OpenTox::Validation::RepeatedCrossValidation.find repeated_crossvalidation_id
+ OpenTox::Validation::RepeatedCrossValidation.find repeated_crossvalidation_id # full class name required
end
def crossvalidations
@@ -386,7 +386,7 @@ module OpenTox
training_dataset = Dataset.from_csv_file file
model = Lazar.create training_dataset: training_dataset
model_validation[:model_id] = model.id
- model_validation[:repeated_crossvalidation_id] = OpenTox::Validation::RepeatedCrossValidation.create(model).id
+ model_validation[:repeated_crossvalidation_id] = OpenTox::Validation::RepeatedCrossValidation.create(model).id # full class name required
model_validation.save
model_validation
end