diff --git a/__pycache__/fonction.cpython-312.pyc b/__pycache__/fonction.cpython-312.pyc index d2f50f8..b8afca2 100644 Binary files a/__pycache__/fonction.cpython-312.pyc and b/__pycache__/fonction.cpython-312.pyc differ diff --git a/fonction.py b/fonction.py index 996dbed..f6ee348 100644 --- a/fonction.py +++ b/fonction.py @@ -10,6 +10,8 @@ def generateModele(dataJson): arrayBpm = [] arrayStartTime = [] arrayTimeOfActivity = [] + arrayVitesse = [] + arrayDistance = [] for data in dataJson: @@ -17,6 +19,8 @@ def generateModele(dataJson): arrayBpm.append(int(info["bpmAvg"])) arrayTimeOfActivity.append(float(info["timeOfActivity"])) + arrayVitesse.append(float(info["vitesseAvg"])) + arrayDistance.append(float(info["distance"])) # Convertir la chaîne en objet datetime dt_object = datetime.strptime(info["startTime"], "%Y-%m-%dT%H:%M:%S.%f") @@ -26,7 +30,9 @@ def generateModele(dataJson): # -- DataFrame data = pd.DataFrame({ "Bpm": arrayBpm, - "TimeOfActivity": arrayTimeOfActivity + "TimeOfActivity": arrayTimeOfActivity, + "Vitesse" : arrayVitesse, + "Distance" : arrayDistance }) # -- Régression linéaire model = LinearRegression() diff --git a/testFinal.py b/testFinal.py index d8b5658..2d535fc 100755 --- a/testFinal.py +++ b/testFinal.py @@ -5,7 +5,6 @@ import pandas as pd import numpy as np import logging import json -from datetime import datetime from fonction import getUserWithData,generateJsonModel,generateModele,sendJsonToApi @@ -53,7 +52,8 @@ for user in dataUser: jsonTmp["uuid"] = userUUID jsonTmp["category"] = category["name"] jsonTmp["model"] = json.dumps(generateJsonModel(model)) - + print(json.dumps(generateJsonModel(model))) + sendJsonToApi(urlGetAllData,json.dumps(jsonTmp)) i+=1 logging.error("User nb "+str(i)+" finis")