From: Carl Worth <cworth@cworth.org>
Date: Sat, 4 Aug 2007 04:33:11 +0000 (-0700)
Subject: Allow "/h <category>" to display histogram for a single category
X-Git-Url: https://git.cworth.org/git?p=mnemon;a=commitdiff_plain;h=feb97f2e93ce77e7f53c74c5496c7cfb84576f08

Allow "/h <category>" to display histogram for a single category
---

diff --git a/mnemon.c b/mnemon.c
index 3e49777..52a77d0 100644
--- a/mnemon.c
+++ b/mnemon.c
@@ -376,17 +376,31 @@ mnemon_categories_grow (mnemon_t *mnemon)
 				   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++];
@@ -746,6 +760,25 @@ 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) */
+static int
+mnemon_bin_num_items_in_category (mnemon_t	*mnemon,
+				  bin_t    	*bin,
+				  category_t	*category)
+{
+    int i, num_items = 0;
+
+    if (category == NULL)
+	return bin->num_items;
+
+    for (i = 0; i < bin->num_items; i++)
+	if (mnemon_item_category (mnemon, bin->items[i]) == category)
+	    num_items++;
+
+    return num_items;
+}
+
 static void
 mnemon_select_item (mnemon_t	 *mnemon,
 		    bin_t	**bin_ret,
@@ -821,26 +854,37 @@ print_histogram_bar (double	size,
 }
 
 static void
-mnemon_print_histogram (mnemon_t *mnemon)
+mnemon_print_histogram (mnemon_t    *mnemon,
+			const char  *category_name)
 {
     int i, last_score, max;
+    category_t *category = NULL;
     bin_t *bin;
+    int num_items;
 
     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);
+
+    for (i = 0; i < mnemon->num_bins; i++) {
+	num_items = mnemon_bin_num_items_in_category (mnemon,
+						      &mnemon->bins[i],
+						      category);
+	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 = mnemon_bin_num_items_in_category (mnemon,
+						      bin, category);
+	printf (HISTOGRAM_ROW_FORMAT " ", bin->score, num_items);
+	print_histogram_bar (num_items, max);
 	last_score = bin->score;
     }
 }
@@ -849,9 +893,15 @@ static void
 mnemon_handle_command (mnemon_t		*mnemon,
 		       const char	*command)
 {
+    const char *arg;
     switch (command[0]) {
 	case 'h':
-	    mnemon_print_histogram (mnemon);
+	    arg = command + 1;
+	    while (*arg && isspace (*arg))
+		arg++;
+	    if (*arg == '\0')
+		arg = NULL;
+	    mnemon_print_histogram (mnemon, arg);
 	    break;
         default:
 	    printf ("Unknown command: %s\n", command);