[Collab-qa-commits] r1452 - archive-rebuilds

[Lucas Nussbaum]

Author: lucas
Date: 2009-05-08 20:09:03 +0000 (Fri, 08 May 2009)
New Revision: 1452

Modified:
   archive-rebuilds/merge-results.rb
Log:
update merge-results.rb for new format

Modified: archive-rebuilds/merge-results.rb
===================================================================
--- archive-rebuilds/merge-results.rb	2009-05-08 20:05:41 UTC (rev 1451)
+++ archive-rebuilds/merge-results.rb	2009-05-08 20:09:03 UTC (rev 1452)
@@ -3,7 +3,7 @@
 class Result
   attr_accessor :version, :result, :time, :guess, :explanation
   def to_s
-    "#{@version} #{@result} #{@time} #{@guess} #{@explanation}"
+    "#{@version} #{@result} #{@guess} #{@explanation}"
   end
 end
 
@@ -11,7 +11,7 @@
 IO::read(ARGV[0]).each_line do |l|
   l.chomp!
   r = Result::new
-  p, r.version, r.result, r.time, r.guess, r.explanation = l.split(' ', 6)
+  p, r.version, r.result, r.time, r.guess, r.explanation = l.split(' ', 5)
   if r.explanation.nil?
     r.explanation = ""
   end
@@ -23,8 +23,8 @@
 IO::read(ARGV[1]).each_line do |l|
   l.chomp!
   r = Result::new
-  pkg, r.version, r.result, r.time, r.guess, r.explanation = l.split(' ', 6)
-  r.explanation = "TODO" if r.explanation.nil?
+  pkg, r.version, r.result, r.guess, r.explanation = l.split(' ', 5)
+  r.explanation = "TODO"
   if previous[pkg].nil?
     r.explanation += " NEWFAIL"
   else
@@ -37,22 +37,6 @@
       r.explanation += " RECHECK"
       r.explanation += " RECHECK_VERSION" if r.version != prev.version
       r.explanation += " RECHECK_GUESS" if r.guess != prev.guess
-      nt = r.time.to_f
-      ot = prev.time.to_f
-      m = [ nt, ot ].min.to_f
-      ratio = (nt - ot).abs.to_f
-      if m < 30
-        p = 1.0
-      elsif m < 100
-        p = 0.6
-      elsif m < 300
-        p = 0.4
-      else
-        p = 0.2
-      end
-      if (ratio/m) >= p
-        r.explanation += " RECHECK_TIME(#{nt.to_i}/#{ot.to_i})"
-      end
     end
     previous.delete(pkg)
   end