[Gzz-commits] gzz/gfx/util papersampler.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        03/03/04 10:38:06

Modified files:
        gfx/util       : papersampler.py 

Log message:
        fix trials

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/papersampler.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gzz/gfx/util/papersampler.py
diff -u gzz/gfx/util/papersampler.py:1.20 gzz/gfx/util/papersampler.py:1.21
--- gzz/gfx/util/papersampler.py:1.20   Tue Mar  4 10:23:35 2003
+++ gzz/gfx/util/papersampler.py        Tue Mar  4 10:38:06 2003
@@ -86,7 +86,7 @@
 
 pages = [enfMaker.makeEnfilade(current.subSpan(i, i+1)) for i in range(0, 
current.length())]
 
-pages = pages[:16] # XXX:
+pages = pages[:18] # XXX:
 
 textureSeeds = [i for i in range(523, 523+current.length())]
 
@@ -143,7 +143,7 @@
 
 def createTextPapers():
     from gfx.demo import fontfilter2
-    trials = 32
+    trials = len(pages) * 2
     
     for subj in range(0,2):
        global textureSeeds
@@ -155,9 +155,13 @@
 
         conditions1 = [ cond for cond in textConds ]
         conditions2 = [ cond for cond in textConds ]
+        conditions3 = [ cond for cond in textConds ]
+        conditions4 = [ cond for cond in textConds ]
         rng.shuffle(conditions1)
         rng.shuffle(conditions2)
-        conditions = conditions1 + conditions2
+        rng.shuffle(conditions3)
+        rng.shuffle(conditions4)
+        conditions = conditions1 + conditions2 + conditions3 + conditions4
         
        pageSpanCellView = gzz.view.PageSpanCellView()
        pageSpanCellView.pageSpanPaperMaker = PSPMaker()