summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-11-28 15:00:40 +0100
committerAndreas Maunz <andreas@maunz.de>2011-11-28 15:00:40 +0100
commit1d158c615705d230e069558812d5e1557c3be52b (patch)
tree78373db64f7997697f80338bd5f683e7cc62547e
parent032359816adfbde18588f24e84bbfc84cd131ac7 (diff)
Defaulting pc_prop to nil to allow switching between prop types
-rw-r--r--lib/model.rb2
-rw-r--r--lib/utils.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/model.rb b/lib/model.rb
index c362b68..5f80808 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -130,7 +130,7 @@ module OpenTox
@min_sim = 0.3
@prop_kernel = false
@conf_stdev = false
- @pc_type = "electronic"
+ @pc_type = nil
end
diff --git a/lib/utils.rb b/lib/utils.rb
index 867903e..f742fcc 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -159,7 +159,7 @@ module OpenTox
ambit_ds_service_uri = "http://apps.ideaconsult.net:8080/ambit2/dataset/"
descs = YAML::load_file( File.join(ENV['HOME'], ".opentox", "config", "ambit_descriptors.yaml") )
descs_uris = []
- params[:pc_type] = "electronic" if params[:pc_type].nil?
+ params[:pc_type] = "electronic" if params[:pc_type].nil? # rescue missing pc_type
descs.each { |uri, cat_name|
if cat_name[:category] == params[:pc_type]
descs_uris << uri