GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

don't need relearn flag, can infer from empty delays list

Browse source
This commit is contained in:
Damien Elmes 2011-12-09 08:36:00 +09:00
parent 451962d4a8
commit 20ffbd57a7
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
anki/decks.py
View file

@ -32,7 +32,6 @@ defaultConf = {
'delays': [1, 10], 'delays': [1, 10],
'mult': 0, 'mult': 0,
'minInt': 1, 'minInt': 1,
'relearn': True,
'leechFails': 8, 'leechFails': 8,
# type 0=suspend, 1=tagonly # type 0=suspend, 1=tagonly
'leechAction': 0, 'leechAction': 0,

6
anki/sched.py
View file

@ -557,14 +557,14 @@ did = ? and queue = 2 and due <= ? %s limit ?""" % order,
card.factor = max(1300, card.factor-200) card.factor = max(1300, card.factor-200)
card.due = self.today + card.ivl card.due = self.today + card.ivl
# put back in the learn queue? # put back in the learn queue?
if conf['relearn']: if conf['delays']:
card.edue = card.due card.edue = card.due
card.due = int(self._delayForGrade(conf, 0) + time.time()) card.due = int(self._delayForGrade(conf, 0) + time.time())
card.left = len(conf['delays']) card.left = len(conf['delays'])
card.queue = 1 card.queue = 1
self.lrnCount += card.left self.lrnCount += card.left
# leech? # leech?
if not self._checkLeech(card, conf) and conf['relearn']: if not self._checkLeech(card, conf) and conf['delays']:
heappush(self._lrnQueue, (card.due, card.id)) heappush(self._lrnQueue, (card.due, card.id))
def _nextLapseIvl(self, card, conf): def _nextLapseIvl(self, card, conf):
@ -763,7 +763,7 @@ your short-term review workload will become."""))
elif ease == 1: elif ease == 1:
# lapsed # lapsed
conf = self._cardConf(card)['lapse'] conf = self._cardConf(card)['lapse']
if conf['relearn']: if conf['delays']:
return conf['delays'][0]*60 return conf['delays'][0]*60
return self._nextLapseIvl(card, conf)*86400 return self._nextLapseIvl(card, conf)*86400
else: else:

2
tests/test_sched.py
View file

@ -349,7 +349,7 @@ def test_nextIvl():
# failing it should put it at 60s # failing it should put it at 60s
assert ni(c, 1) == 60 assert ni(c, 1) == 60
# or 1 day if relearn is false # or 1 day if relearn is false
d.sched._cardConf(c)['lapse']['relearn']=False d.sched._cardConf(c)['lapse']['delays']=[]
assert ni(c, 1) == 1*86400 assert ni(c, 1) == 1*86400
# (* 100 1.2 86400)10368000.0 # (* 100 1.2 86400)10368000.0
assert ni(c, 2) == 10368000 assert ni(c, 2) == 10368000