mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-08 09:46:55 +02:00
Code Issues Releases Wiki Activity

update body metrics dates and author

Browse Source
This commit is contained in:
OliE
2017-11-12 13:50:41 +01:00
parent fc6c8138cb
commit e54a6a376e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenberg.java
View File

@@ -21,7 +21,7 @@ import com.health.openscale.core.datatypes.ScaleUser;
public class BFDeurenberg extends EstimatedFatMetric { public class BFDeurenberg extends EstimatedFatMetric {
@Override @Override
public String getName() { public String getName() {
return "Deurenberg et. al (1998)"; return "Deurenberg (1992)";
} }
@Override @Override

4
android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFBJoN.java → android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenbergII.java
View File

@@ -18,10 +18,10 @@ package com.health.openscale.core.bodymetric;
import com.health.openscale.core.datatypes.ScaleData; import com.health.openscale.core.datatypes.ScaleData;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;
public class BFBJoN extends EstimatedFatMetric { public class BFDeurenbergII extends EstimatedFatMetric {
@Override @Override
public String getName() { public String getName() {
return "British Journal of Nutrition (1991)"; return "Deurenberg et. al (1991)";
} }
@Override @Override

6
android_app/app/src/main/java/com/health/openscale/core/bodymetric/EstimatedFatMetric.java
View File

@@ -19,14 +19,14 @@ import com.health.openscale.core.datatypes.ScaleData;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;
public abstract class EstimatedFatMetric { public abstract class EstimatedFatMetric {
public enum FORMULA { BF_DEURENBERG, BF_BJoN, BF_EDDY, BF_GALLAGHER, BF_GALLAGHER_ASIAN }; public enum FORMULA { BF_DEURENBERG, BF_DEURENBERG_II, BF_EDDY, BF_GALLAGHER, BF_GALLAGHER_ASIAN };
public static EstimatedFatMetric getEstimatedMetric( FORMULA metric) { public static EstimatedFatMetric getEstimatedMetric( FORMULA metric) {
switch (metric) { switch (metric) {
case BF_DEURENBERG: case BF_DEURENBERG:
return new BFDeurenberg(); return new BFDeurenberg();
case BF_BJoN: case BF_DEURENBERG_II:
return new BFBJoN(); return new BFDeurenbergII();
case BF_EDDY: case BF_EDDY:
return new BFEddy(); return new BFEddy();
case BF_GALLAGHER: case BF_GALLAGHER:

2
android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWBehnke.java
View File

@@ -21,7 +21,7 @@ import com.health.openscale.core.datatypes.ScaleUser;
public class TBWBehnke extends EstimatedWaterMetric { public class TBWBehnke extends EstimatedWaterMetric {
@Override @Override
public String getName() { public String getName() {
return "Behnke et. al (1963)"; return "Behnke (1963)";
} }
@Override @Override

2
android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWLeeSongKim.java
View File

@@ -21,7 +21,7 @@ import com.health.openscale.core.datatypes.ScaleUser;
public class TBWLeeSongKim extends EstimatedWaterMetric { public class TBWLeeSongKim extends EstimatedWaterMetric {
@Override @Override
public String getName() { public String getName() {
return "Lee, Song, Kim, Lee et. al (1999)"; return "Lee, Song, Kim, Lee et. al (2001)";
} }
@Override @Override