evoc 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a68050e4c0549ae496b8aa53cfdf00c452a596
-  data.tar.gz: 9f51e810f2402c4238f0fd0df127de5df813ea3b
+  metadata.gz: d556543c7f271c2c9c6a18ffb508b5f167b64629
+  data.tar.gz: 62a6606b2096cf0d25a522cc27766f9bac752bcf
 SHA512:
-  metadata.gz: 2d8cb5d438e8299ffb5ad7a8eabf0cd99c3a3dec8951a32e1e7eea476b5b471a7fa02afd04320d56b5d539c20315bfaaf1422436b545dbbbcc32125ee70d0d2a
-  data.tar.gz: bbaee8dcd9dee18adeb8bb070e7aaf33b19225d237026546d6924684518006f400e527d3758f3f9a8a23cb9bc929a6d56a3d371ee9ac46ec2125f3f86cc61419
+  metadata.gz: b73b5929392077c66b2b6a21e50abcb76715a8173cee0958a8238e93d8d3c86deb92bded7162158015b0cb1b38485d17194d629d3afa315af99800eff16ae55c
+  data.tar.gz: 8882a45dab133b128ca7901d3924a46b716205af42fd6997bd8482bcc735bd63a869d4a55509f559ff53b69c62acb93ec8a62cebd09350696ce0e6f7aee20c38

data/lib/evoc/experiment.rb

@@ -45,7 +45,13 @@ module Evoc
         sampling_history = sampling_history.select {|tx| tx.index >= self.opts[:minimum_history]}
         STDERR.puts "    Filtering to txes with at least #{self.opts[:minimum_history]} previous txes (new pool size: #{sampling_history.size})"
       end
-      filtering_switches = [:recent,:minimum_commit_size,:maximum_commit_size,:minimum_history]
+      if !self.opts[:recent_viable].nil?
+        size = sampling_history.size
+        sampling_history = sampling_history[[0,size-self.opts[:recent_viable]].max..-1]
+        STDERR.puts "    Filtering to the #{self.opts[:recent_viable]} most recent viable transactions (new pool size: #{sampling_history.size})"
+      end
+
+      filtering_switches = [:recent,:recent_viable,:minimum_commit_size,:maximum_commit_size,:minimum_history]
       if filtering_switches.any? {|s| !self.opts[s].nil?}
         if sampling_history.size == 0
           STDERR.puts "WARNING: All transactions were filtered out, unable to sample"
@@ -302,7 +308,7 @@ module Evoc
             Evoc::RecommendationCache.evaluate_last(evaluators: self.opts[:evaluators], topk: self.opts[:topk], unique_consequents: self.opts[:unique_consequents], expected_outcome: s.expected_outcome,measure_combination: s.measures)
             result = Evoc::RecommendationCache.to_h(measures: s.measures)
             # merge scenario params with result hash and dump as json
-            $stdout.puts s.to_h.merge(result).merge({topk: self.opts[:topk],date: tx.date}).to_json
+            $stdout.puts s.to_h.merge({topk: self.opts[:topk],date: tx.date}).merge(result).to_json
           rescue ArgumentError => e
             invalid_configuration += 1
             last_error = e.message

data/lib/evoc/scenario.rb

@@ -123,7 +123,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}, model_age:#{self.model_age}, tx_index:#{self.tx_index})"
+        raise ArgumentError, "Model out of bound"
       end
       return value
     end

data/lib/evoc/version.rb

@@ -1,3 +1,3 @@
 module Evoc
-  VERSION = "3.9.0"
+  VERSION = "3.9.1"
 end

data/lib/evoc_cli/experiment.rb

@@ -21,10 +21,11 @@ module EvocCLI
     # sample_transactions
     method_option :sample_groups, aliases: "-g", type: :array, required: true, desc: "What tx size groups to sample from"
     method_option :sample_size, aliases: "-s", type: :numeric, required: true, desc: "Number of transactions to sample from each group"
+    method_option :recent, type: :numeric, desc: "Filter to the X most recent transactions"
+    method_option :maximum_commit_size, type: :numeric, desc: "Filter out transactions which are larger or equal than this before sampling"
+    method_option :minimum_commit_size, type: :numeric, default: 2, desc: "Filter out transactions which are smaller or equal than this before sampling"
     method_option :minimum_history, :aliases => '-m', type: :numeric, desc: "Filter out transactions which has less previous history than this"
-    method_option :maximum_commit_size, type: :numeric, desc: "Filter out transactions which are larger than this before sampling"
-    method_option :minimum_commit_size, type: :numeric, default: 2, desc: "Filter out transactions which are smaller than this before sampling"
-    method_option :recent, type: :numeric, desc: "Sample in the X most recent transactions"
+    method_option :recent_viable, type: :numeric, desc: "Filter to the X most recent viable transactions"
     method_option :after, :aliases => '-a', :desc => "Only include commits after this date"
     method_option :before, :aliases => '-b', :desc => "Only include commits before this date"
     desc "sample_transactions [OPTIONS]","Make a sample of transactions (from JSON format)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evoc
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - Thomas Rolfsnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler