evoc 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de896e4c41f41f2c7c235e34c365b77ed95bd060
-  data.tar.gz: 62bcb4d03197066b274f4ee25405fbb4793b5871
+  metadata.gz: 8945b15a68ce28d5c3c9e8b10b2478f3fcbb139f
+  data.tar.gz: 597aaf2639f69c61788312c030c76706e419b0bf
 SHA512:
-  metadata.gz: ceed8a9223dda76ddfed1137eae2fbc30b3ae89c655e0314cc11fdac8e8d1633fb7619aa37a55db66bd1a16a5fc5af54c357f2f89f7f7e11139e1209b379b124
-  data.tar.gz: 6def5400d086425dd656ad74fc09c5e1fad81256f7c92ffd5f46c8e4f4cbd42f00a9745fe0cf3bba6dab9a900a641c91b839376fd691ac8ef5904b64ce1862fa
+  metadata.gz: 804e7b6ec7b27c35b09697a44f5f20895efe94a31631c8068ba83861d69856e948820056b22571b10bd47ce09a2104dd73f21cd18df0bf49619df23813425d61
+  data.tar.gz: 9ad3251c853afb583f0f257cec83cb09959aab339140cea5a7c032d48ff7e023a80f8239ae6b269d0357aafa0e8757c6912f6814fe8b85e51e285dd85e83e44d

data/lib/evoc/experiment.rb

@@ -207,6 +207,7 @@ module Evoc
 
       factors = [factor_model_size,factor_max_size,factor_model_age,factor_algorithms,factor_measures,factor_permutation,factor_aggregators].compact
       num_of_scenarios = factors.inject(1) {|product,f| product * f.size}
+      invalid_configuration = 0 
       CSV.foreach(self.opts[:queries], headers: true) do |query|
         # abort if the failsafe file is present 
         if !self.opts[:fail_safe].nil?
@@ -221,14 +222,22 @@ module Evoc
         # - the block form of #product makes it lazy (i.e., the whole cartesian product isn't generated at once)
         factors.first.product(*factors[1..-1]).each do |scenario|
           # Print progress to stderr
-          STDERR.print "(#{self.opts[:case_id]}) Executing scenario #{current_scenario} of #{num_of_scenarios} on query #{current_line} of #{num_lines}                             \r"
+          STDERR.print "(#{self.opts[:case_id]}) Executing scenario #{current_scenario} of #{num_of_scenarios} on query #{current_line} of #{num_lines} (scenarios skipped: #{invalid_configuration})                             \r"
 
-          params = query.to_h.merge(scenario.to_h)
+          query_hash = query.to_h
+          # convert query to array
+          query_hash['query'] = query_hash['query'].split(',')
+          params = query_hash.merge(scenario.to_h)
           params[:case_id] = self.opts[:case_id]
           params[:granularity] = self.opts[:granularity]
           # initialize scenario
           q =  Evoc::Scenario.new(params)
-          $stdout.puts  q.call(evaluators: self.opts[:evaluators]).to_json
+          begin
+            result = q.call(evaluators: self.opts[:evaluators]).to_json
+            $stdout.puts result
+          rescue ArgumentError => e
+            invalid_configuration += 1
+          end
           current_scenario += 1
         end
         current_line += 1

data/lib/evoc/scenario.rb

@@ -157,7 +157,7 @@ module Evoc
     def model_start
       value = self.tx_index - self.model_size.to_i - self.model_age.to_i
       if value < 0
-        raise ArgumentError, "The model start index was negative (model_size:#{self.model_size}, tx_index:#{self.tx_index})"
+        raise ArgumentError, "The model start index was negative (model_size:#{self.model_size}, model_age:#{self.model_age}, tx_index:#{self.tx_index})"
       end
       return value
     end
@@ -206,6 +206,7 @@ module Evoc
   	# custom setter for query
     def query=(query)
       if !query.nil?
+        raise ArgumentError, "Query must be an array" unless query.is_a?(Array)
         @query = query
         # convert to list of integers
         @query.map!(&:to_i) 

data/lib/evoc/version.rb

@@ -1,3 +1,3 @@
 module Evoc
-  VERSION = "3.6.1"
+  VERSION = "3.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evoc
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Thomas Rolfsnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler