Change mastery metric so that training continues until overall score has improved...

[mnemon] / mnemon.c

diff --git a/mnemon.c b/mnemon.c
index 446d449b736d1bb2a1743688aa7bc6d86d19a4dc..fd7b9bf15b4ce7da6b6772420cfeea79e4028a39 100644 (file)
--- a/mnemon.c
+++ b/mnemon.c
@@ -115,7 +115,21 @@ xstrdup (const char *s)
     char *ret;
 
     ret = strdup (s);
-    if (s == NULL) {
+    if (ret == NULL) {
+       fprintf (stderr, "Error: out of memory\n");
+       exit (1);
+    }
+
+    return ret;
+}
+
+static char *
+xstrndup (const char *s, size_t n)
+{
+    char *ret;
+
+    ret = strndup (s, n);
+    if (ret == NULL) {
        fprintf (stderr, "Error: out of memory\n");
        exit (1);
     }
@@ -364,7 +378,7 @@ mnemon_init (mnemon_t *mnemon)
     mnemon->bins = NULL;
 
     mnemon->to_introduce = 10;
-    mnemon->to_master = 0;
+    mnemon->to_master = 10;
     mnemon->unlearned = 0;
     mnemon->mastered = -1;
 }
@@ -797,6 +811,27 @@ mnemon_item_in_category (void *closure, item_t *item)
     return (mnemon_item_category (mnemon, item) == category);
 }
 
+typedef struct _item_in_category_of_length_closure
+{
+    mnemon_t *mnemon;
+    category_t *category;
+    int length;
+} item_in_category_of_length_closure_t;
+
+static int
+mnemon_item_in_category_of_length (void *closure, item_t *item)
+{
+    item_in_category_of_length_closure_t *iicolc = closure;
+    mnemon_t *mnemon = iicolc->mnemon;
+    category_t *category = iicolc->category;
+    int length = iicolc->length;
+
+    if (mnemon_item_category (mnemon, item) != category)
+       return 0;
+
+    return strlen (item->challenge) == length;
+}
+
 static void
 mnemon_select_item (mnemon_t    *mnemon,
                    bin_t       **bin_ret,
@@ -873,7 +908,8 @@ print_histogram_bar (double size,
 
 static void
 mnemon_print_histogram (mnemon_t    *mnemon,
-                       const char  *category_name)
+                       const char  *category_name,
+                       int          length)
 {
     int i, last_score, max;
     category_t *category = NULL;
@@ -882,6 +918,7 @@ mnemon_print_histogram (mnemon_t    *mnemon,
     item_match_predicate_t *predicate = NULL;
     void *closure = NULL;
     item_in_category_closure_t item_in_category;
+    item_in_category_of_length_closure_t item_in_category_of_length;
 
     if (mnemon->num_bins == 0)
        return;
@@ -889,10 +926,18 @@ mnemon_print_histogram (mnemon_t    *mnemon,
     if (category_name) {
        category = mnemon_get_category_if_exists (mnemon, category_name);
        if (category) {
-           predicate = mnemon_item_in_category;
-           item_in_category.mnemon = mnemon;
-           item_in_category.category = category;
-           closure = &item_in_category;
+           if (length) {
+               predicate = mnemon_item_in_category_of_length;
+               item_in_category_of_length.mnemon = mnemon;
+               item_in_category_of_length.category = category;
+               item_in_category_of_length.length = length;
+               closure = &item_in_category_of_length;
+           } else {
+               predicate = mnemon_item_in_category;
+               item_in_category.mnemon = mnemon;
+               item_in_category.category = category;
+               closure = &item_in_category;
+           }
        }
     }
 
@@ -921,15 +966,26 @@ mnemon_handle_command (mnemon_t           *mnemon,
                       const char       *command)
 {
     const char *arg;
+    int len;
     switch (command[0]) {
        case 'h':
+       {
+           char *category = NULL;
+           int length = 0;
+
            arg = command + 1;
-           while (*arg && isspace (*arg))
-               arg++;
-           if (*arg == '\0')
-               arg = NULL;
-           mnemon_print_histogram (mnemon, arg);
-           break;
+           arg += strspn (arg, " \t");
+           len = strcspn (arg, " \t");
+           if (len) {
+               category = xstrndup (arg, len);
+               arg += len;
+               arg += strspn (arg, " \t");
+               if (*arg)
+                   length = atoi (arg);
+           }
+           mnemon_print_histogram (mnemon, category, length);
+       }
+       break;
         default:
            printf ("Unknown command: %s\n", command);
            break;
@@ -960,11 +1016,13 @@ mnemon_handle_response (mnemon_t *mnemon,
 
     if (correct) {
        item->score++;
+       mnemon->to_master--;
        /* We reserve an item score of 0 for an item that has
         * never been asked. */
        if (item->score == 0) {
            item->score = 1;
            mnemon->unlearned--;
+           mnemon->to_master--;
            printf ("You got it!");
        } else if (item->score < 0) {
            printf ("Yes---just give me %d more.",
@@ -973,8 +1031,6 @@ mnemon_handle_response (mnemon_t   *mnemon,
            printf ("On your first try, no less!");
        } else {
            printf ("Masterful (%dx).", item->score);
-           if (mnemon->to_master)
-               mnemon->mastered++;
        }
     } else {
        printf ("  %s is the correct answer.",
@@ -983,8 +1039,15 @@ mnemon_handle_response (mnemon_t  *mnemon,
         * negative. */
        if (item->score >= 0) {
            if (item->score > 0)
-               printf ( " Oops, you knew that, right?\n ");
+               printf (" Oops, you knew that, right? (%dx)\n ",
+                       item->score);
            mnemon->unlearned++;
+           /* We add three here, (rather than just 2 to track the
+            * change in the item's score below), as an extra
+            * penalty. If the user is forgetting stuff learned
+            * previously, then more time should be spent on mastering
+            * than learning new items. */
+           mnemon->to_master += item->score + 3;
            /* We go to -2 to force a little extra reinforcement
             * when re-learning an item, (otherwise, it will often
             * get asked again immediately where it is easy to get
@@ -992,29 +1055,17 @@ mnemon_handle_response (mnemon_t *mnemon,
            item->score = -2;
        } else {
            item->score--;
+           mnemon->to_master++;
        }
     }
 
-    if (mnemon->to_introduce == 0 &&
-       mnemon->unlearned == 0 &&
-       mnemon->to_master == 0)
-    {
-       mnemon->to_master = 10;
-       mnemon->mastered = 0;
-    }
-
     printf (" ");
     if (mnemon->to_introduce)
        printf ("%d to come. ", mnemon->to_introduce);
     if (mnemon->unlearned)
        printf ("%d still unlearned. ", mnemon->unlearned);
-    if (mnemon->to_master) {
-       if (mnemon->mastered < mnemon->to_master)
-           printf ("%d items to master",
-                   mnemon->to_master - mnemon->mastered);
-       else
-           printf ("Great job!");
-    }
+    if (mnemon->to_introduce == 0 && mnemon->to_master > 0)
+       printf ("%d items to master", mnemon->to_master);
     printf ("\n\n");
 
     bin = mnemon_get_bin (mnemon, item->score);
@@ -1086,7 +1137,11 @@ mnemon_do_challenges (mnemon_t *mnemon)
 
        mnemon_handle_response (mnemon, bin, item_index,
                                item, response);
-    } while (mnemon->mastered < mnemon->to_master);
+    } while (mnemon->to_introduce ||
+            mnemon->unlearned ||
+            mnemon->to_master > 0);
+
+    printf ("Great job.\n");
 }
 
 int