Add DecisionModel.addReward(reward, decisionId)

Author: panhongx

improveai-android/src/androidTest/java/ai/improve/android/AppGivensProviderTest.java

@@ -92,6 +92,18 @@ public void testAddReward_decisionModel() {
                 ", new reward: " + newTotalRewardsOfModel);
     }
 
+    @Test
+    public void testAddRewardForDecision() {
+        String modelName = "hello";
+        DecisionModel decisionModel = new DecisionModel(modelName);
+        double oldTotalRewards = AppGivensProviderUtils.rewardOfModel(modelName);
+        decisionModel.addReward(0.1, "decision_id");
+        double newTotalRewards = AppGivensProviderUtils.rewardOfModel(modelName);
+        assertEquals(oldTotalRewards+0.1, newTotalRewards, 0.000000000001);
+        IMPLog.d(Tag, "old reward: " + oldTotalRewards +
+                ", new reward: " + newTotalRewards);
+    }
+
     @Test
     public void testVersion_string_length() throws JSONException {
         double v = AppGivensProviderUtils.versionToNumber("7.1.2");

improveai/src/main/java/ai/improve/Decision.java

@@ -84,6 +84,6 @@ public void addReward(double reward) {
             throw new IllegalStateException("id can't be null. Make sure that addReward() is " +
                     "called after get(); and the trackURL is set in the DecisionModel.");
         }
-        model.addRewardForDecision(id, reward);
+        model.addReward(reward, id);
     }
 }

improveai/src/main/java/ai/improve/DecisionModel.java

@@ -530,17 +530,21 @@ public void addReward(double reward) {
     }
 
     /**
-     * @param decisionId unique id of a decision.
+     * Add reward for the provided decisionId
      * @param reward reward for the decision.
+     * @param decisionId unique id of a decision.
+     * @throws IllegalArgumentException Thrown if decisionId is null or empty; Thrown if reward
+     * is NaN or Infinity.
+     * @throws IllegalStateException Thrown if trackURL is null.
      * Adds the reward to a specific decision
      */
-    protected void addRewardForDecision(String decisionId, double reward) {
+    public void addReward(double reward, String decisionId) {
         if(Double.isInfinite(reward) || Double.isNaN(reward)) {
             throw new IllegalArgumentException("reward must not be NaN or infinity");
         }
 
-        if(DecisionTracker.persistenceProvider == null) {
-            throw new RuntimeException("DecisionModel.addReward() is only available for Android.");
+        if(Utils.isEmpty(decisionId)) {
+            throw new IllegalArgumentException("decisionId can't be null or empty");
         }
 
         if(tracker == null) {

improveai/src/main/java/ai/improve/DecisionTracker.java

@@ -219,7 +219,9 @@ public void addRewardForDecision(String modelName, String decisionId, double rew
 
         postTrackingRequest(body);
 
-        persistenceProvider.addRewardForModel(modelName, reward);
+        if(persistenceProvider != null) {
+            persistenceProvider.addRewardForModel(modelName, reward);
+        }
     }
 
     protected Map getAddDecisionRewardRequestBody(String ksuid, String modelName, String decisionId, double reward) {

improveai/src/test/java/ai/improve/DecisionModelTest.java

@@ -1069,6 +1069,85 @@ public void testAddReward_non_Android() {
         fail(DefaultFailMessage);
     }
 
+    @Test
+    public void testAddRewardForDecision() {
+        DecisionModel decisionModel = new DecisionModel("greetings");
+        decisionModel.addReward(1.0, "abcd");
+    }
+
+    @Test
+    public void testAddRewardForDecision_empty_decisionId() {
+        DecisionModel decisionModel = new DecisionModel("greetings");
+        try {
+            decisionModel.addReward(1.0, "");
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return ;
+        }
+        fail(DefaultFailMessage);
+    }
+
+    @Test
+    public void testAddRewardForDecision_null_decisionId() {
+        DecisionModel decisionModel = new DecisionModel("greetings");
+        try {
+            decisionModel.addReward(1.0, null);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return ;
+        }
+        fail(DefaultFailMessage);
+    }
+
+    @Test
+    public void testAddRewardForDecision_nan() {
+        DecisionModel decisionModel = new DecisionModel("greetings");
+        try {
+            decisionModel.addReward(Double.NaN, "abcd");
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return ;
+        }
+        fail(DefaultFailMessage);
+    }
+
+    @Test
+    public void testAddRewardForDecision_positive_infinity() {
+        DecisionModel decisionModel = new DecisionModel("greetings");
+        try {
+            decisionModel.addReward(Double.POSITIVE_INFINITY, "abcd");
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return ;
+        }
+        fail(DefaultFailMessage);
+    }
+
+    @Test
+    public void testAddRewardForDecision_negative_infinity() {
+        DecisionModel decisionModel = new DecisionModel("greetings");
+        try {
+            decisionModel.addReward(Double.POSITIVE_INFINITY, "abcd");
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return ;
+        }
+        fail(DefaultFailMessage);
+    }
+
+    @Test
+    public void testAddRewardForDecision_null_trackURL() {
+        DecisionModel decisionModel = new DecisionModel("greetings");
+        decisionModel.setTrackURL(null);
+        try {
+            decisionModel.addReward(1.0, "abcd");
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+            return ;
+        }
+        fail(DefaultFailMessage);
+    }
+
     @Test
     public void testGivensProvider_getter_setter() {
         DecisionModel decisionModel = new DecisionModel("hello");