Merge pull request diffblue#231 from diffblue/feature/improved_HTML_interface_to_results

Improved HTML interface to results of the instrumenter and error traces.

Author: marek-trtik

driver/presentation.py

@@ -317,30 +317,36 @@ def build_HTML_interface_to_slicing_tasks(root_dir,sub_dir,ofile):
     ofile.write("<p></p>\n")
 
     with open(os.path.join(full_sub_dir,"instrumented_goto_programs.json")) as json_file:
-        sliced_goto_programs = json.load(json_file)
-    if sliced_goto_programs is not None:
+        instrumented_goto_programs = json.load(json_file)
+    if instrumented_goto_programs is not None:
         ofile.write("<table>\n"
                     "<caption>Slicing tasks (per root function).</caption>\n"
                     "  <tr>\n"
                     "    <th>Root function</th>\n"
                     "    <th>Functions</th>\n"
                     "    <th>Symbol table</th>\n"
+                    "    <th>Stats (JSON)</th>\n"
+                    "    <th>File</th>\n"
                     "  </tr>\n")
-        for slice in sliced_goto_programs:
-            dir_name=text_to_file_or_dir_name(slice["root_function"])
+        for slicing_task in instrumented_goto_programs:
+            dir_name = text_to_file_or_dir_name(slicing_task["root_function"])
             ofile.write("  <tr>\n")
-            ofile.write("    <td>" + escape_text_to_HTML(slice["root_function"]) + "</td>\n")
+            ofile.write("    <td>" + escape_text_to_HTML(slicing_task["root_function"]) + "</td>\n")
             ofile.write("    <td align=\"center\"><a href=\"./" + os.path.join(sub_dir,dir_name,"index.html") +
                         "\">here</a></td>\n")
             ofile.write("    <td align=\"center\"><a href=\"./" + os.path.join(sub_dir,dir_name,"symbol_table.html") +
                         "\">here</a></td>\n")
+            ofile.write("    <td align=\"center\"><a href=\"./" +
+                        os.path.relpath(os.path.splitext(slicing_task["goto_binary_file"])[0] + ".stats.json", root_dir) +
+                        "\">here</a></td>\n")
+            ofile.write("    <td>" + escape_text_to_HTML(slicing_task["goto_binary_file"]) + "</td>\n")
             ofile.write("  </tr>\n")
         ofile.write("</table>\n")
 
     ofile.write("<p>Resulting JSON file containing the configuration of all slicing tasks: "
                 "<a href=\"./" + sub_dir + "/instrumented_goto_programs.json\">here</a></p>\n")
 
-    return len(sliced_goto_programs)
+    return len(instrumented_goto_programs)
 
 
 def build_HTML_interface_to_group_of_error_traces(traces,tool_name,tgt_file,tgt_line,ofile):
@@ -383,7 +389,7 @@ def build_HTML_interface_to_error_traces(root_dir,sub_dir,ofile):
         return
 
     ofile.write("<table>\n"
-                "<caption>Error traces (grouped by target locations) found by CBMC and SYMEX.</caption>\n"
+                "<caption>Error traces (grouped by target locations).</caption>\n"
                 "  <tr>\n"
                 "    <th>File</th>\n"
                 "    <th>Line</th>\n"