[Gzz-commits] gzz gfx/demo/coords_benchmark.py gzz/modules/pp...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/03/17 19:42:21

Modified files:
        gfx/demo       : coords_benchmark.py 
        gzz/modules/pp : demotest.py 

Log message:
        benchfoobarmarks

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/coords_benchmark.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/coords_benchmark.py
diff -u gzz/gfx/demo/coords_benchmark.py:1.3 
gzz/gfx/demo/coords_benchmark.py:1.4
--- gzz/gfx/demo/coords_benchmark.py:1.3        Thu Mar 13 10:31:04 2003
+++ gzz/gfx/demo/coords_benchmark.py    Mon Mar 17 19:42:17 2003
@@ -31,9 +31,9 @@
 
 class ViewScene:
     def __init__(self):
-        self.passes = 0
-        self.time = 0
-        self.diff = 0
+        self.nested = 0
+        self.count = 500
+        self.letters = 0
     
     def scene(self, vs):
         size = vs.getSize()
@@ -48,49 +48,57 @@
        bgcolor = (0.6, 0.7, 0.8)
         putnoc(vs, background(bgcolor))
 
+        alph = 'abcdefghijklmnopqrstuvwxyz'
 
         # clipping area
-        clip = vs.orthoCS(0,"CLIP",0, #0,0, size.width, size.height)
-                          size.width*1/20, size.height*1/20,
-                          size.width*9/10, size.height*9/10)
-
-        tr = vs.translateCS(0, 'tr', movx,movy) 
-
-        for i in range(0,self.passes):
-            if i%4 == 0:
-                tr = vs.translateCS(tr, 'tra'+str(i), 0, -movy)
-            elif i%4 == 1:
-                tr = vs.translateCS(tr, 'trb'+str(i), -movx,0)
-            elif i%4 == 2:
-                tr = vs.translateCS(tr, 'trc'+str(i), 0, movy)
+        clip = vs.orthoCS(0,"CLIP",0, 0,0, size.width, size.height)
+        tr = vs.translateCS(0, 'tr', movx,movy)
+
+        if not hasattr(self, "letters"):
+            return
+        
+        for nested in range(0, self.nested):
+            if nested%4 == 0:
+                tr = vs.translateCS(tr, 'tra'+str(nested), 0, -movy)
+            elif nested%4 == 1:
+                tr = vs.translateCS(tr, 'trb'+str(nested), -movx,0)
+            elif nested%4 == 2:
+                tr = vs.translateCS(tr, 'trc'+str(nested), 0, movy)
             else:
-                tr = vs.translateCS(tr, 'trd'+str(i), movx,0)
+                tr = vs.translateCS(tr, 'trd'+str(nested), movx,0)
 
-        for i in range(0,800):
-            cs = vs.translateCS(tr, 'TEXT'+str(i),
+        for count in range(0, self.count):
+            cs = vs.translateCS(tr, 'TEXT'+str(count),
                                 r.nextFloat()*w, r.nextFloat()*h)
-            cs = vs.cullCS(cs, 'CULL'+str(i), clip)
-            putText(vs, cs, str(i), color=(0,0,0), h=14, y=10)
-        self.passes += 1
-
-        # count time
-        time = System.currentTimeMillis()
-        real = time - self.time
-        if real > 15*1000:
-            real = 0
-            
-        if dbg:
-            print 'Passes: ', self.passes, \
-                  ' time: ', time - self.time, \
-                  ' diff: ', time - self.time - self.diff
-        self.diff = time - self.time
-        self.time = time
-
-        if real < 1500:
-            AbstractUpdateManager.chg()
-        else:
-            print 'Stop! - passes:', self.passes ,' time:', real
-            print 'press r to rerun'
+            cs = vs.cullCS(cs, 'CULL'+str(count), clip)
+            a = count % len(alph)
+            b = (count + self.letters) % len(alph)
+            string = ''
+            if a > b:
+                tmp = 2*alph[:len(alph)]
+                string = tmp[a:(b+len(alph))]
+            else:
+                string = alph[a:b]
+            putText(vs, cs, string, color=(0,0,0), h=14, y=10)
+
+ 
+    def benchmark(self):
+        for self.nested in range(0,13,3):
+            for self.count in range(100,701,200):
+                for self.letters in range(1,20,4):
+                    vs = w.createVobScene()
+                    self.scene(vs)
+                    AbstractUpdateManager.chg()
+
+                    print self.nested,' nested CS, ',\
+                          self.count, ' text vobs, ',\
+                          self.letters, ' letters ',\
+                          'time: ', w.timeRender(vs, 100)
+                
+    def key(self, k):
+        if k == "Ctrl-B":
+            self.benchmark()
+
  
 
 currentScene = ViewScene()
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.75 gzz/gzz/modules/pp/demotest.py:1.76
--- gzz/gzz/modules/pp/demotest.py:1.75 Mon Mar 17 10:42:19 2003
+++ gzz/gzz/modules/pp/demotest.py      Mon Mar 17 19:42:20 2003
@@ -175,7 +175,9 @@
         elif key == "Ctrl-B":
             print '*Benchmark*'
             d = DoBenchMark(self.ppv, self.vs, self.avc,
-                            
self.space.getHomeCell().s(self.d.d1).s(self.d.contains))
+                            self.space.getHomeCell()
+                            .s(self.d.d1).s(self.d.d1)
+                            .s(self.d.contains).s(self.d.contains))
             d.run()
        elif key == "Ctrl-I":
            print "INTERPLIST"
@@ -385,56 +387,34 @@
         self.iter = -1
         self.home = home
 
-        a = self.pp
-        self.benchmarks = a.benchmarks
+
+        self.benchmarks = PPView2.benchmarks
         self.explanation = [ 'irregu', 'paper', 'shortcuts', 
                              'text', 'background', 'fillet', 'nothing' ]
 
-        self.animTime = AbstractUpdateManager.defaultAnimationTime
-        AbstractUpdateManager.defaultAnimationTime = 3000
-
     def run(self):
-        # First empty run
-        if self.iter < 0:
-            self.trueList()
-            self.doBench()
-
-        elif self.iter >= 0 and self.iter < len(self.benchmarks):
-            self.trueList()
-            self.benchmarks[self.iter] = 0
-            self.doBench()
-
-        else:
-            self.trueList()
-            self.doBench()
-
+        for self.iter in range(len(self.explanation)):
+            if self.iter < 0:
+                self.trueList()
+                self.doBench()
+                
+            elif self.iter >= 0 and self.iter < len(self.benchmarks):
+                self.trueList()
+                self.benchmarks[self.iter] = 0
+                self.doBench()
+
+            else:
+                self.trueList()
+                self.doBench()
     def trueList(self):
         for i in range(len(self.benchmarks)):
             self.benchmarks[i] = 1
     def doBench(self):
-        a = gzz.client.gl.GLUpdateManager
-        gzz.gfx.gl.GL.clearFrameCount()
-        self.avc.setAccursed(self.home)
-        AbstractUpdateManager.setNoAnimation()
-        AbstractUpdateManager.chg()
-
-        self.demo = PPDemo(self.pp, a.getInstance(), self.avc, 765, 5, self)
-        a.demoMode = 1
-
-    # implement Hook
-    def nextRound(self):
-        # say previous
-        print self.iter,': Benchmark - leave out', 
self.explanation[self.iter],': ',\
-              gzz.gfx.gl.GL.getFrameCount(), ' frames.'
-        self.iter += 1
-
-        if self.iter <= len(self.benchmarks): # notice add..
-            self.run()
-        else:
-            AbstractUpdateManager.defaultAnimationTime = self.animTime
-            a = gzz.client.gl.GLUpdateManager
-            a.demoMode = 0
-            return
+        self.vs = w.createVobScene()
+        self.pp.render(self.vs, 0, self.avc)
+        print self.iter,': Benchmark - leave out ' \
+              + self.explanation[self.iter] + ' time:',\
+              w.timeRender(self.vs, 1000)
 
 currentScene = PPView2Scene()