Fixed underrun of descriptors

2 files changed, 3 insertions, 1 deletions

diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 7ee388a..89df9e1 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -429,6 +429,8 @@ module OpenTox
           maxcols = params[:maxcols]
 
           nr_cases, nr_features = get_sizes n_prop
+          maxcols = nr_features if maxcols > nr_features
+
           data_matrix = GSL::Matrix.alloc(n_prop.flatten, nr_cases, nr_features)
           query_matrix = GSL::Matrix.alloc(q_prop.flatten, 1, nr_features) # same nr_features
 
diff --git a/lib/utils.rb b/lib/utils.rb
index daec3cb..44a3e2b 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -157,7 +157,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_group] = "constitutional" if params[:pc_group].nil?
+        params[:pc_group] = "electronic" if params[:pc_group].nil?
         descs.each { |uri, cat_name| 
           if cat_name[:category] == params[:pc_group]
             descs_uris << uri