]> rtime.felk.cvut.cz Git - can-benchmark.git/blobdiff - gw-tests/genhtml/genhtml.py
genhtml: Correct navigation between pages
[can-benchmark.git] / gw-tests / genhtml / genhtml.py
index 5dacc9ea5c79cfca5baf7d6835864de5312392d4..76eee7b5c28304909e7f69ab983b1682539016ca 100755 (executable)
@@ -9,10 +9,11 @@ class DimValue:
     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)
 
@@ -22,14 +23,17 @@ class DimValues(list):
             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)
-        print repr(result)
         for v in self:
             if v.dim == dim:
                 result.remove(v)
         return result
+    def key(self):
+        return tuple([v.value for v in self])
 
 class Dimension(dict):
     def __init__(self, atype, name=None):
@@ -44,13 +48,16 @@ class Dimension(dict):
        for i in xrange(len(self)):
            yield self.getValue(i)
     def getValue(self, index):
-        print self.sortedKeys
         return self[self.sortedKeys[index]]
 
     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):
@@ -60,7 +67,7 @@ class Dimension(dict):
     def __str__(self):
         return self.name
     def __repr__(self):
-        return self.type
+        return "Dimension(%s)"%self.type
 
 class DimensionKern(Dimension):
     def __init__(self):
@@ -133,45 +140,62 @@ class Test:
             print >>file, "<a href='%s/%s'><img src='%s/thumb/%s'></a>" % \
                   (urllib.quote(self.path), img, urllib.quote(self.path), img)
 
-def iterDimValues(dimensions):
-    idx = [0 for i in xrange(len(dimensions))]
-    done=False
-    while not done:
-       values=DimValues()
-       for i in xrange(len(dimensions)):
-           values.append(dimensions[i].values()[idx[i]])
-       yield values
-       done=True
-       for i in xrange(len(dimensions)):
-           idx[i] += 1
-           if idx[i] < len(dimensions[i]):
-               done=False
-               break
-           idx[i] = 0
+class Space(list):
+    """List of Dimensions()s (order matters)"""
+    def __init__(self, *dimensions):
+        self.extend(list(dimensions))
+    def iterValues(self):
+        idx = [0 for i in xrange(len(self))]
+        done=False
+        while not done:
+            values=DimValues()
+            for i in xrange(len(self)):
+                values.append(self[i].values()[idx[i]])
+            yield values
+            done=True
+            for i in xrange(len(self)):
+                idx[i] += 1
+                if idx[i] < len(self[i]):
+                    done=False
+                    break
+                idx[i] = 0
+    def reorder(self, dimValues):
+        reordered = DimValues()
+        for d in self:
+           for v in dimValues:
+               if v.dim == d:
+                   reordered.append(v)
+        return reordered
+    def iterDimensionPairs(self):
+       for i in xrange(len(self)):
+           for j in xrange(i+1, len(self)):
+               yield (self[i], self[j])
+               yield (self[j], self[i])
+    def iterRemainingDimensions(self, dimensionPair):
+       for d in self:
+           if d not in dimensionPair:
+               yield d
+
 
 class Tests(dict):
     """Represents all tests organized along several dimensions"""
-    def __init__(self, rootpath, *dimensions):
+    def __init__(self, rootpath, space):
        dict.__init__(self)
-       self.dimensions = dimensions
+       self.space = space
        if (rootpath):
            self.populate(rootpath)
     def getTest(self, key):
-       realkey=[]
-       for d in self.dimensions:
-           for i in key:
-               if i.dim == d:
-                   realkey.append(i.value)
-       if len(realkey) != len(self.dimensions):
-           raise KeyError("The coordinates in key do not match dimensions")
-       return self[tuple(realkey)]
+       if len(key) != len(self.space):
+           raise KeyError("The coordinates in key do not match the dimension of the space")
+        realkey = self.space.reorder(key)
+       return self[realkey.key()]
 
     def addTest(self, test, coordinates):
-       if len(coordinates) != len(self.dimensions):
+       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.dimensions[i].addValue(coordinates[i])
+            DimValue(self.space[i], coordinates[i])
 
     def populate(self, rootpath):
        for root, dirs, files in os.walk(rootpath):
@@ -181,20 +205,11 @@ class Tests(dict):
                coordinates = rootpath
            if Test.isOnPath(root):
                self.addTest(Test(root), coordinates.split("/"))
-    def iterDimensionPairs(self):
-       for i in xrange(len(self.dimensions)):
-           for j in xrange(i+1, len(self.dimensions)):
-               yield (self.dimensions[i], self.dimensions[j])
-               yield (self.dimensions[j], self.dimensions[i])
-    def iterRemainingDimensions(self, dimensionPair):
-       for d in self.dimensions:
-           if d not in dimensionPair:
-               yield d
     def generateHtml(self):
-       for pair in self.iterDimensionPairs():
-           remDims = [d for d in self.iterRemainingDimensions(pair)]
-           for vals in iterDimValues(remDims):
-               page = Page(pair, remDims, vals, 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)
                page.generate()
        try:
            os.remove("index.html")
@@ -204,15 +219,14 @@ class Tests(dict):
        #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" 
@@ -234,9 +248,9 @@ th, td { border: 1px solid lightgray; padding: 4px;}
        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>;&nbsp;&nbsp;" % 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>;&nbsp;&nbsp;" % \
+                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:
@@ -244,7 +258,7 @@ th, td { border: 1px solid lightgray; padding: 4px;}
                 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:
@@ -280,6 +294,6 @@ th, td { border: 1px solid lightgray; padding: 4px;}
 if __name__ == "__main__":
     os.chdir(sys.argv[1])
     os.system("rm *.html")
-    tests = Tests("./", DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest())
+    tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest()))
     tests.generateHtml()
     sys.exit(0)