diff --git a/src/calc.py b/src/calc.py index 367dff6..ee0201b 100644 --- a/src/calc.py +++ b/src/calc.py @@ -45,12 +45,11 @@ def getS_munchlax(intervals): t = getTrans() t_ = getTrans() - s = np.zeros((128,128),"uint8") + s = np.zeros((144,128),"uint8") safe_intervals = [] - for i in range(32): + for i in range(36): #intervals[-1]を挿入した際のインデックスが奇数だと危険な値の可能性がある is_carriable = bisect(section,intervals[-1])%2==1 - while is_carriable: #スキップする t = t@t_%2 @@ -86,6 +85,7 @@ def gauss_jordan(mat,observed:list): res[j],res[pivot] = res[pivot],res[j] if isfound: pivot += 1 + for i in range(c): check = 1<<(c-i-1) assert bitmat[i]&check>0 diff --git a/src/rngtool.py b/src/rngtool.py index 5c64347..25235c6 100644 --- a/src/rngtool.py +++ b/src/rngtool.py @@ -33,7 +33,7 @@ def tracking_blink(img, roi_x, roi_y, roi_w, roi_h, th = 0.9, size = 40)->Tuple[ state = IDLE blinks = [] intervals = [] - prev_time = 0 + prev_time = time.perf_counter() prev_roi = None debug_txt = "" @@ -115,7 +115,8 @@ def tracking_poke_blink(img, roi_x, roi_y, roi_w, roi_h, size = 60)->Tuple[List[ if (roi==prev_roi).all(): continue prev_roi = roi - + cv2.imshow("",roi) + cv2.waitKey(1) res = cv2.matchTemplate(roi,eye,cv2.TM_CCOEFF_NORMED) _, match, _, _ = cv2.minMaxLoc(res) diff --git a/src/tidsid.py b/src/tidsid.py index 771b53d..97916f4 100644 --- a/src/tidsid.py +++ b/src/tidsid.py @@ -29,7 +29,7 @@ def expr(): if munch_eye is None: print("path is wrong") return - gombe_intervals = rngtool.tracking_poke_blink(munch_eye, 730, 670, 50, 60) + gombe_intervals = rngtool.tracking_poke_blink(munch_eye, 730, 670, 50, 60, 64) interval_prng = rngtool.recovByMunchlax(gombe_intervals) state = interval_prng.getState() @@ -38,14 +38,14 @@ def expr(): #timecounter reset advances = 0 id_prng = Xorshift(*interval_prng.getState()) - id_prng.getNextRandSequence(1) + id_prng.next() waituntil = time.perf_counter() #ID予測開始 while True: advances += 1 - r = interval_prng.next() - interval = randrange(r, 100, 370)/30 - 0.048 + interval = interval_prng.rangefloat(3.0,12.0) + 0.285 + #interval = interval_prng.range(3.0,12.0) + 0.285 waituntil += interval id_r = id_prng.next()