From e9676d060e4214e219e36cbb0444506e22dc8e64 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Tue, 8 May 2012 16:42:35 +0200
Subject: Supporting merge time in metadata

---
 bbrc-sample | 2 +-
 fminer.rb   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bbrc-sample b/bbrc-sample
index 813595b..bbd8b46 160000
--- a/bbrc-sample
+++ b/bbrc-sample
@@ -1 +1 @@
-Subproject commit 813595bc811e1fdb71dee0ea9e2f0dc9b6a44cdc
+Subproject commit bbd8b461eca2d7dcc3cfc247e55846e327be41c3
diff --git a/fminer.rb b/fminer.rb
index 3c282c8..e86da65 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -359,6 +359,7 @@ post '/fminer/bbrc/sample/?' do
       @r.eval "bootBbrc(dataset.uri, prediction.feature.uri, num.boots, min.frequency.per.sample, min.sampling.support, NULL, bbrc.service, dataset.service, T)"
       smarts = (@r.pull "ans.patterns").collect! { |id| id.gsub(/\'/,"") } # remove extra quotes around smarts
       r_p_values = @r.pull "ans.p.values"
+      merge_time = @r.pull "merge.time"
     rescue Exception => e
       LOGGER.debug "#{e.class}: #{e.message}"
       LOGGER.debug "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
@@ -378,7 +379,9 @@ post '/fminer/bbrc/sample/?' do
         { DC.title => "min_sampling_support", OT.paramValue => min_sampling_support },
         { DC.title => "num_boots", OT.paramValue => num_boots },
         { DC.title => "min_frequency_per_sample", OT.paramValue => fminer.minfreq },
-        { DC.title => "nr_hits", OT.paramValue => hit_count.to_s }]
+        { DC.title => "nr_hits", OT.paramValue => hit_count.to_s },
+        { DC.title => "merge_time", OT.paramValue => merge_time.to_s }
+          ]
     })
 
     matches.each do |smarts, ids|
-- 
cgit v1.2.3