summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2018-04-03 13:41:15 +0000
committergebele <gebele@in-silico.ch>2018-04-03 13:41:15 +0000
commitaa678ba1f3988d2b42f372b6da0499b403708e58 (patch)
tree9999f3b3d393a3439be927619f442a6a8d19abdc
parent245a13f5e8e887ea0884eebe15845b8d768b1e71 (diff)
version bump;caret documentation fix
-rw-r--r--VERSION2
-rw-r--r--lazar-gui.gemspec2
-rw-r--r--views/model_details.haml9
3 files changed, 9 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index 26aaba0..88c5fb8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0
+1.4.0
diff --git a/lazar-gui.gemspec b/lazar-gui.gemspec
index 2f40224..104fb29 100644
--- a/lazar-gui.gemspec
+++ b/lazar-gui.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.rubyforge_project = "lazar-gui"
s.files = `git ls-files`.split("\n")
- s.add_runtime_dependency "lazar", ">= 1.0.0"
+ s.add_runtime_dependency "lazar"
s.add_runtime_dependency "sinatra"
s.add_runtime_dependency "rdiscount"
s.add_runtime_dependency "haml"
diff --git a/views/model_details.haml b/views/model_details.haml
index d85d2fb..c5e3370 100644
--- a/views/model_details.haml
+++ b/views/model_details.haml
@@ -28,8 +28,13 @@
= ", min: #{model.model.algorithms["similarity"]["min"]}"
%br
Prediction:
- %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox%2F#{model.model.algorithms["prediction"]["method"].sub("::","%2f")}", :rel=>"external"}
- = model.model.algorithms["prediction"]["method"]
+ - if model.model.algorithms["prediction"]["method"] !~ /Caret/
+ %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox%2F#{model.model.algorithms["prediction"]["method"].sub("::","%2f")}", :rel=>"external"}
+ = model.model.algorithms["prediction"]["method"]
+ - else
+ %a{:href=>"http://www.rubydoc.info/gems/lazar/OpenTox/Algorithm/Caret", :rel=>"external"}
+ = model.model.algorithms["prediction"]["method"]
+
%br
Descriptors:
= model.model.algorithms["descriptors"]["method"]+","