From 2b53df1901dad03f8556d2dc52bab86baeb6cb47 Mon Sep 17 00:00:00 2001 From: Ben Henning Date: Wed, 20 Nov 2019 00:06:22 -0800 Subject: [PATCH 1/2] Update fraction rule parsing to use non-negative int instead of double. --- domain/src/main/java/org/oppia/domain/util/StateRetriever.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt index e6d9a55e35f..a018523c8f8 100644 --- a/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt +++ b/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt @@ -184,7 +184,7 @@ class StateRetriever @Inject constructor( "HasDenominatorEqualTo", "HasNumeratorEqualTo" -> ruleSpecBuilder.putInput( inputName, InteractionObject.newBuilder() - .setReal(inputsJson.getDouble(inputName)) + .setNonNegativeInt(inputsJson.getInt(inputName)) .build() ) else -> ruleSpecBuilder.putInput(inputName, createExactInputFromJson(inputsJson, inputName, interactionId)) From e6090d4ba4ab78e09f0fc5ea713de03d5d88eb4a Mon Sep 17 00:00:00 2001 From: Ben Henning Date: Mon, 25 Nov 2019 22:40:36 -0800 Subject: [PATCH 2/2] Address reviewer comment. --- .../src/main/java/org/oppia/domain/util/StateRetriever.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt index a018523c8f8..d378da5b25d 100644 --- a/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt +++ b/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt @@ -181,7 +181,13 @@ class StateRetriever @Inject constructor( while (inputKeysIterator.hasNext()) { val inputName = inputKeysIterator.next() when (ruleSpecBuilder.ruleType) { - "HasDenominatorEqualTo", "HasNumeratorEqualTo" -> ruleSpecBuilder.putInput( + "HasNumeratorEqualTo" -> ruleSpecBuilder.putInput( + inputName, + InteractionObject.newBuilder() + .setSignedInt(inputsJson.getInt(inputName)) + .build() + ) + "HasDenominatorEqualTo" -> ruleSpecBuilder.putInput( inputName, InteractionObject.newBuilder() .setNonNegativeInt(inputsJson.getInt(inputName))