X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=d15e011f04c720cef376b73752d9fcba51c61f00;hp=e5e8495369f1e7ffffe36bd463ec5aadf6163e39;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=aac4fd33c39e979bc3f86632507e4ee2846d219a

diff --git a/mood.c b/mood.c
index e5e84953..d15e011f 100644
--- a/mood.c
+++ b/mood.c
@@ -455,19 +455,6 @@ void mood_check_callback(int fd, __a_unused const struct osl_object *query)
 	free(pb.buf);
 }
 
-#if 0
-static unsigned int_log2(uint64_t x)
-{
-	unsigned res = 0;
-
-	while (x) {
-		x /= 2;
-		res++;
-	}
-	return res;
-}
-#endif
-
 static int64_t normalized_value(int64_t x, int64_t n, int64_t sum, int64_t qd)
 {
 	if (!n || !qd)
@@ -475,31 +462,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_num_played_score(struct afs_info *afsi)
+static long compute_score(struct afs_info *afsi, long mood_score)
 {
-	return -normalized_value(afsi->num_played, statistics.num,
+	mood_score -= normalized_value(afsi->num_played, statistics.num,
 		statistics.num_played_sum, statistics.num_played_qd);
-}
-
-static long compute_last_played_score(struct afs_info *afsi)
-{
-	return -normalized_value(afsi->last_played, statistics.num,
+	mood_score -= normalized_value(afsi->last_played, statistics.num,
 		statistics.last_played_sum, statistics.last_played_qd);
-}
-
-static long compute_dynamic_score(const struct osl_row *aft_row)
-{
-	struct afs_info afsi;
-	int64_t score, nscore = 0, lscore = 0;
-	int ret;
-
-	ret = get_afsi_of_row(aft_row, &afsi);
-	if (ret < 0)
-		return -100;
-	nscore = compute_num_played_score(&afsi);
-	lscore = compute_last_played_score(&afsi);
-	score = nscore + lscore;
-	return score;
+	return mood_score / 3;
 }
 
 static int add_afs_statistics(const struct osl_row *row)
@@ -691,7 +660,13 @@ static int update_afs_statistics(struct afs_info *old_afsi, struct afs_info *new
 
 static int add_to_score_table(const struct osl_row *aft_row, long mood_score)
 {
-	long score = (compute_dynamic_score(aft_row) + mood_score) / 3;
+	long score;
+	struct afs_info afsi;
+	int ret = get_afsi_of_row(aft_row, &afsi);
+
+	if (ret < 0)
+		return ret;
+	score = compute_score(&afsi, mood_score);
 	return score_add(aft_row, score);
 }
 
@@ -772,9 +747,7 @@ static int mood_update_audio_file(const struct osl_row *aft_row,
 		if (ret < 0)
 			return ret;
 	}
-	score += compute_num_played_score(&afsi);
-	score += compute_last_played_score(&afsi);
-	score /= 3;
+	score = compute_score(&afsi, score);
 	PARA_DEBUG_LOG("score: %li\n", score);
 	percent = (score + 100) / 3;
 	if (percent > 100)