X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=0d11ea13cdd0fe5f59ff23cf5e989972f5580e28;hp=996b71fac99257758e2a5d8cad9d6c018cf1ba06;hb=a8509af9116e9a045ace70ff312e40569c5ace16;hpb=cb6d1dfb9e4067229a4bbde0abd05784d97ef14b diff --git a/mood.c b/mood.c index 996b71fa..0d11ea13 100644 --- a/mood.c +++ b/mood.c @@ -273,10 +273,8 @@ static int compute_mood_score(const void *row, long *result) /* reject if there is no matching entry in the accept list */ if (!match && !list_empty(¤t_mood->accept_list)) return -E_NOT_ADMISSIBLE; - list_for_each_entry(item, ¤t_mood->score_list, mood_item_node) { - PARA_INFO_LOG("random: %d\n", para_random(100)); + list_for_each_entry(item, ¤t_mood->score_list, mood_item_node) add_item_score(row, item, &score, &score_arg_sum); - } if (score_arg_sum) score /= score_arg_sum; *result = score; @@ -842,13 +840,13 @@ int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_a score += compute_num_played_score(&afsi); score += compute_last_played_score(&afsi); score /= 3; - PARA_NOTICE_LOG("score: %li\n", score); + PARA_DEBUG_LOG("score: %li\n", score); percent = (score + 100) / 3; if (percent > 100) percent = 100; else if (percent < 0) percent = 0; - PARA_NOTICE_LOG("re-inserting at %lu%%\n", percent); + PARA_DEBUG_LOG("re-inserting at %lu%%\n", percent); return score_update(aft_row, percent); } @@ -860,10 +858,12 @@ static void log_statistics(void) PARA_NOTICE_LOG("no admissible files\n"); return; } - PARA_NOTICE_LOG("last_played mean: %lli, last_played sigma: %lli\n", - statistics.last_played_sum / n, int_sqrt(statistics.last_played_qd / n)); - PARA_NOTICE_LOG("num_played mean: %lli, num_played sigma: %lli\n", - statistics.num_played_sum / n, int_sqrt(statistics.num_played_qd / n)); + PARA_NOTICE_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_NOTICE_LOG("num_played mean: %lli, num_played sigma: %llu\n", + (long long int)statistics.num_played_sum / n, + (long long unsigned)int_sqrt(statistics.num_played_qd / n)); } /**