X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/9f7f766a0e3ba735653da76c5564d3d182c12a6c..930f41a0e5e559aa258dc64cb7f95fea173c088d:/gw-tests/genhtml/genhtml.py
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 8a94dc8..b4d2d36 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -9,11 +9,9 @@ import traceback
class DimValue(object):
def __new__(cls, dim, value):
if value in dim:
- print "OLD", value
return dim[value]
else:
- print "NEW", value
- return super(DimValue, cls).__new__(cls, dim, value)
+ return super(DimValue, cls).__new__(cls)
def __init__(self, dim, value):
self.dim = dim
self.value = value
@@ -117,6 +115,10 @@ class DimensionTest(Dimension):
def htmlTableHeading(self, v):
return v+"
source"%(urllib.quote(v))
+class DimensionLoad(Dimension):
+ def __init__(self):
+ Dimension.__init__(self, 'load', 'Load')
+
class DimensionTraffic(Dimension):
def __init__(self):
Dimension.__init__(self, 'traf', 'Traffic')
@@ -132,7 +134,7 @@ class DimensionTraffic(Dimension):
class Test(object):
@classmethod
def isOnPath(cls, path):
- f = os.path.join(path, '.results')
+ f = os.path.join(path, 'plot.sh')
return os.path.isfile(f)
def __init__(self, path, values, tests=None):
self.path = path
@@ -163,22 +165,24 @@ class Test(object):
%s | " % d, " ".join(links), " |
---|
%s | " % d + print >>html, "→ " % \ Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName() - print >>html, "Y axis; " % \ + print >>html, "↓ | " % \ Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName() links = [] + print >>html, ""
for v in d:
if v in self.valsOther:
- links.append(str(v))
+ links.append("%s"%str(v))
else:
vv = DimValues(self.valsOther)
vv.replace(v)
- links.append("%s"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
- print >>html, " | ".join(links)
- print >>html, " " - try: - print >>html, d.htmlPreamble() - except Exception: - pass - print >>html, "" + links.append("%s"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v))) + print >>html, " ".join(links) + print >>html, " |
---|
%s → %s ↓ | " % (self.dimx.name, self.dimy.name)
for x in self.dimx:
@@ -355,6 +362,6 @@ class Page(object):
if __name__ == "__main__":
os.chdir(sys.argv[1])
os.system("rm *.html")
- tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest()))
+ tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionLoad(), DimensionTest()))
tests.generateHtml()
sys.exit(0)