X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/18527dd22cac9f31163171839b6985ab61b09a29..0067509575642daf871e95388be79ae95ad33d70:/gw-tests/genhtml/genhtml.py?ds=sidebyside
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 5425f5e..be1bb4e 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -4,8 +4,14 @@ import os;
import dircache;
import sys;
import urllib
+import traceback
-class DimValue:
+class DimValue(object):
+ def __new__(cls, dim, value):
+ if value in dim:
+ return dim[value]
+ else:
+ return super(DimValue, cls).__new__(cls, dim, value)
def __init__(self, dim, value):
self.dim = dim
self.value = value
@@ -50,16 +56,15 @@ class Dimension(dict):
def getValue(self, index):
return self[self.sortedKeys[index]]
- def addValue(self, *values):
- for value in values:
- if value not in self:
- if isinstance(value, DimValue):
- self[value.value] = value
- else:
- raise Exception("Unsupported usage of addValue")
- #self[value] = DimValue(self, value)
- self.sortedKeys = self.keys()
- self.sortedKeys.sort()
+ def addValue(self, value):
+ if value not in self:
+ if isinstance(value, DimValue):
+ self[value.value] = value
+ else:
+ raise Exception("Unsupported usage of addValue")
+ #self[value] = DimValue(self, value)
+ self.sortedKeys = self.keys()
+ self.sortedKeys.sort()
def val2str(self, v):
return str(v)
def htmlTableHeading(self, v):
@@ -110,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')
@@ -122,10 +131,10 @@ class DimensionTraffic(Dimension):
return v
def htmlTableHeading(self, v):
return self.val2str(v)
-class Test:
+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
@@ -156,23 +165,27 @@ class Test:
%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 = [] - for v in d.values(): + 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:
@@ -339,6 +362,6 @@ class Page:
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)