X-Git-Url: https://git.cworth.org/git?p=mnemon;a=blobdiff_plain;f=mnemon.c;h=fd7b9bf15b4ce7da6b6772420cfeea79e4028a39;hp=52a77d02ff82a430108748b76d5714aa6a057e30;hb=ce8d39d4b7bd3cc650ea85636dfde4dad56903cf;hpb=feb97f2e93ce77e7f53c74c5496c7cfb84576f08 diff --git a/mnemon.c b/mnemon.c index 52a77d0..fd7b9bf 100644 --- 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); } @@ -323,6 +337,27 @@ bin_item_index (bin_t *bin, assert (0); } +typedef int (item_match_predicate_t) (void *closure, item_t *item); + +/* Return the number of items in the bin from the given category (or + * from all categories if category == NULL) */ +static int +bin_num_items_matching (bin_t *bin, + item_match_predicate_t *predicate, + void *closure) +{ + int i, num_items = 0; + + if (predicate == NULL) + return bin->num_items; + + for (i = 0; i < bin->num_items; i++) + if ((predicate) (closure, bin->items[i])) + num_items++; + + return num_items; +} + static void mnemon_init (mnemon_t *mnemon) { @@ -343,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; } @@ -760,23 +795,41 @@ mnemon_item_category (mnemon_t *mnemon, assert (0); } -/* Return the number of items in the bin from the given category (or - * from all categories if category == NULL) */ +typedef struct _item_in_category_closure +{ + mnemon_t *mnemon; + category_t *category; +} item_in_category_closure_t; + static int -mnemon_bin_num_items_in_category (mnemon_t *mnemon, - bin_t *bin, - category_t *category) +mnemon_item_in_category (void *closure, item_t *item) { - int i, num_items = 0; + item_in_category_closure_t *iicc = closure; + mnemon_t *mnemon = iicc->mnemon; + category_t *category = iicc->category; - if (category == NULL) - return bin->num_items; + return (mnemon_item_category (mnemon, item) == category); +} - for (i = 0; i < bin->num_items; i++) - if (mnemon_item_category (mnemon, bin->items[i]) == category) - num_items++; +typedef struct _item_in_category_of_length_closure +{ + mnemon_t *mnemon; + category_t *category; + int length; +} item_in_category_of_length_closure_t; - return num_items; +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 @@ -855,23 +908,42 @@ 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; bin_t *bin; int num_items; + 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; - if (category_name) + if (category_name) { category = mnemon_get_category_if_exists (mnemon, category_name); + if (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; + } + } + } for (i = 0; i < mnemon->num_bins; i++) { - num_items = mnemon_bin_num_items_in_category (mnemon, - &mnemon->bins[i], - category); + num_items = bin_num_items_matching (&mnemon->bins[i], + predicate, closure); if (i == 0 || num_items > max) max = num_items; } @@ -881,8 +953,8 @@ mnemon_print_histogram (mnemon_t *mnemon, if (i != 0) while (bin->score - last_score > 1) printf (HISTOGRAM_ROW_FORMAT "\n", ++last_score, 0); - num_items = mnemon_bin_num_items_in_category (mnemon, - bin, category); + num_items = bin_num_items_matching (bin, + predicate, closure); printf (HISTOGRAM_ROW_FORMAT " ", bin->score, num_items); print_histogram_bar (num_items, max); last_score = bin->score; @@ -894,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; @@ -933,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.", @@ -946,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.", @@ -956,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 @@ -965,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); @@ -1059,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