more-ds

1 files changed, 20 insertions, 5 deletions

diff --git a/ministat.c b/ministat.c
index 96fb407..f8c4414 100644
--- a/ministat.c
+++ b/ministat.c
@@ -125,8 +125,12 @@ double student [NSTUDENT + 1][NCONF] = {
 /* 100. */	{	1.290,	1.660,	1.984,	2.364,	2.626,	3.174  }
 };
 
-#define	MAX_DS	3
-static char symbol[] = { ' ', 'x', '+', '*', '%', '#', '@', 'O' };
+#define	MAX_DS	8
+static char symbol[] = {
+	' ',
+	'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+	'+', 'x', '*', '#', '%', '&', '@'
+};
 
 struct dataset {
 	char *name;
@@ -306,7 +310,7 @@ Vitals(struct dataset *ds, int flag)
 {
 
 	printf("%c %3d(%3d) %13.8g %13.8g %13.8g %13.8g %13.8g",
-	       symbol[1 << flag], ds->n, ds->sn,
+	       symbol[flag + 1], ds->n, ds->sn,
 	       Min(ds), Max(ds), ds->median, Avg(ds), Stddev(ds));
 	printf("\n");
 }
@@ -522,6 +526,17 @@ PlotSet(struct dataset *ds, int val)
 	pl->bar[bar][x] = 'A';
 }
 
+static char plot_symbol(unsigned int x)
+{
+	if (x == 0)
+		x = 0;
+	else if ((x & (x - 1)) == 0)
+		x = __builtin_ffs(x);
+	else
+		x = __builtin_popcount(x) + MAX_DS - 1;
+	return symbol[x];
+}
+
 static void
 DumpPlot(void)
 {
@@ -545,7 +560,7 @@ DumpPlot(void)
 		putchar('|');
 		for (j = 0; j < pl->width; j++) {
 			k = pl->data[(pl->height - i) * pl->width + j];
-			putchar(symbol[k]);
+			putchar(plot_symbol(k));
 		}
 		putchar('|');
 		putchar('\n');
@@ -762,7 +777,7 @@ main(int argc, char **argv)
 	}
 
 	for (i = 0; i < nds; i++) 
-		printf("%c %s\n", symbol[1 << i], ds[i]->name);
+		printf("%c %s\n", symbol[i + 1], ds[i]->name);
 
 	if (!flag_n && !flag_q) {
 		SetupPlot(termwidth, flag_s, nds);