[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/demo psyko2.py
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx/demo psyko2.py |
Date: |
Thu, 03 Oct 2002 08:04:12 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/03 08:04:12
Modified files:
gfx/demo : psyko2.py
Log message:
cleanup
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/psyko2.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.10 gzz/gfx/demo/psyko2.py:1.11
*** gzz/gfx/demo/psyko2.py:1.10 Wed Oct 2 09:19:01 2002
--- gzz/gfx/demo/psyko2.py Thu Oct 3 08:04:12 2002
***************
*** 11,24 ****
# A jython test program for papers
# Load using gldemo.py
! seed = 5225 # shuffling
! seed0 = 1435 # "old" textures
! seed1 = 54134 # "new" textures
! numtex0 = 30 # Number of different "old" textures
! numtex1 = 100 # Number of different "new" textures
! showtex0 = 100
feedbackduration = 3000
--- 11,25 ----
# A jython test program for papers
# Load using gldemo.py
! seed_learn = 653 # shuffling in learning phase
! seed_test = 234 # shuffling in online test phase
! seed_old = 423 # "old" textures
! seed_new = 773 # "new" textures
! numtex_old = 30 # Number of different "old" textures
! numtex_new = 100 # Number of different "new" textures
! showtex_old = 100
feedbackduration = 3000
***************
*** 38,94 ****
return len(hash) < len(list)
! rng = java.util.Random(seed)
! rng0 = java.util.Random(seed0)
! rng1 = java.util.Random(seed1)
while 1:
! tex0 = [ rng0.nextInt(2000000000) for i in range(0,numtex0) ]
! if dupes(tex0): continue
break
while 1:
! tex1 = [ rng1.nextInt(2000000000) for i in range(0,numtex1) ]
! if dupes(tex0 + tex1): continue
break
! log("textures0 seed: " + str(seed0))
! log("textures0: " + js(tex0))
! log("textures1 seed: " + str(seed1))
! log("textures1: " + js(tex1))
! log("shuffling seed: " + str(seed))
execfile("gfx/demo/zipf.py")
! probs = getZipfDistribution(numtex0)
learninglist = (
reduce(lambda x,y: x+y,
! [ [ tex0[i] for foo in range(0, int(round(probs[i] * numtex1))) ]
! for i in range(0,numtex0)] )
)
! learninglist = learninglist[0:showtex0]
onlinelist = (
reduce(lambda x,y: x+y,
! [ [ tex0[i] for foo in range(0, int(round(probs[i] * numtex1))) ]
! for i in range(0,numtex0)] )
! + tex1
)
words = {}
! for i in range(0, len(tex0)):
! words[tex0[i]] = str(i)
! for seed in tex1: words[seed] = "-"
seen = {}
! for seed in tex0 + tex1: seen[seed] = None
for seed in learninglist: seen[seed] = "learning phase"
--- 39,97 ----
return len(hash) < len(list)
! rng_learn = java.util.Random(seed_learn)
! rng_test = java.util.Random(seed_test)
! rng_old = java.util.Random(seed_old)
! rng_new = java.util.Random(seed_new)
while 1:
! tex_old = [ rng_old.nextInt(2000000000) for i in range(0,numtex_old) ]
! if dupes(tex_old): continue
break
while 1:
! tex_new = [ rng_new.nextInt(2000000000) for i in range(0,numtex_new) ]
! if dupes(tex_old + tex_new): continue
break
! log("old textures seed: " + str(seed_old))
! log("old textures: " + js(tex_old))
! log("new textures seed: " + str(seed_new))
! log("new textures: " + js(tex_new))
! log("learning phase shuffling seed: " + str(seed_learn))
! log("online testing shuffling seed: " + str(seed_test))
execfile("gfx/demo/zipf.py")
! probs = getZipfDistribution(numtex_old)
learninglist = (
reduce(lambda x,y: x+y,
! [ [ tex_old[i] for foo in range(0, int(round(probs[i] *
numtex_new))) ]
! for i in range(0,numtex_old)] )
)
! learninglist = learninglist[0:showtex_old]
onlinelist = (
reduce(lambda x,y: x+y,
! [ [ tex_old[i] for foo in range(0, int(round(probs[i] *
numtex_new))) ]
! for i in range(0,numtex_old)] )
! + tex_new
)
words = {}
! for i in range(0, len(tex_old)):
! words[tex_old[i]] = str(i)
! for seed in tex_new: words[seed] = "-"
seen = {}
! for seed in tex_old + tex_new: seen[seed] = None
for seed in learninglist: seen[seed] = "learning phase"
***************
*** 142,160 ****
self.toid = None
self.list = learninglist
! shuffle(self.list, rng.nextFloat)
def prepareNextTrial(self):
if self.trial < len(self.list):
self.seed = self.list[self.trial]
self.pq = getpaper(self.seed)
- else:
- self.seed = None
-
def nextTrial(self):
global currentScene
! if self.seed != None:
if self.seed != self.list[self.trial]:
self.prepareNextTrial()
--- 145,160 ----
self.toid = None
self.list = learninglist
! shuffle(self.list, rng_learn.nextFloat)
def prepareNextTrial(self):
if self.trial < len(self.list):
self.seed = self.list[self.trial]
self.pq = getpaper(self.seed)
def nextTrial(self):
global currentScene
! if self.trial < len(self.list):
if self.seed != self.list[self.trial]:
self.prepareNextTrial()
***************
*** 199,205 ****
cs1 = vs.coords.affineCoordsys(0, 5, 570, 450, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
putText(vs, cs1, words[self.seed], color=(0,0,0),w=4,h=4)
!
return vs
--- 199,205 ----
cs1 = vs.coords.affineCoordsys(0, 5, 570, 450, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
putText(vs, cs1, words[self.seed], color=(0,0,0),w=4,h=4)
!
return vs
***************
*** 219,230 ****
}
self.list = onlinelist
! shuffle(self.list, rng.nextFloat)
def prepareNextTrial(self):
if self.trial < len(self.list):
self.seed = self.list[self.trial]
! if self.seed in tex0:
#if seen[self.seed] != None:
self.correct = "old"
else:
--- 219,230 ----
}
self.list = onlinelist
! shuffle(self.list, rng_test.nextFloat)
def prepareNextTrial(self):
if self.trial < len(self.list):
self.seed = self.list[self.trial]
! if self.seed in tex_old:
#if seen[self.seed] != None:
self.correct = "old"
else:
***************
*** 315,321 ****
msg = "Oikein"
else:
msg = "V\xe4\xe4rin"
! if self.seed in tex0:
msg2 = "Oli n\xe4hty"
else:
msg2 = "Ei ollut n\xe4hty"
--- 315,321 ----
msg = "Oikein"
else:
msg = "V\xe4\xe4rin"
! if self.seed in tex_old:
msg2 = "Oli n\xe4hty"
else:
msg2 = "Ei ollut n\xe4hty"