REVLOG_REV

This commit is contained in:
Arthur Milchior 2020-01-30 18:04:10 -08:00
parent dca1cd03d1
commit dd5d73f3a3
4 changed files with 9 additions and 8 deletions

View file

@ -71,6 +71,7 @@ BUTTON_FOUR = 4
# Revlog types # Revlog types
REVLOG_LRN = 0 REVLOG_LRN = 0
REVLOG_REV = 1
# Labels # Labels
########################################################################## ##########################################################################

View file

@ -946,7 +946,7 @@ select id from cards where did in %s and queue = 2 and due <= ? limit ?)"""
card.lastIvl, card.lastIvl,
card.factor, card.factor,
card.timeTaken(), card.timeTaken(),
1, REVLOG_REV,
) )
try: try:

View file

@ -961,7 +961,7 @@ select id from cards where did in %s and queue = 2 and due <= ? limit ?)"""
def _answerRevCard(self, card: Card, ease: int) -> None: def _answerRevCard(self, card: Card, ease: int) -> None:
delay = 0 delay = 0
early = bool(card.odid and (card.odue > self.today)) early = bool(card.odid and (card.odue > self.today))
type = early and 3 or 1 type = early and 3 or REVLOG_REV
if ease == BUTTON_ONE: if ease == BUTTON_ONE:
delay = self._rescheduleLapse(card) delay = self._rescheduleLapse(card)

View file

@ -154,7 +154,7 @@ body {background-image: url(data:image/png;base64,%s); }
select count(), sum(time)/1000, select count(), sum(time)/1000,
sum(case when ease = 1 then 1 else 0 end), /* failed */ sum(case when ease = 1 then 1 else 0 end), /* failed */
sum(case when type = {REVLOG_LRN} then 1 else 0 end), /* learning */ sum(case when type = {REVLOG_LRN} then 1 else 0 end), /* learning */
sum(case when type = 1 then 1 else 0 end), /* review */ sum(case when type = {REVLOG_REV} then 1 else 0 end), /* review */
sum(case when type = 2 then 1 else 0 end), /* relearn */ sum(case when type = 2 then 1 else 0 end), /* relearn */
sum(case when type = 3 then 1 else 0 end) /* filter */ sum(case when type = 3 then 1 else 0 end) /* filter */
from revlog where id > ? """ from revlog where id > ? """
@ -549,14 +549,14 @@ group by day order by day"""
select select
(cast((id/1000.0 - :cut) / 86400.0 as int))/:chunk as day, (cast((id/1000.0 - :cut) / 86400.0 as int))/:chunk as day,
sum(case when type = {REVLOG_LRN} then 1 else 0 end), -- lrn count sum(case when type = {REVLOG_LRN} then 1 else 0 end), -- lrn count
sum(case when type = 1 and lastIvl < 21 then 1 else 0 end), -- yng count sum(case when type = {REVLOG_REV} and lastIvl < 21 then 1 else 0 end), -- yng count
sum(case when type = 1 and lastIvl >= 21 then 1 else 0 end), -- mtr count sum(case when type = {REVLOG_REV} and lastIvl >= 21 then 1 else 0 end), -- mtr count
sum(case when type = 2 then 1 else 0 end), -- lapse count sum(case when type = 2 then 1 else 0 end), -- lapse count
sum(case when type = 3 then 1 else 0 end), -- cram count sum(case when type = 3 then 1 else 0 end), -- cram count
sum(case when type = {REVLOG_LRN} then time/1000.0 else 0 end)/:tf, -- lrn time sum(case when type = {REVLOG_LRN} then time/1000.0 else 0 end)/:tf, -- lrn time
-- yng + mtr time -- yng + mtr time
sum(case when type = 1 and lastIvl < 21 then time/1000.0 else 0 end)/:tf, sum(case when type = {REVLOG_REV} and lastIvl < 21 then time/1000.0 else 0 end)/:tf,
sum(case when type = 1 and lastIvl >= 21 then time/1000.0 else 0 end)/:tf, sum(case when type = {REVLOG_REV} and lastIvl >= 21 then time/1000.0 else 0 end)/:tf,
sum(case when type = 2 then time/1000.0 else 0 end)/:tf, -- lapse time sum(case when type = 2 then time/1000.0 else 0 end)/:tf, -- lapse time
sum(case when type = 3 then time/1000.0 else 0 end)/:tf -- cram time sum(case when type = 3 then time/1000.0 else 0 end)/:tf -- cram time
from revlog %s from revlog %s
@ -856,7 +856,7 @@ select
sum(case when ease = 1 then 0 else 1 end) / sum(case when ease = 1 then 0 else 1 end) /
cast(count() as float) * 100, cast(count() as float) * 100,
count() count()
from revlog where type in ({REVLOG_LRN},1,2) %s from revlog where type in ({REVLOG_LRN},{REVLOG_REV},2) %s
group by hour having count() > 30 order by hour""" group by hour having count() > 30 order by hour"""
% lim, % lim,
cut=self.col.sched.dayCutoff - (rolloverHour * 3600), cut=self.col.sched.dayCutoff - (rolloverHour * 3600),