def __init__(self, dim, value):
self.dim = dim
self.value = value
+ self.dim.addValue(self)
def __str__(self):
return self.dim.val2str(self.value)
def __repr__(self):
- return "DimValue("+str(self.dim.__class__.__name__) + ", "+repr(self.value)+")"
+ return "DimValue(%s, %s)" % (repr(self.dim), repr(self.value))
def htmlTableHeading(self):
return self.dim.htmlTableHeading(self.value)
if self[i].dim == val.dim:
self[i] = val
def __add__(self, val):
- return DimValues(self).append(val)
+ ret = DimValues(self)
+ ret.append(val)
+ return ret
def __sub__(self, dim):
result = DimValues(self)
for v in self:
def addValue(self, *values):
for value in values:
if value not in self:
- self[value] = DimValue(self, value)
+ 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):
def isOnPath(cls, path):
f = os.path.join(path, '.results')
return os.path.isfile(f)
- def __init__(self, path):
+ def __init__(self, path, values):
self.path = path
self.name = os.path.basename(path)
+ self.values = values
def printThumbLink(self, file):
thumb = self.path+'/thumb'
try:
except OSError:
imgs = [ self.name + ".png" ]
for img in imgs:
- print >>file, "<a href='%s/%s'><img src='%s/thumb/%s'></a>" % \
- (urllib.quote(self.path), img, urllib.quote(self.path), img)
+ 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")
+ 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" />
+</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>; " % \
+ Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
+ links = []
+ for v in d.values():
+ if v in self.valsOther:
+ links.append(str(v))
+ else:
+ vv = DimValues(self.valsOther)
+ 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
+
+
+ html.close()
class Space(list):
"""List of Dimensions()s (order matters)"""
realkey = self.space.reorder(key)
return self[realkey.key()]
- def addTest(self, test, coordinates):
- if len(coordinates) != len(self.space):
- raise KeyError("The number coordinates do not match the number of dimensions: " + str(coordinates))
- self[tuple(coordinates)] = test
- for i in xrange(len(coordinates)):
- self.space[i].addValue(coordinates[i])
-
+ def addTest(self, test):
+ self[test.values.key()] = test
+
def populate(self, rootpath):
for root, dirs, files in os.walk(rootpath):
if (root.find(rootpath) == 0):
- coordinates = root[len(rootpath):]
+ coordinates = root[len(rootpath):].split("/")
else:
- coordinates = rootpath
+ coordinates = rootpath.split("/")
if Test.isOnPath(root):
- self.addTest(Test(root), coordinates.split("/"))
+ 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))
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, remDims, vals, self)
+ page = Page(pair, vals, self)
page.generate()
try:
os.remove("index.html")
except OSError: pass
os.symlink(page.getName(), "index.html")
+ css = open("style.css", "w")
+ print >>css, """img { border: 0; }
+table { border-collapse: collapse; }
+th, td { border: 1px solid lightgray; padding: 4px;}
+h4 { margin: 0; }
+.box { border: 1px solid black; padding: 1ex; margin: 1ex 0}
+"""
+ css.close()
#os.system("source-highlight -d --output-dir=. ../*.sh")
class Page:
- def __init__(self, dimPair, dimOther, valsOther, tests):
+ def __init__(self, dimPair, valsOther, tests):
self.dimy, self.dimx = dimPair
- self.dimOther = dimOther
- self.valsOther = valsOther
+ self.dimOther = [v.dim for v in valsOther]
+ self.valsOther = tests.space.reorder(valsOther)
self.tests = tests
- def getName(self, dimy=None, dimx=None, valsOther=None):
- return "%s-vs-%s-for-%s.html"%(dimx or self.dimy.type,
- dimy or self.dimx.type,
- "-".join([v.value for v in valsOther or self.valsOther]))
+ def getName(self):
+ return "%s-vs-%s-for-%s.html"%(self.dimy.type, self.dimx.type,
+ "-".join([v.value for v in self.valsOther]))
def generate(self):
html = open(self.getName(), "w")
title = "CAN gateway timing analysis"
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>%s</title>
-<style>
-img { border: 0; }
-table { border-collapse: collapse; }
-th, td { border: 1px solid lightgray; padding: 4px;}
-</style>
+<link rel="stylesheet" href="style.css" type="text/css" />
</head>
<body>
<h1>%s</h1>""" % (title, title)
params = ["%s %s" % (v.dim, v) for v in self.valsOther]
- print >>html, "Results for:", ", ".join(params), "<hr />"
+ print >>html, "<h3>Results for ", ", ".join(params), "</h3>"
+ print >>html, "<div class='box'><h4>Other views</h4>"
for d in self.dimOther:
print >>html, "%s: " % d
print >>html, "<a href='%s'>X axis</a>, " % \
- self.getName(dimx=d,
- valsOther=self.valsOther - d + self.dimx.getValue(0))
- print >>html, "<a href='%s'>Y axis</a>; " % self.getName(dimy=d)
+ Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName()
+ print >>html, "<a href='%s'>Y axis</a>; " % \
+ Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
links = []
for v in d.values():
if v in self.valsOther:
else:
vv = DimValues(self.valsOther)
vv.replace(v)
- links.append("<a href='%s'>%s</a>"%(urllib.quote(self.getName(valsOther=vv)), str(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
+ print >>html, "</div>"
print >>html, "<table><thead><tr><td>%s → <br />%s ↓</td>" % (self.dimx.name, self.dimy.name)
for x in self.dimx: