Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixes #1503 : Add RatioInput Module #1663

Merged
merged 17 commits into from
Aug 25, 2020
Merged

Fixes #1503 : Add RatioInput Module #1663

merged 17 commits into from
Aug 25, 2020

Conversation

aggarwalpulkit596
Copy link
Contributor

@aggarwalpulkit596 aggarwalpulkit596 commented Aug 17, 2020 •
edited
Loading

Explanation

Fixes part of #1503

  • Add Equals Classifier

  • Add RatioInputModule

This PR will add the ratio interaction module which is required for any interaction to get started with and each module for an interaction consists of different rules/classifiers which helps in verifying the user's input through different criteria.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

BenHenning
BenHenning requested changes Aug 18, 2020
View reviewed changes
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aggarwalpulkit596. Please fix the branching for this PR—it seems to include changes from your other PR.

Also, will do another full pass after the interaction object is updated.

...main/java/org/oppia/domain/classify/rules/ratioExpressionInput/RatioExpressionInputModule.kt Outdated Show resolved Hide resolved
...g/oppia/domain/classify/rules/ratioExpressionInput/RatioInputEqualsRuleClassifierProvider.kt Outdated Show resolved Hide resolved
@vinitamurthi
Copy link
Contributor

I am taking myself out of reviewers for this one since I think both @rt4914 and @BenHenning have more context on this as me

@vinitamurthi vinitamurthi removed their assignment Aug 18, 2020
@vinitamurthi vinitamurthi removed their request for review August 18, 2020 03:11
@aggarwalpulkit596 aggarwalpulkit596 changed the base branch from develop to ratio-modal August 18, 2020 04:09
BenHenning
BenHenning requested changes Aug 19, 2020
View reviewed changes
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aggarwalpulkit596. There are a few more comments to address yet.

...ava/org/oppia/domain/classify/rules/ratioInput/RatioInputEqualsRuleClassifierProviderTest.kt Outdated Show resolved Hide resolved
BenHenning
BenHenning requested changes Aug 19, 2020
View reviewed changes
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added another comment. Also, please fix the PR title & clarify in the description what this PR is actually introducing. I don't think this is image click input, and you should explain what the changes are & how they're part of the broader project. Linking to specific sections of the design doc is also good.

...ava/org/oppia/domain/classify/rules/ratioInput/RatioInputEqualsRuleClassifierProviderTest.kt Outdated Show resolved Hide resolved
@aggarwalpulkit596 aggarwalpulkit596 changed the title Fixes #1503 : Add ImageClickInput Module Fixes #1503 : Add RatioInput Module Aug 20, 2020
Base automatically changed from ratio-modal to develop August 22, 2020 12:21
@aggarwalpulkit596 aggarwalpulkit596 removed the request for review from rt4914 August 22, 2020 17:19
BenHenning
BenHenning approved these changes Aug 25, 2020
View reviewed changes
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left one comment that I think came from the proto PR, but otherwise this LGTM. Feel free to resolve the remaining comment thread & merge after applying the fix (though note that it might need reformatting).

model/src/main/proto/interaction_object.proto Outdated
Comment on lines 36 to 38
// List of components in a ratio.
// It's also expected that list should have more than 1 elements with
// 0 and 1 elements are invalid states.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// List of components in a ratio.
// It's also expected that list should have more than 1 elements with
// 0 and 1 elements are invalid states.
// List of components in a ratio. It's expected that list should have more than
// 1 element.

@aggarwalpulkit596 aggarwalpulkit596 merged commit d0d2959 into develop Aug 25, 2020
@aggarwalpulkit596 aggarwalpulkit596 deleted the ratio-input-module branch August 25, 2020 06:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenHenning BenHenning BenHenning approved these changes

Assignees

@aggarwalpulkit596 aggarwalpulkit596

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aggarwalpulkit596 @vinitamurthi @BenHenning @rt4914