MD - youtube video; log metrics test.

README.md

@@ -1,7 +1,7 @@
 hstr
 ====
 
-BASH History Suggest Box - [http://www.youtube.com/watch?v=QYP4PlPvzT0](http://www.youtube.com/watch?v=QYP4PlPvzT0)
+BASH History Suggest Box - [http://www.youtube.com/watch?v=sPF29NyXe2U](http://www.youtube.com/watch?v=sPF29NyXe2U)
 
 
 DESCRIPTION

src/hstr.c

@@ -377,11 +377,13 @@ void selection_loop(HistoryItems *history)
 		case K_CTRL_T:
 			caseSensitive=!caseSensitive;
 			result=print_selection(maxHistoryItems, prefix, history);
+			// TODO render selected line (or reset and move to prompt)
 			print_history_label(history);
 			break;
 		case K_CTRL_H:
 			defaultOrder=!defaultOrder;
 			result=print_selection(maxHistoryItems, prefix, history);
+			// TODO render selected line (or reset and move to prompt)
 			print_history_label(history);
 			break;
 		case K_CTRL_X:

src/hstr_history.c

@@ -35,7 +35,8 @@ static const char *commandBlacklist[] = {
 #endif
 
 unsigned history_ranking_function(unsigned rank, int newOccurenceOrder, size_t length) {
-	long metrics=rank+newOccurenceOrder/10+length;
+	//long metrics=rank+newOccurenceOrder/10+length;
+	long metrics=rank+(log(newOccurenceOrder)*10.0)+length;
 	assert(metrics<UINT_MAX);
 	return metrics;
 }

tests/src/test_hashset.c

@@ -7,18 +7,22 @@
 
 #include "../src/include/hashset.h"
 
-int main(int argc, char *argv[])
+void testBlacklist() {
-{
+	const char* commandBlacklist[] = { };
-	const char *commandBlacklist[] = {"ls", "pwd", "cd", "hh", "mc"};
 	HashSet blacklist;
 	int i;
 	hashset_init(&blacklist);
-	for(i=0; i<5; i++) {
+	for (i = 0; i < 5; i++) {
 		hashset_add(&blacklist, commandBlacklist[i]);
 	}
-
+	for (i = 0; i < 5; i++) {
-	for(i=0; i<5; i++) {
+		printf("match %d\n",
-		printf("match %d\n", hashset_contains(&blacklist, strdup(commandBlacklist[i])));
+				hashset_contains(&blacklist, strdup(commandBlacklist[i])));
 	}
 }
 
+int main(int argc, char *argv[])
+{
+	testBlacklist();
+}
+

tests/src/test_ranking.c

@@ -0,0 +1,19 @@
+/* Test
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+void testLog() {
+	const int HISTORY_SIZE=2000;
+	int i;
+	for(i=0; i<HISTORY_SIZE; i++) {
+		printf("\n%d # l: %f # l10: %f # l2: %f",i,log(i), log10(i), log2(i));
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	testLog();
+}
+

tests/test_ranking.sh

@@ -0,0 +1 @@
+gcc ./src/test_ranking.c -lm -o _ranking