-
Notifications
You must be signed in to change notification settings - Fork 533
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #111: Introduce question progress controller implementation #397
Merged
BenHenning
merged 83 commits into
develop
from
introduce-question-progress-controller-implementation
May 28, 2020
Merged
Fix #111: Introduce question progress controller implementation #397
BenHenning
merged 83 commits into
develop
from
introduce-question-progress-controller-implementation
May 28, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
empty test suite.
… training controller
…ler-interface Conflicts: domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt model/src/main/proto/question.proto
This includes some basic refactoring of internal structures used by the exploration progress controller to share common functionality between the two progress controllers. There's still some duplication, but this seems like a reasonable split since there's likely to be further differences in the progress controllers in the future. The question assessment progress controller tests pass, but no new ones have yet been added to thoroughly test the implementation.
ExplorationProgressController. They haven't yet been verified as correct.
…terface Conflicts: domain/src/main/assets/sample_questions.json domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt domain/src/main/java/org/oppia/domain/util/JsonAssetRetriever.kt domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
…w-coroutine-live-data-mechanism
…duce-nested-data-provider Conflicts: utility/src/main/java/org/oppia/util/data/DataProviders.kt
Conflicts: testing/src/main/java/org/oppia/testing/FakeSystemClock.kt
…duce-nested-data-provider
…-progress-controller-implementation Conflicts: domain/src/main/java/org/oppia/domain/exploration/ExplorationProgressController.kt
Thanks @vinitamurthi! I attempted to address all of your comments. PTAL. |
BenHenning
changed the title
Fix #111: Introduce question progress controller implementation [DO NOT MERGE] [Blocked: #929]
Fix #111: Introduce question progress controller implementation [Blocked: #929]
May 28, 2020
vinitamurthi
approved these changes
May 28, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
…-progress-controller-implementation
BenHenning
changed the title
Fix #111: Introduce question progress controller implementation [Blocked: #929]
Fix #111: Introduce question progress controller implementation
May 28, 2020
Thanks for the review! |
BenHenning
deleted the
introduce-question-progress-controller-implementation
branch
May 28, 2020 18:21
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #111 by introducing an implementation for
QuestionAssessmentProgressController
.Since there's a lot of functional overlap between questions and explorations, this PR includes a refactor that pulls a lot of the functionality of explorations out of
ExplorationProgressController
to shared components:ExplorationProgress
,StateDeck
, andStateGraph
. This PR builds on existing exploration concepts by introducingStateList
(since questions use a linear progression rather than a graph).Note that there's one aspect of the question progress controller that's more complex than its exploration counterpart: the base data provider for the assessment itself (the list of questions the learner will complete) is dynamic since the list is generated. For this reason, #929 was needed to introduce support for switching out the data provider fueling the top-level progress data provider (e.g. if a new assessment was started). This resulted in some useful simplifications in the implementation of the progress controller. However, debugging the data provider yielded a bunch of issues that were simplified by rewriting the LiveData mechanism that we use (see #928), which in turn exposed other issues with the test environment that needed to be fixed (#927).