Rename PretestEngineService to QuestionPlayerEngineService (oppia#6913)

* Rename PretestEngineService * Fixed linting errors * Fixed linting errors * Fixed linting errors * Revert package-lock.json
saketringsia · Jun 16, 2019 · 46ae61e · 46ae61e
1 parent a156118
commit 46ae61e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/.../dev/head/pages/exploration-player-page/learner-experience/conversation-skin.directive.ts b/.../dev/head/pages/exploration-player-page/learner-experience/conversation-skin.directive.ts
@@ -68,7 +68,8 @@ require(
   'player-correctness-feedback-enabled.service.ts');
 require('pages/exploration-player-page/services/player-position.service.ts');
 require('pages/exploration-player-page/services/player-transcript.service.ts');
-require('pages/exploration-player-page/services/pretest-engine.service.ts');
+require(
+  'pages/exploration-player-page/services/question-player-engine.service.ts');
 require(
   'pages/exploration-player-page/services/' +
   'refresher-exploration-confirmation-modal.service.ts');
@@ -343,7 +344,7 @@ oppia.directive('conversationSkin', [
         'AudioTranslationManagerService', 'EVENT_AUTOPLAY_AUDIO',
         'COMPONENT_NAME_FEEDBACK', 'AutogeneratedAudioPlayerService',
         'StateClassifierMappingService', 'ImagePreloaderService',
-        'PlaythroughService', 'PretestEngineService',
+        'PlaythroughService', 'QuestionPlayerEngineService',
         'WHITELISTED_COLLECTION_IDS_FOR_SAVING_GUEST_PROGRESS',
         'ExplorationPlayerStateService', 'INTERACTION_DISPLAY_MODE_INLINE',
         'CurrentInteractionService', 'UserService',
@@ -370,7 +371,7 @@ oppia.directive('conversationSkin', [
             AudioTranslationManagerService, EVENT_AUTOPLAY_AUDIO,
             COMPONENT_NAME_FEEDBACK, AutogeneratedAudioPlayerService,
             StateClassifierMappingService, ImagePreloaderService,
-            PlaythroughService, PretestEngineService,
+            PlaythroughService, QuestionPlayerEngineService,
             WHITELISTED_COLLECTION_IDS_FOR_SAVING_GUEST_PROGRESS,
             ExplorationPlayerStateService, INTERACTION_DISPLAY_MODE_INLINE,
             CurrentInteractionService, UserService) {

diff --git a/...lates/dev/head/pages/exploration-player-page/services/exploration-player-state.service.ts b/...lates/dev/head/pages/exploration-player-page/services/exploration-player-state.service.ts
@@ -33,7 +33,8 @@ require('pages/exploration-player-page/services/exploration-engine.service.ts');
 require('pages/exploration-player-page/services/number-attempts.service.ts');
 require('pages/exploration-player-page/services/player-position.service.ts');
 require('pages/exploration-player-page/services/player-transcript.service.ts');
-require('pages/exploration-player-page/services/pretest-engine.service.ts');
+require(
+  'pages/exploration-player-page/services/question-player-engine.service.ts');
 require(
   'pages/exploration-player-page/services/state-classifier-mapping.service.ts');
 require('pages/exploration-player-page/services/stats-reporting.service.ts');
@@ -51,21 +52,21 @@ oppia.factory('ExplorationPlayerStateService', [
   'ExplorationFeaturesService', 'NumberAttemptsService',
   'PlayerCorrectnessFeedbackEnabledService', 'PlayerPositionService',
   'PlayerTranscriptService', 'PlaythroughIssuesService', 'PlaythroughService',
-  'PretestEngineService', 'PretestQuestionBackendApiService',
-  'QuestionPlayerBackendApiService',
-  'ReadOnlyExplorationBackendApiService', 'StateClassifierMappingService',
-  'StatsReportingService', 'UrlService', 'EXPLORATION_MODE',
+  'PretestQuestionBackendApiService', 'QuestionPlayerBackendApiService',
+  'QuestionPlayerEngineService', 'ReadOnlyExplorationBackendApiService',
+  'StateClassifierMappingService', 'StatsReportingService',
+  'UrlService', 'EXPLORATION_MODE',
   function(
       $log, $q, $rootScope, ContextService,
       EditableExplorationBackendApiService,
       ExplorationEngineService, ExplorationFeaturesBackendApiService,
       ExplorationFeaturesService, NumberAttemptsService,
       PlayerCorrectnessFeedbackEnabledService, PlayerPositionService,
       PlayerTranscriptService, PlaythroughIssuesService, PlaythroughService,
-      PretestEngineService, PretestQuestionBackendApiService,
-      QuestionPlayerBackendApiService,
-      ReadOnlyExplorationBackendApiService, StateClassifierMappingService,
-      StatsReportingService, UrlService, EXPLORATION_MODE) {
+      PretestQuestionBackendApiService, QuestionPlayerBackendApiService,
+      QuestionPlayerEngineService, ReadOnlyExplorationBackendApiService,
+      StateClassifierMappingService, StatsReportingService,
+      UrlService, EXPLORATION_MODE) {
     var currentEngineService = null;
     var explorationMode = EXPLORATION_MODE.OTHER;
     var editorPreviewMode = ContextService.isInExplorationEditorPage();
@@ -93,12 +94,12 @@ oppia.factory('ExplorationPlayerStateService', [
 
     var initializePretestServices = function(pretestQuestionDicts, callback) {
       PlayerCorrectnessFeedbackEnabledService.init(true);
-      PretestEngineService.init(pretestQuestionDicts, callback);
+      QuestionPlayerEngineService.init(pretestQuestionDicts, callback);
     };
 
     var initializeQuestionPlayerServices = function(questionDicts, callback) {
       PlayerCorrectnessFeedbackEnabledService.init(true);
-      PretestEngineService.init(questionDicts, callback);
+      QuestionPlayerEngineService.init(questionDicts, callback);
     };
 
     var setExplorationMode = function() {
@@ -108,12 +109,12 @@ oppia.factory('ExplorationPlayerStateService', [
 
     var setPretestMode = function() {
       explorationMode = EXPLORATION_MODE.PRETEST;
-      currentEngineService = PretestEngineService;
+      currentEngineService = QuestionPlayerEngineService;
     };
 
     var setQuestionPlayerMode = function() {
       explorationMode = EXPLORATION_MODE.QUESTION_PLAYER;
-      currentEngineService = PretestEngineService;
+      currentEngineService = QuestionPlayerEngineService;
     };
 
     var initExplorationPreviewPlayer = function(callback) {
@@ -200,7 +201,7 @@ oppia.factory('ExplorationPlayerStateService', [
         return explorationMode === EXPLORATION_MODE.QUESTION_PLAYER;
       },
       getPretestQuestionCount: function() {
-        return PretestEngineService.getPretestQuestionCount();
+        return QuestionPlayerEngineService.getPretestQuestionCount();
       },
       moveToExploration: function(callback) {
         setExplorationMode();

diff --git a/...r-page/services/pretest-engine.service.ts → ...ervices/question-player-engine.service.ts b/...r-page/services/pretest-engine.service.ts → ...ervices/question-player-engine.service.ts
@@ -28,7 +28,7 @@ require('services/stateful/FocusManagerService.ts');
 
 oppia.constant('INTERACTION_SPECS', GLOBALS.INTERACTION_SPECS);
 
-oppia.factory('PretestEngineService', [
+oppia.factory('QuestionPlayerEngineService', [
   '$http', '$q', '$rootScope', 'AlertsService', 'AnswerClassificationService',
   'ContextService', 'ExplorationHtmlFormatterService',
   'ExpressionInterpolationService', 'FocusManagerService',

diff --git a/extensions/classifiers/WinnowingPreprocessingService.ts b/extensions/classifiers/WinnowingPreprocessingService.ts
@@ -59,7 +59,7 @@ oppia.factory('WinnowingPreprocessingService', [function() {
       }
 
       var fingerprint = [];
-      fingerprintHashesIndex.forEach(function(hashIndex) {
+      fingerprintHashesIndex.forEach(function(hashIndex: number) {
         fingerprint.push([kGramHashes[hashIndex], hashIndex]);
       });