X-Git-Url: https://git.cworth.org/git?p=mnemon;a=blobdiff_plain;f=mnemon.c;h=1ca0939d6fa9f8cdae19d3c7766b640c500a7ffb;hp=2ae2bf4c058837c5f9ee6c2914eff1a608fb7fe5;hb=1024a6bd6797ae95f5ff396d0c0def4d492ed9d9;hpb=aee78f0789100f5b61ff47b3350918b6e7762da3 diff --git a/mnemon.c b/mnemon.c index 2ae2bf4..1ca0939 100644 --- a/mnemon.c +++ b/mnemon.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -35,13 +36,13 @@ typedef int bool_t; typedef struct _item { - int count; + int score; char *challenge; char *response; } item_t; typedef struct _bin { - int count; + int score; int items_size; int num_items; item_t **items; @@ -64,6 +65,11 @@ typedef struct _mnemon { int bins_size; int num_bins; bin_t *bins; + + int to_introduce; + int to_master; + int unlearned; + int mastered; } mnemon_t; static void * @@ -126,11 +132,11 @@ xasprintf (char **strp, const char *fmt, ...) static void item_init (item_t *item, - int count, + int score, const char *challenge, const char *response) { - item->count = count; + item->score = score; item->challenge = xmalloc (strlen (challenge) + 1 + strlen (response) + 1); @@ -186,7 +192,7 @@ category_grow (category_t *category) static item_t * category_add_item (category_t *category, - int count, + int score, const char *challenge, const char *response) { @@ -197,7 +203,7 @@ category_add_item (category_t *category, item = &category->items[category->num_items++]; - item_init (item, count, challenge, response); + item_init (item, score, challenge, response); return item; } @@ -214,7 +220,7 @@ category_print (category_t *category, if (i != 0) fprintf (file, "\n"); fprintf (file, "%d\n%s\n%s\n", - item->count, + item->score, item->challenge, item->response); } @@ -222,9 +228,9 @@ category_print (category_t *category, static void bin_init (bin_t *bin, - int count) + int score) { - bin->count = count; + bin->score = score; bin->items_size = 0; bin->num_items = 0; @@ -253,7 +259,7 @@ static void bin_add_item (bin_t *bin, item_t *item) { - assert (item->count == bin->count); + assert (item->score == bin->score); if (bin->num_items == bin->items_size) bin_grow (bin); @@ -291,6 +297,11 @@ mnemon_init (mnemon_t *mnemon) mnemon->bins_size = 0; mnemon->num_bins = 0; mnemon->bins = NULL; + + mnemon->to_introduce = 3; + mnemon->to_master = 0; + mnemon->unlearned = 0; + mnemon->mastered = -1; } static void @@ -355,26 +366,28 @@ mnemon_bins_grow (mnemon_t *mnemon) static bin_t * mnemon_get_bin (mnemon_t *mnemon, - int count) + int score) { int i; bin_t *bin; for (i = 0; i < mnemon->num_bins; i++) - if (mnemon->bins[i].count == count) + if (mnemon->bins[i].score == score) return &mnemon->bins[i]; - else if (mnemon->bins[i].count > count) + else if (mnemon->bins[i].score > score) break; - mnemon_bins_grow (mnemon); + if (mnemon->num_bins == mnemon->bins_size) + mnemon_bins_grow (mnemon); bin = &mnemon->bins[i]; /* Make room to insert new bin at its sorted location. */ - memmove (bin + 1, bin, (mnemon->num_bins - i) * sizeof (bin_t)); + if (i < mnemon->num_bins) + memmove (bin + 1, bin, (mnemon->num_bins - i) * sizeof (bin_t)); mnemon->num_bins++; - bin_init (bin, count); + bin_init (bin, score); return bin; } @@ -385,6 +398,8 @@ mnemon_remove_bin (mnemon_t *mnemon, { int i = bin - mnemon->bins; + bin_fini (bin); + memmove (bin, bin + 1, (mnemon->num_bins - i) * sizeof (bin_t)); mnemon->num_bins--; } @@ -425,7 +440,7 @@ mnemon_load_category (mnemon_t *mnemon, category = mnemon_get_category (mnemon, name); while (1) { - int count; + int score; char *challenge, *response; /* Read bin number (ignoring blank separator lines) */ @@ -437,7 +452,7 @@ mnemon_load_category (mnemon_t *mnemon, chomp (line); } while (*line == '\0'); - count = strtol (line, &end, 10); + score = strtol (line, &end, 10); if (*end != '\0') { fprintf (stderr, "Failed to parse bin number from \"%s\" at %s:%d\n", line, path, line_count); @@ -460,7 +475,7 @@ mnemon_load_category (mnemon_t *mnemon, chomp (line); response = line; - category_add_item (category, count, challenge, response); + category_add_item (category, score, challenge, response); free (challenge); } @@ -479,7 +494,7 @@ mnemon_load_category (mnemon_t *mnemon, * bin. */ for (i = 0; i < category->num_items; i++) { item_t *item = &category->items[i]; - bin_t *bin = mnemon_get_bin (mnemon, item->count); + bin_t *bin = mnemon_get_bin (mnemon, item->score); bin_add_item (bin, item); } @@ -621,105 +636,233 @@ mnemon_select_item (mnemon_t *mnemon, *item_index_ret = rand_within (bin->num_items); } + +#define HISTOGRAM_ROW_FORMAT "%3d: %3d" +#define HISTOGRAM_BAR_WIDTH 63 + static void -mnemon_do_challenges (mnemon_t *mnemon, - int to_introduce) +print_histogram_bar (double size, + double max) +{ + int units_per_cell = (int) ceil (max / HISTOGRAM_BAR_WIDTH); + static char const *boxes[8] = { + "█", "▉", "▊", "▋", + "▌", "▍", "▎", "▏" + }; + + while (size > units_per_cell) { + printf(boxes[0]); + size -= units_per_cell; + } + + size /= units_per_cell; + + if (size > 7.5/8.0) + printf(boxes[0]); + else if (size > 6.5/8.0) + printf(boxes[1]); + else if (size > 5.5/8.0) + printf(boxes[2]); + else if (size > 4.5/8.0) + printf(boxes[3]); + else if (size > 3.5/8.0) + printf(boxes[4]); + else if (size > 2.5/8.0) + printf(boxes[5]); + else if (size > 1.5/8.0) + printf(boxes[6]); + else if (size > 0.5/8.0) + printf(boxes[7]); + + printf ("\n"); +} + +static void +mnemon_print_histogram (mnemon_t *mnemon) +{ + int i, last_score, max; + bin_t *bin; + + if (mnemon->num_bins == 0) + return; + + max = mnemon->bins[0].num_items; + for (i = 1; i < mnemon->num_bins; i++) + if (mnemon->bins[i].num_items > max) + max = mnemon->bins[i].num_items; + + for (i = 0; i < mnemon->num_bins; i++) { + bin = &mnemon->bins[i]; + if (i != 0) + while (bin->score - last_score > 1) + printf (HISTOGRAM_ROW_FORMAT "\n", ++last_score, 0); + printf (HISTOGRAM_ROW_FORMAT " ", bin->score, bin->num_items); + print_histogram_bar (bin->num_items, max); + last_score = bin->score; + } +} + +static void +mnemon_handle_command (mnemon_t *mnemon, + const char *command) +{ + switch (command[0]) { + case 'h': + mnemon_print_histogram (mnemon); + break; + default: + printf ("Unknown command: %s\n", command); + break; + } +} + +static void +mnemon_handle_response (mnemon_t *mnemon, + bin_t *bin, + int item_index, + item_t *item, + const char *response) +{ + bool_t correct; + + correct = (strcmp (response, item->response) == 0); + + bin_remove_item (bin, item_index); + + /* If the bin is now empty, we must remove it. Also if we just + * picked the last word we'll ever pick from the bin with + * score 0, then we can remove that as well. */ + if (bin->num_items == 0 || + (bin->score == 0 && mnemon->to_introduce == 0)) + { + mnemon_remove_bin (mnemon, bin); + } + + if (correct) { + item->score++; + /* We reserve an item score of 0 for an item that has + * never been asked. */ + if (item->score == 0) { + item->score = 1; + mnemon->unlearned--; + printf ("You got it!"); + if (mnemon->unlearned == 0 && mnemon->to_master == 0) { + mnemon->to_master = 10; + mnemon->mastered = 0; + } + } else if (item->score < 0) { + printf ("Yes---just give me %d more.", + - item->score); + } else if (item->score == 1) { + 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.", + item->response); + /* Penalize an incorrect response by forcing the score + * negative. */ + if (item->score >= 0) { + if (item->score > 0) + printf ( " Oops, you knew that, right?\n "); + mnemon->unlearned++; + /* 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 + * a correct response without any learning). */ + item->score = -2; + } else { + item->score--; + } + } + + 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!"); + } + printf ("\n\n"); + + bin = mnemon_get_bin (mnemon, item->score); + + bin_add_item (bin, item); +} + +static void +mnemon_do_challenges (mnemon_t *mnemon) { bin_t *bin; int item_index; item_t *item; char *response; - bool_t correct; - int unlearned; int i; - /* Count the number of items with negative counts. */ - unlearned = 0; + /* Count the number of items with negative scores. */ + mnemon->unlearned = 0; for (i = 0; i < mnemon->num_bins; i++) { bin = &mnemon->bins[i]; - if (bin->count >= 0) + if (bin->score >= 0) break; - unlearned += bin->num_items; + mnemon->unlearned += bin->num_items; } - to_introduce -= unlearned; - if (to_introduce < 0) - to_introduce = 0; + mnemon->to_introduce -= mnemon->unlearned; + if (mnemon->to_introduce < 0) + mnemon->to_introduce = 0; + + /* Get rid of bin with score of 0 if we aren't going to be + * introducing anything from it. */ + if (mnemon->to_introduce == 0) { + bin = mnemon_get_bin (mnemon, 0); + mnemon_remove_bin (mnemon, bin); + } - if (unlearned) { - printf ("You've got %d items to learn already. ", unlearned); - if (to_introduce) - printf ("I'll introduce %d more as we go.", to_introduce); + if (mnemon->unlearned) { + printf ("You've got %d items to learn already. ", mnemon->unlearned); + if (mnemon->to_introduce) + printf ("I'll introduce %d more as we go.", mnemon->to_introduce); printf ("\n"); } else { - printf ("Introducing %d new items.\n", to_introduce); + printf ("Introducing %d new items.\n", mnemon->to_introduce); } printf ("\n"); do { - do { - mnemon_select_item (mnemon, &bin, &item_index); - } while (bin->count == 0 && to_introduce == 0); - - if (bin->count == 0) - to_introduce--; - + mnemon_select_item (mnemon, &bin, &item_index); item = bin->items[item_index]; - printf ("%s\n", item->challenge); + if (bin->score == 0) + mnemon->to_introduce--; - response = readline ("> "); - if (response == NULL) { - printf ("\n"); - break; - } + while (1) { + printf ("%s\n", item->challenge); - correct = (strcmp (response, item->response) == 0); - - bin_remove_item (bin, item_index); - if (bin->num_items == 0) - mnemon_remove_bin (mnemon, bin); - - if (correct) { - item->count++; - /* We reserve an item count of 0 for an item that has - * never been asked. */ - if (item->count == 0) { - item->count = 1; - unlearned--; - printf ("You got it!"); - } else if (item->count < 0) { - printf ("Yes---just give me %d more.", - - item->count); - } else { - printf ("Masterful."); + response = readline ("> "); + /* Terminate on EOF */ + if (response == NULL) { + printf ("\n"); + return; } - } else { - printf (" %s is the correct answer.", - item->response); - item->count--; - /* Penalize an incorrect response by forcing the count - * negative. */ - if (item->count >= 0) { - item->count = -1; - unlearned++; - printf ( " Oops, you knew that, right?\n "); - } - } - printf (" ("); - if (to_introduce) - printf ("%d to come. ", to_introduce); - if (unlearned) - printf ("%d still unlearned.", unlearned); - if (to_introduce == 0 && unlearned == 0) - printf ("Great job!"); - printf (")\n\n"); - - bin = mnemon_get_bin (mnemon, item->count); + if (response[0] == '/') + mnemon_handle_command (mnemon, response + 1); + else + break; + } - bin_add_item (bin, item); - } while (unlearned || to_introduce); + mnemon_handle_response (mnemon, bin, item_index, + item, response); + } while (mnemon->mastered < mnemon->to_master); } int @@ -733,7 +876,7 @@ main (int argc, char *argv[]) mnemon_load (&mnemon); - mnemon_do_challenges (&mnemon, 10); + mnemon_do_challenges (&mnemon); mnemon_save (&mnemon);