Changing assessment scoring model.

Previously scores aligned on the answer values: 0 (seeker), 2, 3, and 4
(teacher).
Now scores align halfway between: 0 (seeker), 1.5, 2.5, 3.5 (teacher)

2 files changed, 21 insertions, 21 deletions

diff --git a/tst/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java b/tst/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java
index 8fec4c8..db85051 100644
--- a/tst/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java
+++ b/tst/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java
@@ -67,7 +67,7 @@ public class TrainingRecordResourceTest extends ResourceTestBase {
     @Test
     public void testSkipAssessedChaptersLow() throws Exception {
         // Set the User's score.
-        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"score\": 0.0}");
+        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"sum\": 0.0, \"count\": 1}");
 
         // Run the test
         TrainingRecord record = run(TrainingRecord.class);
@@ -86,7 +86,7 @@ public class TrainingRecordResourceTest extends ResourceTestBase {
     @Test
     public void testSkipAssessedChaptersSeeker() throws Exception {
         // Set the User's score.
-        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"score\": 1.0}");
+        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"sum\": 1.0, \"count\": 1}");
 
         // Run the test
         TrainingRecord record = run(TrainingRecord.class);
@@ -105,7 +105,7 @@ public class TrainingRecordResourceTest extends ResourceTestBase {
     @Test
     public void testSkipAssessedChaptersBeliever() throws Exception {
         // Set the User's score.
-        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"score\": 2.0}");
+        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"sum\": 2.0, \"count\": 1}");
 
         // Run the test
         TrainingRecord record = run(TrainingRecord.class);
@@ -124,7 +124,7 @@ public class TrainingRecordResourceTest extends ResourceTestBase {
     @Test
     public void testSkipAssessedChaptersHigh() throws Exception {
         // Set the User's score.
-        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"score\": 4.0}");
+        mApplication.getAnswerProvider().put(USER_ID, "summary", "{\"sum\": 4.0, \"count\": 1}");
 
         // Run the test
         TrainingRecord record = run(TrainingRecord.class);
diff --git a/tst/com/p4square/grow/model/ScoreTest.java b/tst/com/p4square/grow/model/ScoreTest.java
index dd3522a..5c7be46 100644
--- a/tst/com/p4square/grow/model/ScoreTest.java
+++ b/tst/com/p4square/grow/model/ScoreTest.java
@@ -57,10 +57,10 @@ public class ScoreTest {
      */
     @Test
     public void testNumericScore() {
-        assertEquals(4, Score.numericScore("teacher"));
-        assertEquals(3, Score.numericScore("disciple"));
-        assertEquals(2, Score.numericScore("believer"));
-        assertEquals(1, Score.numericScore("seeker"));
+        assertEquals(3.5, Score.numericScore("teacher"), DELTA);
+        assertEquals(2.5, Score.numericScore("disciple"), DELTA);
+        assertEquals(1.5, Score.numericScore("believer"), DELTA);
+        assertEquals(0, Score.numericScore("seeker"), DELTA);
     }
 
     /**
@@ -70,35 +70,35 @@ public class ScoreTest {
     public void testToString() {
         mScore.count = 1;
 
-        // Seeker is defined as score < 2
+        // Seeker is defined as score < 1.5
         mScore.sum = 0;
         assertEquals("seeker", mScore.toString());
         mScore.sum = 0.5;
         assertEquals("seeker", mScore.toString());
         mScore.sum = 1;
         assertEquals("seeker", mScore.toString());
-        mScore.sum = 1.5;
-        assertEquals("seeker", mScore.toString());
-        mScore.sum = 1.99;
+        mScore.sum = 1.49;
         assertEquals("seeker", mScore.toString());
 
-        // Believer is defined as 2 <= score < 3
-        mScore.sum = 2;
+        // Believer is defined as 1.5 <= score < 2.5
+        mScore.sum = 1.5;
         assertEquals("believer", mScore.toString());
-        mScore.sum = 2.5;
+        mScore.sum = 2;
         assertEquals("believer", mScore.toString());
-        mScore.sum = 2.99;
+        mScore.sum = 2.49;
         assertEquals("believer", mScore.toString());
 
-        // Disciple is defined as 3 <= score < 4
-        mScore.sum = 3;
+        // Disciple is defined as 2.5 <= score < 3.5
+        mScore.sum = 2.5;
         assertEquals("disciple", mScore.toString());
-        mScore.sum = 3.5;
+        mScore.sum = 3;
         assertEquals("disciple", mScore.toString());
-        mScore.sum = 3.99;
+        mScore.sum = 3.49;
         assertEquals("disciple", mScore.toString());
 
-        // Teacher is defined as 4 <= score
+        // Teacher is defined as 3.5 <= score
+        mScore.sum = 3.5;
+        assertEquals("teacher", mScore.toString());
         mScore.sum = 4;
         assertEquals("teacher", mScore.toString());
         mScore.sum = 4.5;