From 30ff3a0c3c754f462d70268a51dfc8436e0a80a6 Mon Sep 17 00:00:00 2001 From: Enzo Date: Wed, 13 Dec 2023 13:57:52 +0100 Subject: [PATCH] =?UTF-8?q?modif=20pr=C3=A9diction=20for=20json=20incoming?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/modele/user.dart | 23 ++++++++++------------- lib/view/home/prediction_view.dart | 3 +-- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/lib/modele/user.dart b/lib/modele/user.dart index 0cb1e5a..09cd896 100644 --- a/lib/modele/user.dart +++ b/lib/modele/user.dart @@ -101,24 +101,21 @@ class User extends ChangeNotifier { if (!result.item1) return Tuple2(false, ActivityInfo()); - // Appel pour avoir le model - //String jsonString = - // '{"coef": [270.63861280635473, 74.69699263779908, 1.9946527172333637, 0.03215810401413792, 0.3256805192289063], "intercept": [-335635.9890148213, -91874.0527070619, -2065.450392327813, -38.79838022998388, -291.590235396687]}'; Map jsonMap = json.decode(result.item2); // Transformer la date int dateMilli = date.millisecondsSinceEpoch; ActivityInfo activityInfo = ActivityInfo(); - activityInfo.distance = - jsonMap["coef"][0] * dateMilli + jsonMap["intercept"][0]; - activityInfo.timeOfActivity = - jsonMap["coef"][1] * dateMilli + jsonMap["intercept"][1]; - activityInfo.denivelePositif = - jsonMap["coef"][2] * dateMilli + jsonMap["intercept"][2]; - activityInfo.vitesseAvg = - jsonMap["coef"][3] * dateMilli + jsonMap["intercept"][3]; - activityInfo.bpmAvg = - jsonMap["coef"][4] * dateMilli + jsonMap["intercept"][4]; + activityInfo.distance = jsonMap["model"]["coef"][0] * dateMilli + + jsonMap["model"]["intercept"][0]; + activityInfo.timeOfActivity = jsonMap["model"]["coef"][1] * dateMilli + + jsonMap["model"]["intercept"][1]; + activityInfo.denivelePositif = jsonMap["model"]["coef"][2] * dateMilli + + jsonMap["model"]["intercept"][2]; + activityInfo.vitesseAvg = jsonMap["model"]["coef"][3] * dateMilli + + jsonMap["model"]["intercept"][3]; + activityInfo.bpmAvg = jsonMap["model"]["coef"][4] * dateMilli + + jsonMap["model"]["intercept"][4]; return Tuple2(true, activityInfo); } diff --git a/lib/view/home/prediction_view.dart b/lib/view/home/prediction_view.dart index 0e08d55..60a8ef5 100644 --- a/lib/view/home/prediction_view.dart +++ b/lib/view/home/prediction_view.dart @@ -54,8 +54,7 @@ class _PredictionState extends State { /* if (selectedCategory != _managerFile.marche || selectedCategory != _managerFile.velo) return;*/ - - print("Start"); + Tuple2 resultat = await Provider.of(context, listen: false) .predictActivity(DateTime.now(), selectedCategory, tmp);