WT 1.1.20(4) Training plan improvements

This commit is contained in:
bossanyit
2021-07-05 22:10:32 +02:00
parent 211307e63e
commit 48a0c3f7de
52 changed files with 2086 additions and 1229 deletions
+14 -2
View File
@@ -154,7 +154,7 @@ mixin Common {
double rmWendler = weight * repeat * 0.0333 + weight;
double rmOconner = weight * (1 + repeat / 40);
//print("Weight: $weight repeat: $repeat, $rmWendler, Oconner: $rmOconner");
print("Weight: $weight repeat: $repeat, $rmWendler, Oconner: $rmOconner");
double average = (rmWendler + rmOconner) / 2;
return average;
@@ -200,7 +200,19 @@ mixin Common {
final double repeatWendler = (rmWendler - weight) / 0.0333 / weight;
final double repeatOconner = (rmOconner / weight - 1) * 40;
final newRepeat = ((repeatOconner + repeatWendler) / 2).ceil();
//print("Initial 1RM: $initialRM Weight: $weight repeatWendler: $repeatWendler repeat Oconner: $repeatOconner. NEW REPEAT: $newRepeat");
print("Initial 1RM: $initialRM Weight: $weight repeatWendler: $repeatWendler repeat Oconner: $repeatOconner. NEW REPEAT: $newRepeat");
return newRepeat;
}
static int reCalculateRepeatsByChangedWeight(double weight, double repeat, double changedWeight) {
final double rmWendler = weight * repeat * 0.0333 + weight;
final double rmOconner = weight * (1 + repeat / 40);
final double repeatWendler = (rmWendler - changedWeight) / 0.0333 / changedWeight;
final double repeatOconner = (rmOconner / changedWeight - 1) * 40;
final newRepeat = ((repeatOconner + repeatWendler) / 2).ceil();
print(
"Weight: $weight changedWeight: $changedWeight repeatWendler: $repeatWendler repeat Oconner: $repeatOconner. NEW REPEAT: $newRepeat");
return newRepeat;
}
+7 -1
View File
@@ -22,6 +22,7 @@ enum TrackingEvent {
purchase_request,
purchase_successful,
exercise_new,
exercise_new_no_registration,
exercise_new_paralell,
result,
exercise_log,
@@ -50,7 +51,12 @@ enum TrackingEvent {
tutorial_activate,
terms_of_use,
data_privacy,
faq
faq,
training_plan_open,
training_plan_start,
training_plan_execute,
training_plan_finished,
training_plan_custom,
}
T enumFromString<T>(Iterable<T> values, String value) {