[Dmcs-notify] SF.net SVN: dmcs:[3295] dmcs/branches/dmcs1.5/examples/test/tables.py

[<mm...@us...>]

Revision: 3295
          http://dmcs.svn.sourceforge.net/dmcs/?rev=3295&view=rev
Author:   mmsc
Date:     2012-11-21 20:21:09 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Display number of collected models in case of timeout.

Modified Paths:
--------------
    dmcs/branches/dmcs1.5/examples/test/tables.py

Modified: dmcs/branches/dmcs1.5/examples/test/tables.py
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/tables.py	2012-11-21 16:21:13 UTC (rev 3294)
+++ dmcs/branches/dmcs1.5/examples/test/tables.py	2012-11-21 20:21:09 UTC (rev 3295)
@@ -88,7 +88,24 @@
     return no_answers
 
 
+def get_no_intermediate_answers(filename):
+    no_answers = '---'
+    print'"filename = ' + filename
+    with open(filename, 'r') as f:
+        lines = f.readlines()
+        if len(lines) > 0:
+            last_line = lines[len(lines)-1]
+            print 'last_line = ' + last_line
+            sign = last_line.find('Received partial equilibria:')
+            if sign != -1:
+                no_answers = last_line[sign + len('Received partial equilibria:') + 1 : len(last_line)-1]
+                print 'no_answers = ' + no_answers
+    f.closed
+    return no_answers
+
+
 def get_outcome(toponame, dirname):
+    err_filename    = dirname + '/' + toponame + '-err.log'
     status_filename = dirname + '/' + toponame + '-status.log'
     time_filename   = dirname + '/' + toponame + '-time.log'
     log_filename    = dirname + '/' + toponame + '.log'
@@ -108,6 +125,7 @@
         noans = get_no_answers(log_filename)
     else:
         outcome = get_error_code(time_filename)
+        noans = get_no_intermediate_answers(err_filename)
 
     return outcome, noans
 
@@ -125,14 +143,6 @@
 
 
 
-def peek(outcomes):
-    for oc in outcomes:
-        print oc[0][0]
-
-    print "\n"
-
-
-
 def ordered_push(outcomes, outcome, sorted_testcases, testcase):
     if outcomes == []:
         outcomes.append(outcome)
@@ -145,7 +155,6 @@
         while i < len(outcomes):
             old_val = float(outcomes[i][0][0])
             i = i + 1
-            print "Compare: " + str(old_val) + " and " + str(new_val)
             if old_val > new_val:
                 found = True
                 break
@@ -157,7 +166,6 @@
             outcomes.insert(i, outcome)
             sorted_testcases.insert(i, testcase)
 
-        peek(outcomes)
 
 
 def process_test_cases(toponame, testpacks, current_test_case):
@@ -192,6 +200,15 @@
 
 
 
+def nice_display(time, val):
+    if time == '1000124':        
+        return '(' + val + ')'
+    elif time == '10001':
+        return 'E'
+    else:
+        return time
+
+
 def build_row(tex_output, tex_row_template, 
               outcomes, sorted_testcases,
               topo, topo_abbr):
@@ -205,6 +222,8 @@
         mem = topo + '-' + instance[1] + '-' + instance[2] + '-' + instance[3] + '-' + instance[4] + '-' + instance[5] 
         str_i = '{' + str(i+1) + '}'
 
+        print outcome
+
         tex_output.write(tex_row_template.format(mem,
                                                  topo_abbr,
                                                  str_i,
@@ -216,12 +235,12 @@
                                                  final_display(outcome[0][1]),
                                                  final_display(outcome[1][0]),
                                                  final_display(outcome[1][1]),
-                                                 final_display(outcome[2][0]),
-                                                 final_display(outcome[3][0]),
-                                                 final_display(outcome[4][0]),
-                                                 final_display(outcome[5][0]),
-                                                 final_display(outcome[6][0]),
-                                                 final_display(outcome[7][0])))
+                                                 nice_display(outcome[2][0], outcome[2][1]),
+                                                 nice_display(outcome[3][0], outcome[3][1]),
+                                                 nice_display(outcome[4][0], outcome[4][1]),
+                                                 nice_display(outcome[5][0], outcome[5][1]),
+                                                 nice_display(outcome[6][0], outcome[6][1]),
+                                                 nice_display(outcome[7][0], outcome[7][1])))
 
 
 def main(argv):

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.