X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=8d171bde93170dd110ffe4d1b480dc313a8c61de;hp=2cb7bc699f3688985565142af40762a73ea82311;hb=9aa1f3d69c0aa335b3026581defbc09eb2c4efb4;hpb=f24778705c853647f48b89c8d27ba1ded27a6f29

diff --git a/mood.c b/mood.c
index 2cb7bc69..8d171bde 100644
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -18,6 +18,7 @@
 #include "ipc.h"
 #include "mm.h"
 #include "sideband.h"
+#include "mood.h"
 
 /**
  * Contains statistical data of the currently admissible audio files.
@@ -29,7 +30,7 @@ struct afs_statistics {
 	int64_t num_played_sum;
 	/** Sum of last played times over all admissible files. */
 	int64_t last_played_sum;
-	/** Quadratic deviation of num played time. */
+	/** Quadratic deviation of num played count. */
 	int64_t num_played_qd;
 	/** Quadratic deviation of last played time. */
 	int64_t last_played_qd;
@@ -462,12 +463,13 @@ static int64_t normalized_value(int64_t x, int64_t n, int64_t sum, int64_t qd)
 	return 100 * (n * x - sum) / (int64_t)int_sqrt(n * qd);
 }
 
-static long compute_dynamic_score(struct afs_info *afsi)
+static long compute_score(struct afs_info *afsi, long mood_score)
 {
-	return -normalized_value(afsi->num_played, statistics.num,
-			statistics.num_played_sum, statistics.num_played_qd)
-		- normalized_value(afsi->last_played, statistics.num,
-			statistics.last_played_sum, statistics.last_played_qd);
+	mood_score -= normalized_value(afsi->num_played, statistics.num,
+		statistics.num_played_sum, statistics.num_played_qd);
+	mood_score -= normalized_value(afsi->last_played, statistics.num,
+		statistics.last_played_sum, statistics.last_played_qd);
+	return mood_score / 3;
 }
 
 static int add_afs_statistics(const struct osl_row *row)
@@ -533,16 +535,16 @@ static int del_afs_statistics(const struct osl_row *row)
 /**
  * Structure used during mood_open().
  *
- * At mood open time, we look at each file in the audio file table in order to
- * determine whether it is admissible. If a file happens to be admissible, its
- * mood score is computed by calling each relevant mood_score_function. Next,
- * we update the afs_statistics and add a struct admissible_file_info to a
- * temporary array.
+ * At mood open time we determine the set of admissible files for the given
+ * mood. The mood score of each admissible file is computed by adding up all
+ * mood item scores. Next, we update the afs statistics and append a struct
+ * admissible_file_info to a temporary array.
  *
- * If all files have been processed that way, the final score of each
+ * When all files have been processed in this way, the final score of each
  * admissible file is computed by adding the dynamic score (which depends on
- * the afs_statistics) to the mood score.  Finally, all audio files in the
- * array are added to the score table and the admissible array is freed.
+ * the afs_statistics and the current time) to the mood score. Finally, all
+ * audio files in the temporary array are added to the score table and the
+ * array is freed.
  *
  * \sa mood_method, admissible_array.
  */
@@ -665,7 +667,7 @@ static int add_to_score_table(const struct osl_row *aft_row, long mood_score)
 
 	if (ret < 0)
 		return ret;
-	score = (compute_dynamic_score(&afsi) + mood_score) / 3;
+	score = compute_score(&afsi, mood_score);
 	return score_add(aft_row, score);
 }
 
@@ -746,8 +748,7 @@ static int mood_update_audio_file(const struct osl_row *aft_row,
 		if (ret < 0)
 			return ret;
 	}
-	score += compute_dynamic_score(&afsi);
-	score /= 3;
+	score = compute_score(&afsi, score);
 	PARA_DEBUG_LOG("score: %li\n", score);
 	percent = (score + 100) / 3;
 	if (percent > 100)
@@ -838,7 +839,7 @@ int change_current_mood(char *mood_name)
 	if (ret < 0)
 		return ret;
 	log_statistics();
-	PARA_INFO_LOG("%d admissible files \n", statistics.num);
+	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);