X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=208bdc45ea5adf7d9c4ca67e505902d694718306;hp=d29c62c22b396ac685f140b9d936f041184ca5d3;hb=fd98a9eb785bb0809269bfc623ba16c452fb0c1a;hpb=642445e95fea1c548c79f80ad3b5d6f30ba572f3

diff --git a/mood.c b/mood.c
index d29c62c2..208bdc45 100644
--- a/mood.c
+++ b/mood.c
@@ -8,6 +8,7 @@
 
 #include <regex.h>
 #include <osl.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -19,6 +20,7 @@
 #include "mm.h"
 #include "sideband.h"
 #include "mood.h"
+#include "sched.h"
 
 /**
  * Contains statistical data of the currently admissible audio files.
@@ -140,8 +142,8 @@ static bool get_item_score(struct mood_item *item, const struct afs_info *afsi,
 }
 
 /* returns 1 if row admissible, 0 if not, negative on errors */
-static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
-		long *result)
+static int row_is_admissible(const struct osl_row *aft_row, struct mood *m,
+		long *scorep)
 {
 	struct mood_item *item;
 	int ret;
@@ -154,13 +156,13 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	if (!m)
 		return -E_NO_MOOD;
 	ret = get_afsi_of_row(aft_row, &afsi);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	ret = get_afhi_of_row(aft_row, &afhi);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	ret = get_audio_file_path_of_row(aft_row, &path);
-	if (ret< 0)
+	if (ret < 0)
 		return ret;
 	/* reject audio file if it matches any entry in the deny list */
 	list_for_each_entry(item, &m->deny_list, mood_item_node) {
@@ -190,7 +192,7 @@ static int compute_mood_score(const struct osl_row *aft_row, struct mood *m,
 	}
 	if (score_arg_sum)
 		score /= score_arg_sum;
-	*result = score;
+	*scorep = score;
 	return 1;
 }
 
@@ -257,7 +259,6 @@ struct mood_line_parser_data {
  * <score> is either an integer or "random" which assigns a random score to
  * all matching files
  */
-
 static int parse_mood_line(char *mood_line, void *data)
 {
 	struct mood_line_parser_data *mlpd = data;
@@ -446,7 +447,7 @@ static int64_t normalized_value(int64_t x, int64_t n, int64_t sum, int64_t qd)
 {
 	if (!n || !qd)
 		return 0;
-	return 100 * (n * x - sum) / (int64_t)int_sqrt(n * qd);
+	return 100 * (n * x - sum) / (int64_t)int_sqrt(n) / (int64_t)int_sqrt(qd);
 }
 
 static long compute_score(struct afs_info *afsi, long mood_score)
@@ -460,7 +461,7 @@ static long compute_score(struct afs_info *afsi, long mood_score)
 
 static int add_afs_statistics(const struct osl_row *row)
 {
-	uint64_t n, x, s;
+	uint64_t n, x, s, q;
 	struct afs_info afsi;
 	int ret;
 
@@ -470,14 +471,18 @@ static int add_afs_statistics(const struct osl_row *row)
 	n = statistics.num;
 	x = afsi.last_played;
 	s = statistics.last_played_sum;
-	if (n > 0)
-		statistics.last_played_qd += (x - s / n) * (x - s / n) * n / (n + 1);
+	if (n > 0) {
+		q = (x > s / n)? x - s / n : s / n - x;
+		statistics.last_played_qd += q * q * n / (n + 1);
+	}
 	statistics.last_played_sum += x;
 
 	x = afsi.num_played;
 	s = statistics.num_played_sum;
-	if (n > 0)
-		statistics.num_played_qd += (x - s / n) * (x - s / n) * n / (n + 1);
+	if (n > 0) {
+		q = (x > s / n)? x - s / n : s / n - x;
+		statistics.num_played_qd += q * q * n / (n + 1);
+	}
 	statistics.num_played_sum += x;
 	statistics.num++;
 	return 1;
@@ -566,7 +571,7 @@ static int add_if_admissible(struct osl_row *aft_row, void *data)
 	int ret;
 	long score = 0;
 
-	ret = compute_mood_score(aft_row, aa->m, &score);
+	ret = row_is_admissible(aft_row, aa->m, &score);
 	if (ret <= 0)
 		return ret;
 	if (statistics.num >= aa->size) {
@@ -604,7 +609,8 @@ static int add_if_admissible(struct osl_row *aft_row, void *data)
  * the last number a_n was replaced by b) may be computed in O(1) time in terms
  * of n, q, a_n, b, and S as
  *
- * 	q' = q + d * s - (2 * S + d) * d / n,
+ * 	q' = q + d * s - (2 * S + d) * d / n
+ *	   = q + d * (s - 2 * S / n - d /n),
  *
  * where d = b - a_n, and s = b + a_n.
  *
@@ -621,10 +627,11 @@ _static_inline_ int64_t update_quadratic_deviation(int64_t n, int64_t old_qd,
 {
 	int64_t delta = new_val - old_val;
 	int64_t sigma = new_val + old_val;
-	return old_qd + delta * sigma - (2 * old_sum + delta) * delta / n;
+	return old_qd + delta * (sigma - 2 * old_sum / n - delta / n);
 }
 
-static int update_afs_statistics(struct afs_info *old_afsi, struct afs_info *new_afsi)
+static int update_afs_statistics(struct afs_info *old_afsi,
+		struct afs_info *new_afsi)
 {
 	unsigned n;
 	int ret = get_num_admissible_files(&n);
@@ -711,7 +718,7 @@ static int mood_update_audio_file(const struct osl_row *aft_row,
 	if (ret < 0)
 		return ret;
 	was_admissible = ret;
-	ret = compute_mood_score(aft_row, current_mood, &score);
+	ret = row_is_admissible(aft_row, current_mood, &score);
 	if (ret < 0)
 		return ret;
 	is_admissible = (ret > 0);
@@ -741,23 +748,34 @@ static int mood_update_audio_file(const struct osl_row *aft_row,
 		percent = 100;
 	else if (percent < 0)
 		percent = 0;
-	PARA_DEBUG_LOG("moving from rank %u to %lu%%\n", rank, percent);
+	PARA_DEBUG_LOG("moving from rank %u to %li%%\n", rank, percent);
 	return score_update(aft_row, percent);
 }
 
 static void log_statistics(void)
 {
 	unsigned n = statistics.num;
+	int mean_days, sigma_days;
+	/*
+	 * We can not use the "now" pointer from sched.c here because we are
+	 * called before schedule(), which initializes "now".
+	 */
+	struct timeval rnow;
 
+	assert(current_mood);
+	PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name?
+		current_mood->name : "(dummy)");
 	if (!n) {
-		PARA_NOTICE_LOG("no admissible files\n");
+		PARA_WARNING_LOG("no admissible files\n");
 		return;
 	}
-	PARA_INFO_LOG("last_played mean: %lli, last_played sigma: %llu\n",
-		(long long int)(statistics.last_played_sum / n),
-		(long long unsigned)int_sqrt(statistics.last_played_qd / n));
-	PARA_INFO_LOG("num_played mean: %lli, num_played sigma: %llu\n",
-		(long long int)statistics.num_played_sum / n,
+	PARA_NOTICE_LOG("%u admissible files\n", statistics.num);
+	clock_get_realtime(&rnow);
+	mean_days = (rnow.tv_sec - statistics.last_played_sum / n) / 3600 / 24;
+	sigma_days = int_sqrt(statistics.last_played_qd / n) / 3600 / 24;
+	PARA_NOTICE_LOG("last_played mean/sigma: %d/%d days\n", mean_days, sigma_days);
+	PARA_NOTICE_LOG("num_played mean/sigma: %llu/%llu\n",
+		(long long unsigned)statistics.num_played_sum / n,
 		(long long unsigned)int_sqrt(statistics.num_played_qd / n));
 }
 
@@ -790,7 +808,7 @@ void close_current_mood(void)
  * \sa struct admissible_file_info, struct admissible_array, struct
  * afs_info::last_played, mood_close().
  */
-int change_current_mood(char *mood_name)
+int change_current_mood(const char *mood_name)
 {
 	int i, ret;
 	struct admissible_array aa = {
@@ -802,7 +820,7 @@ int change_current_mood(char *mood_name)
 		struct mood *m;
 		struct osl_row *row;
 		struct osl_object obj = {
-			.data = mood_name,
+			.data = (char *)mood_name,
 			.size = strlen(mood_name) + 1
 		};
 		ret = osl(osl_get_row(moods_table, BLOBCOL_NAME, &obj, &row));
@@ -824,20 +842,19 @@ int change_current_mood(char *mood_name)
 	ret = audio_file_loop(&aa, add_if_admissible);
 	if (ret < 0)
 		return ret;
-	log_statistics();
-	PARA_INFO_LOG("%d admissible files\n", statistics.num);
 	for (i = 0; i < statistics.num; i++) {
 		struct admissible_file_info *a = aa.array + i;
 		ret = add_to_score_table(a->aft_row, a->score);
 		if (ret < 0)
 			goto out;
 	}
-	PARA_NOTICE_LOG("loaded mood %s\n", mood_name? mood_name : "(dummy)");
+	log_statistics();
 	ret = statistics.num;
 out:
 	free(aa.array);
 	return ret;
 }
+
 /**
  * Close and re-open the current mood.
  *