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;
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);
static item_t *
category_add_item (category_t *category,
- int count,
+ int score,
const char *challenge,
const char *response)
{
item = &category->items[category->num_items++];
- item_init (item, count, challenge, response);
+ item_init (item, score, challenge, response);
return item;
}
if (i != 0)
fprintf (file, "\n");
fprintf (file, "%d\n%s\n%s\n",
- item->count,
+ item->score,
item->challenge,
item->response);
}
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;
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);
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;
}
{
int i = bin - mnemon->bins;
+ bin_fini (bin);
+
memmove (bin, bin + 1, (mnemon->num_bins - i) * sizeof (bin_t));
mnemon->num_bins--;
}
category = mnemon_get_category (mnemon, name);
while (1) {
- int count;
+ int score;
char *challenge, *response;
/* Read bin number (ignoring blank separator lines) */
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);
chomp (line);
response = line;
- category_add_item (category, count, challenge, response);
+ category_add_item (category, score, challenge, response);
free (challenge);
}
* 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);
}
err = rename (lock_filename, filename);
if (err < 0) {
- fprintf (stderr, "Error: Failes to rename %s to %s: %s\n",
+ fprintf (stderr, "Error: Failed to rename %s to %s: %s\n",
lock_filename, filename, strerror (errno));
continue;
}
}
static void
-mnemon_do_challenges (mnemon_t *mnemon)
+mnemon_do_challenges (mnemon_t *mnemon,
+ int to_introduce)
{
bin_t *bin;
int item_index;
item_t *item;
char *response;
bool_t correct;
+ int unlearned;
+ int i;
- while (1) {
+ /* Count the number of items with negative scores. */
+ unlearned = 0;
+ for (i = 0; i < mnemon->num_bins; i++) {
+ bin = &mnemon->bins[i];
+ if (bin->score >= 0)
+ break;
+ unlearned += bin->num_items;
+ }
+
+ to_introduce -= unlearned;
+ if (to_introduce < 0)
+ to_introduce = 0;
+
+ 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);
+ printf ("\n");
+ } else {
+ printf ("Introducing %d new items.\n", to_introduce);
+ }
+ printf ("\n");
+
+ do {
mnemon_select_item (mnemon, &bin, &item_index);
+
+ if (bin->score == 0)
+ to_introduce--;
+
item = bin->items[item_index];
printf ("%s\n", item->challenge);
correct = (strcmp (response, item->response) == 0);
bin_remove_item (bin, item_index);
- if (bin->num_items == 0)
+
+ /* 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 && to_introduce == 0))
+ {
mnemon_remove_bin (mnemon, bin);
+ }
if (correct) {
- printf ("Correct!\n\n");
- if (item->count < 0)
- item->count = 1;
- else
- item->count++;
+ item->score++;
+ /* We reserve an item score of 0 for an item that has
+ * never been asked. */
+ if (item->score == 0) {
+ item->score = 1;
+ unlearned--;
+ printf ("You got it!");
+ } 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);
+ }
} else {
- printf (" %s is the correct answer.\n\n",
+ printf (" %s is the correct answer.",
item->response);
- if (item->count > 0)
- item->count = -1;
- else
- item->count--;
+ /* Penalize an incorrect response by forcing the score
+ * negative. */
+ if (item->score >= 0) {
+ if (item->score > 0)
+ printf ( " Oops, you knew that, right?\n ");
+ 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--;
+ }
}
- bin = mnemon_get_bin (mnemon, item->count);
+ printf (" (");
+ if (to_introduce)
+ printf ("%d to come.", to_introduce);
+ if (to_introduce && unlearned)
+ printf (" ");
+ 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->score);
bin_add_item (bin, item);
- }
+ } while (unlearned || to_introduce);
}
int
{
mnemon_t mnemon;
- srand (1);
+ srand (time (NULL));
mnemon_init (&mnemon);
mnemon_load (&mnemon);
- mnemon_do_challenges (&mnemon);
+ mnemon_do_challenges (&mnemon, 10);
mnemon_save (&mnemon);
projects / mnemon / blobdiff