Self hosted FLOSS fitness/workout, nutrition and weight tracker
Refactor and simplify the intensity calculations and add some tests
Roland Geider2451480fbc79
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex 9c89050a4..a99e52be1 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -39,6 +39,7 @@ from django.utils.translation import gettext_lazy as _from wger.exercises.models import Exercisefrom wger.manager.dataclasses import (GroupedLogData,+ LogData,RoutineLogData,WorkoutDayData,)@@ -416,89 +417,25 @@ class Routine(models.Model):def safe_divide(numerator, denominator):return numerator / denominator if denominator != 0 else numerator- def calculate_average_intensity(result: GroupedLogData, counters: GroupedLogData) -> None:- result.mesocycle.total = safe_divide(- result.mesocycle.total,- counters.mesocycle.total,- )-- for key in result.daily.keys():- result.daily[key].total = safe_divide(- result.daily[key].total,- counters.daily[key].total,- )- result.daily[key].upper_body = safe_divide(- result.daily[key].upper_body,- counters.daily[key].upper_body,- )- result.daily[key].lower_body = safe_divide(- result.daily[key].lower_body,- counters.daily[key].lower_body,- )-- for j in result.daily[key].muscle.keys():- result.daily[key].muscle[j] = safe_divide(- result.daily[key].muscle[j],- counters.daily[key].muscle[j],- )-- for j in result.daily[key].exercises.keys():- result.daily[key].exercises[j] = safe_divide(- result.daily[key].exercises[j],- counters.daily[key].exercises[j],- )-- for key in result.weekly.keys():- result.weekly[key].total = safe_divide(- result.weekly[key].total,- counters.weekly[key].total,- )- result.weekly[key].upper_body = safe_divide(- result.weekly[key].upper_body,- counters.weekly[key].upper_body,- )- result.weekly[key].lower_body = safe_divide(- result.weekly[key].lower_body,- counters.weekly[key].lower_body,- )-- for j in result.weekly[key].muscle.keys():- result.weekly[key].muscle[j] = safe_divide(- result.weekly[key].muscle[j],- counters.weekly[key].muscle[j],- )+ def avg_log_data(data: LogData, count: LogData) -> None:+ data.total = safe_divide(data.total, count.total)+ data.upper_body = safe_divide(data.upper_body, count.upper_body)+ data.lower_body = safe_divide(data.lower_body, count.lower_body)+ for k in data.muscle:+ data.muscle[k] = safe_divide(data.muscle[k], count.muscle[k])+ for k in data.exercises:+ data.exercises[k] = safe_divide(data.exercises[k], count.exercises[k])- for j in result.weekly[key].exercises.keys():- result.weekly[key].exercises[j] = safe_divide(- result.weekly[key].exercises[j],- counters.weekly[key].exercises[j],- )-- for key in result.iteration.keys():- result.iteration[key].total = safe_divide(- result.iteration[key].total,- counters.iteration[key].total,- )- result.iteration[key].upper_body = safe_divide(- result.iteration[key].upper_body,- counters.iteration[key].upper_body,- )- result.iteration[key].lower_body = safe_divide(- result.iteration[key].lower_body,- counters.iteration[key].lower_body,- )-- for j in result.iteration[key].muscle.keys():- result.iteration[key].muscle[j] = safe_divide(- result.iteration[key].muscle[j],- counters.iteration[key].muscle[j],- )-- for j in result.iteration[key].exercises.keys():- result.iteration[key].exercises[j] = safe_divide(- result.iteration[key].exercises[j],- counters.iteration[key].exercises[j],- )+ def calculate_average_intensity(result: GroupedLogData, counters: GroupedLogData) -> None:+ avg_log_data(result.mesocycle, counters.mesocycle)++ for res_group, cnt_group in (+ (result.daily, counters.daily),+ (result.weekly, counters.weekly),+ (result.iteration, counters.iteration),+ ):+ for key in res_group:+ avg_log_data(res_group[key], cnt_group[key])# Iterate over each workout session associated with the routinefor session in self.sessions.all():diff --git a/wger/manager/tests/test_routine_statistics.py b/wger/manager/tests/test_routine_statistics.pyindex 9afc57580..9e3080d97 100644--- a/wger/manager/tests/test_routine_statistics.py+++ b/wger/manager/tests/test_routine_statistics.py@@ -300,6 +300,49 @@ class RoutineStatisticsTestCase(WgerTestCase):),)+ def test_intensity_calculations(self):+ """Test that intensity (Brzycki) is correctly averaged across all grouping levels"""+ stats = self.routine.calculate_log_statistics()++ # Pre-calculated Brzycki intensities:+ # Log 1: 10kg x 5 reps → intensity ≈ 0.8888+ # Log 2: 10kg x 1 rep → intensity ≈ 1.0+ # Log 3: 10kg x 1 rep → intensity ≈ 1.0+ # (Log 4 is in lb and filtered out)++ # Mesocycle: average of 3 logs+ self.assertAlmostEqual(float(stats.intensity.mesocycle.total), 0.9629, places=3)++ # Daily (each day has 1 log, so average = the single value)+ self.assertAlmostEqual(+ float(stats.intensity.daily[datetime.date(2024, 2, 1)].total), 0.8888, places=3+ )+ self.assertAlmostEqual(+ float(stats.intensity.daily[datetime.date(2024, 2, 2)].total), 1.0, places=3+ )+ self.assertAlmostEqual(+ float(stats.intensity.daily[datetime.date(2024, 2, 10)].total), 1.0, places=3+ )++ # Weekly: week 5 has 2 logs (avg of 0.8888 and 1.0), week 6 has 1 log+ self.assertAlmostEqual(float(stats.intensity.weekly[5].total), 0.9444, places=3)+ self.assertAlmostEqual(float(stats.intensity.weekly[6].total), 1.0, places=3)++ # Iteration+ self.assertAlmostEqual(float(stats.intensity.iteration[1].total), 0.8888, places=3)+ self.assertAlmostEqual(float(stats.intensity.iteration[2].total), 1.0, places=3)+ self.assertAlmostEqual(float(stats.intensity.iteration[3].total), 1.0, places=3)++ # Muscle-level intensity averages+ # Muscle 1: 3 logs (i1 + i2 + i3), muscle 2: 2 logs (i1 + i2, only exercise 1)+ self.assertAlmostEqual(float(stats.intensity.mesocycle.muscle[1]), 0.9629, places=3)+ self.assertAlmostEqual(float(stats.intensity.mesocycle.muscle[2]), 0.9444, places=3)++ # Exercise-level intensity averages+ # Exercise 1: 2 logs (i1 + i2), exercise 3: 1 log (i3)+ self.assertAlmostEqual(float(stats.intensity.mesocycle.exercises[1]), 0.9444, places=3)+ self.assertAlmostEqual(float(stats.intensity.mesocycle.exercises[3]), 1.0, places=3)+def test_handle_null_weight(self):WorkoutLog(user_id=1,