@@ -5,15 +5,15 @@ import { RepItemScheduleInfo } from "src/algorithms/base/rep-item-schedule-info"
55import { ReviewResponse } from "src/algorithms/base/repetition-item" ;
66import { osrSchedule } from "src/algorithms/osr/note-scheduling" ;
77import { NoteLinkStat , OsrNoteGraph } from "src/algorithms/osr/osr-note-graph" ;
8- import { RepItemScheduleInfo_Osr } from "src/algorithms/osr/rep-item-schedule-info-osr" ;
8+ import { RepItemScheduleInfoOsr } from "src/algorithms/osr/rep-item-schedule-info-osr" ;
99import { DueDateHistogram } from "src/due-date-histogram" ;
1010import { Note } from "src/note" ;
1111import { INoteEaseList , NoteEaseList } from "src/note-ease-list" ;
1212import { Question } from "src/question" ;
1313import { SRSettings } from "src/settings" ;
1414import { globalDateProvider } from "src/utils/dates" ;
1515
16- export class SrsAlgorithm_Osr implements ISrsAlgorithm {
16+ export class SrsAlgorithmOsr implements ISrsAlgorithm {
1717 private settings : SRSettings ;
1818 private noteEaseList : INoteEaseList ;
1919
@@ -47,18 +47,17 @@ export class SrsAlgorithm_Osr implements ISrsAlgorithm {
4747 : linkContribution * this . settings . baseEase ) ;
4848
4949 // add note's average flashcard ease if available
50- /* c8 ignore next 3 */
5150 if ( this . noteEaseList . hasEaseForPath ( notePath ) ) {
5251 ease = ( ease + this . noteEaseList . getEaseByPath ( notePath ) ) / 2 ;
5352 }
5453
5554 // Don't know the due date until we know the calculated interval
5655 const dueDate : Moment = null ;
57- const interval : number = SrsAlgorithm_Osr . initialInterval ;
56+ const interval : number = SrsAlgorithmOsr . initialInterval ;
5857 ease = Math . round ( ease ) ;
59- const temp : RepItemScheduleInfo_Osr = new RepItemScheduleInfo_Osr ( dueDate , interval , ease ) ;
58+ const temp : RepItemScheduleInfoOsr = new RepItemScheduleInfoOsr ( dueDate , interval , ease ) ;
6059
61- const result : RepItemScheduleInfo_Osr = this . calcSchedule (
60+ const result : RepItemScheduleInfoOsr = this . calcSchedule (
6261 temp ,
6362 response ,
6463 dueDateNoteHistogram ,
@@ -72,7 +71,7 @@ export class SrsAlgorithm_Osr implements ISrsAlgorithm {
7271 noteOnLoadedNote ( path : string , note : Note , noteEase : number ) : void {
7372 let flashcardsInNoteAvgEase : number = null ;
7473 if ( note ) {
75- flashcardsInNoteAvgEase = SrsAlgorithm_Osr . calculateFlashcardAvgEase (
74+ flashcardsInNoteAvgEase = SrsAlgorithmOsr . calculateFlashcardAvgEase (
7675 note . questionList ,
7776 this . settings ,
7877 ) ;
@@ -122,8 +121,8 @@ export class SrsAlgorithm_Osr implements ISrsAlgorithm {
122121 response : ReviewResponse ,
123122 dueDateNoteHistogram : DueDateHistogram ,
124123 ) : RepItemScheduleInfo {
125- const noteScheduleOsr : RepItemScheduleInfo_Osr = noteSchedule as RepItemScheduleInfo_Osr ;
126- const temp : RepItemScheduleInfo_Osr = this . calcSchedule (
124+ const noteScheduleOsr : RepItemScheduleInfoOsr = noteSchedule as RepItemScheduleInfoOsr ;
125+ const temp : RepItemScheduleInfoOsr = this . calcSchedule (
127126 noteScheduleOsr ,
128127 response ,
129128 dueDateNoteHistogram ,
@@ -133,14 +132,14 @@ export class SrsAlgorithm_Osr implements ISrsAlgorithm {
133132
134133 const dueDate : Moment = moment ( globalDateProvider . today . add ( interval , "d" ) ) ;
135134 this . noteEaseList . setEaseForPath ( notePath , ease ) ;
136- return new RepItemScheduleInfo_Osr ( dueDate , interval , ease ) ;
135+ return new RepItemScheduleInfoOsr ( dueDate , interval , ease ) ;
137136 }
138137
139138 private calcSchedule (
140- schedule : RepItemScheduleInfo_Osr ,
139+ schedule : RepItemScheduleInfoOsr ,
141140 response : ReviewResponse ,
142141 dueDateHistogram : DueDateHistogram ,
143- ) : RepItemScheduleInfo_Osr {
142+ ) : RepItemScheduleInfoOsr {
144143 const temp : Record < string , number > = osrSchedule (
145144 response ,
146145 schedule . interval ,
@@ -150,32 +149,31 @@ export class SrsAlgorithm_Osr implements ISrsAlgorithm {
150149 dueDateHistogram ,
151150 ) ;
152151
153- return new RepItemScheduleInfo_Osr ( globalDateProvider . today , temp . interval , temp . ease ) ;
152+ return new RepItemScheduleInfoOsr ( globalDateProvider . today , temp . interval , temp . ease ) ;
154153 }
155154
156155 cardGetResetSchedule ( ) : RepItemScheduleInfo {
157- const interval = SrsAlgorithm_Osr . initialInterval ;
156+ const interval = SrsAlgorithmOsr . initialInterval ;
158157 const ease = this . settings . baseEase ;
159158 const dueDate = globalDateProvider . today . add ( interval , "d" ) ;
160- return new RepItemScheduleInfo_Osr ( dueDate , interval , ease ) ;
159+ return new RepItemScheduleInfoOsr ( dueDate , interval , ease ) ;
161160 }
162161
163162 cardGetNewSchedule (
164163 response : ReviewResponse ,
165164 notePath : string ,
166165 dueDateFlashcardHistogram : DueDateHistogram ,
167166 ) : RepItemScheduleInfo {
168- let initial_ease : number = this . settings . baseEase ;
169- /* c8 ignore next 3 */
167+ let initialEase : number = this . settings . baseEase ;
170168 if ( this . noteEaseList . hasEaseForPath ( notePath ) ) {
171- initial_ease = Math . round ( this . noteEaseList . getEaseByPath ( notePath ) ) ;
169+ initialEase = Math . round ( this . noteEaseList . getEaseByPath ( notePath ) ) ;
172170 }
173171 const delayBeforeReview = 0 ;
174172
175173 const schedObj : Record < string , number > = osrSchedule (
176174 response ,
177- SrsAlgorithm_Osr . initialInterval ,
178- initial_ease ,
175+ SrsAlgorithmOsr . initialInterval ,
176+ initialEase ,
179177 delayBeforeReview ,
180178 this . settings ,
181179 dueDateFlashcardHistogram ,
@@ -184,15 +182,15 @@ export class SrsAlgorithm_Osr implements ISrsAlgorithm {
184182 const interval = schedObj . interval ;
185183 const ease = schedObj . ease ;
186184 const dueDate = globalDateProvider . today . add ( interval , "d" ) ;
187- return new RepItemScheduleInfo_Osr ( dueDate , interval , ease , delayBeforeReview ) ;
185+ return new RepItemScheduleInfoOsr ( dueDate , interval , ease , delayBeforeReview ) ;
188186 }
189187
190188 cardCalcUpdatedSchedule (
191189 response : ReviewResponse ,
192190 cardSchedule : RepItemScheduleInfo ,
193191 dueDateFlashcardHistogram : DueDateHistogram ,
194192 ) : RepItemScheduleInfo {
195- const cardScheduleOsr : RepItemScheduleInfo_Osr = cardSchedule as RepItemScheduleInfo_Osr ;
193+ const cardScheduleOsr : RepItemScheduleInfoOsr = cardSchedule as RepItemScheduleInfoOsr ;
196194 const schedObj : Record < string , number > = osrSchedule (
197195 response ,
198196 cardScheduleOsr . interval ,
@@ -205,6 +203,6 @@ export class SrsAlgorithm_Osr implements ISrsAlgorithm {
205203 const ease = schedObj . ease ;
206204 const dueDate = globalDateProvider . today . add ( interval , "d" ) ;
207205 const delayBeforeReview = 0 ;
208- return new RepItemScheduleInfo_Osr ( dueDate , interval , ease , delayBeforeReview ) ;
206+ return new RepItemScheduleInfoOsr ( dueDate , interval , ease , delayBeforeReview ) ;
209207 }
210208}
0 commit comments