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);
}
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)
{
mnemon->bins = NULL;
mnemon->to_introduce = 10;
- mnemon->to_master = 0;
+ mnemon->to_master = 10;
mnemon->unlearned = 0;
mnemon->mastered = -1;
}
mnemon->categories_size * sizeof (category_t));
}
+/* Get a category by name if it exists */
static category_t *
-mnemon_get_category (mnemon_t *mnemon,
- const char *name)
+mnemon_get_category_if_exists (mnemon_t *mnemon,
+ const char *name)
{
int i;
- category_t *category;
for (i = 0; i < mnemon->num_categories; i++)
if (strcmp (mnemon->categories[i].name, name) == 0)
return &mnemon->categories[i];
+ return NULL;
+}
+
+/* Get a category by name, creating new one if necessary. */
+static category_t *
+mnemon_get_category (mnemon_t *mnemon,
+ const char *name)
+{
+ category_t *category;
+
+ category = mnemon_get_category_if_exists (mnemon, name);
+ if (category)
+ return category;
+
mnemon_categories_grow (mnemon);
category = &mnemon->categories[mnemon->num_categories++];
assert (0);
}
+typedef struct _item_in_category_closure
+{
+ mnemon_t *mnemon;
+ category_t *category;
+} item_in_category_closure_t;
+
+static int
+mnemon_item_in_category (void *closure, item_t *item)
+{
+ item_in_category_closure_t *iicc = closure;
+ mnemon_t *mnemon = iicc->mnemon;
+ category_t *category = iicc->category;
+
+ 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,
}
static void
-mnemon_print_histogram (mnemon_t *mnemon)
+mnemon_print_histogram (mnemon_t *mnemon,
+ 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;
- 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;
+ 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 = bin_num_items_matching (&mnemon->bins[i],
+ predicate, closure);
+ if (i == 0 || num_items > max)
+ max = 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);
+ 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;
}
}
mnemon_handle_command (mnemon_t *mnemon,
const char *command)
{
+ const char *arg;
+ int len;
switch (command[0]) {
case 'h':
- mnemon_print_histogram (mnemon);
- break;
+ {
+ char *category = NULL;
+ int length = 0;
+
+ arg = command + 1;
+ 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;
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.",
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.",
* 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
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);
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
projects / mnemon / blobdiff