]> rtime.felk.cvut.cz Git - can-benchmark.git/commitdiff
projects / can-benchmark.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d9e270)
genhtml: Hopefully completed
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 9 Dec 2010 14:29:20 +0000 (15:29 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 9 Dec 2010 14:29:20 +0000 (15:29 +0100)
gw-tests/genhtml/genhtml.py patch | blob | history

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 558ef4ba16ee03c34c6b9dfd6dd2950d6aefe95b..5425f5ec2a60ec06c53213a8073a5bc1ebd3f762 100755 (executable)
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -127,10 +127,11 @@ class Test:
     def isOnPath(cls, path):
        f = os.path.join(path, '.results')
        return os.path.isfile(f)
     def isOnPath(cls, path):
        f = os.path.join(path, '.results')
        return os.path.isfile(f)
-    def __init__(self, path, values):
+    def __init__(self, path, values, tests=None):
        self.path = path
         self.name = os.path.basename(path)
         self.values = values
        self.path = path
         self.name = os.path.basename(path)
         self.values = values
+        self.tests = tests
     def printThumbLink(self, file):
         thumb = self.path+'/thumb'
         try:
     def printThumbLink(self, file):
         thumb = self.path+'/thumb'
         try:
@@ -141,39 +142,37 @@ class Test:
             print >>file, "<a href='%s/results.html'><img src='%s/thumb/%s'></a>" % \
                   (urllib.quote(self.path), urllib.quote(self.path), img)
     def generateHtml(self):
             print >>file, "<a href='%s/results.html'><img src='%s/thumb/%s'></a>" % \
                   (urllib.quote(self.path), urllib.quote(self.path), img)
     def generateHtml(self):
-        html = open(os.path.join(path, 'results.html'), "w")
+        html = open(os.path.join(self.path, 'results.html'), "w")
+       title = "CAN gateway timing analysis"
+        cdup = "../"*len(self.values)
        print >> html, """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>%s</title>
        print >> html, """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>%s</title>
-<link rel="stylesheet" href="style.css" type="text/css" /> 
+<link rel="stylesheet" href="%sstyle.css" type="text/css" /> 
 </head>
 <body>
 </head>
 <body>
-<h1>%s</h1>"""  % (title, title)
-        params = ["%s %s" % (v.dim, v) for v in self.vals]
-        print >>html, "Results for:", ", ".join(params), "<hr />"
-       for d in self.dimOther:
-            print >>html, "%s: " % d
-            print >>html, "<a href='%s'>X axis</a>, " % \
-                Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName()
-            print >>html, "<a href='%s'>Y axis</a>;&nbsp;&nbsp;" % \
-                Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
+<h1>%s</h1>"""  % (title, cdup, title)
+        params = ["%s %s" % (v.dim, v) for v in self.values]
+        print >>html, "Results for:", ", ".join(params)
+        print >>html, "<div class='box'><h4>Other views</h4>"
+       for d in self.tests.space:
             links = []
             for v in d.values():
             links = []
             for v in d.values():
-                if v in self.valsOther:
+                if v in self.values:
                     links.append(str(v))
                 else:
                     links.append(str(v))
                 else:
-                    vv = DimValues(self.valsOther)
+                    vv = DimValues(self.values)
                     vv.replace(v)
                     vv.replace(v)
-                    links.append("<a href='%s'>%s</a>"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
-            print >>html, " | ".join(links)
-            print >>html, "<br>"
-            try:
-                print >>html, d.htmlPreamble()
-            except Exception:
-                pass
+                    href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
+                    links.append("<a href='%s'>%s</a>"%(href, str(v)))
+            print >>html, "%s: " % d, " | ".join(links), "<br>"
 
 
+        print >>html, "</div>"
+        print >>html, "<div><img src='%s' /></div>" % (self.name+".png")
+        print >>html, "<a href='./'>Raw data</a><br />"
+        print >>html, "<a href='%s'>Back to top</a>" % cdup
         
         html.close()
 
         
         html.close()
 
@@ -240,12 +239,13 @@ class Tests(dict):
                 if len(coordinates) != len(self.space):
                     raise KeyError("The number coordinates do not match the number of dimensions: " + str(coordinates))
                 dv = DimValues([DimValue(self.space[i], coordinates[i]) for i in xrange(len(coordinates))])
                 if len(coordinates) != len(self.space):
                     raise KeyError("The number coordinates do not match the number of dimensions: " + str(coordinates))
                 dv = DimValues([DimValue(self.space[i], coordinates[i]) for i in xrange(len(coordinates))])
-               self.addTest(Test(root, dv))
+               self.addTest(Test(root, dv, self))
     def generateHtml(self):
        for pair in self.space.iterDimensionPairs():
            remDims = Space(*tuple([d for d in self.space.iterRemainingDimensions(pair)]))
            for vals in remDims.iterValues():
                page = Page(pair, vals, self)
     def generateHtml(self):
        for pair in self.space.iterDimensionPairs():
            remDims = Space(*tuple([d for d in self.space.iterRemainingDimensions(pair)]))
            for vals in remDims.iterValues():
                page = Page(pair, vals, self)
+                print page.getName()
                page.generate()
        try:
            os.remove("index.html")
                page.generate()
        try:
            os.remove("index.html")
@@ -259,6 +259,9 @@ h4 { margin: 0; }
 .box { border: 1px solid black; padding: 1ex; margin: 1ex 0}
 """
         css.close()
 .box { border: 1px solid black; padding: 1ex; margin: 1ex 0}
 """
         css.close()
+        for test in self.values():
+            print test.path
+            test.generateHtml()
 
        #os.system("source-highlight -d --output-dir=. ../*.sh")
 
 
        #os.system("source-highlight -d --output-dir=. ../*.sh")
 
Unnamed repository; edit this file to name it for gitweb.