From 2e718f67c8117272a5a3c730fdc668b35aab3212 Mon Sep 17 00:00:00 2001
From: Enzo <enzo.jolys@gmail.com>
Date: Tue, 19 Dec 2023 10:16:37 +0100
Subject: [PATCH] ajout de vitesse et distance

---
 __pycache__/fonction.cpython-312.pyc | Bin 3056 -> 3389 bytes
 fonction.py                          |   8 +++++++-
 testFinal.py                         |   4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/__pycache__/fonction.cpython-312.pyc b/__pycache__/fonction.cpython-312.pyc
index d2f50f87543ab3af5c4bf60e0e8c33178ab1e533..b8afca221e4c4dc79f8f2fc1c8aa3343b321b966 100644
GIT binary patch
delta 1422
zcmah|O>7%Q6rT0Y%&z}7F}CBxHtM!&6--T`Ezr=0wgHz$q%8;fBdS7Wd8e+8v$ke8
z6+vsoNIj$oRKXw-q#*f<BK5)zL62PEkSG;ht%@j8FNI4=azd(LW}PKgRn#ZFd2iml
z_q{i7-mGPQ$Z9{u;}O8=;d>vEo9buUcRRlb0q`ZLg0{pt#98JHIU@&@z`MTz(8lbB
zvMq@XX@o~ENg|$G6&rmXO0frM=nXsEvjN~JMyTH_@Rooh*OkC)OWM&ucNEr=hUXmk
zBsT;8PXhGBNc8wfJ028KpVI<$OY%Em5ojn&yjOzSYTu33dZK6TUzavFhWa7u>si<d
zJ+4S69Q0{U0-yX2ft?J%>Zw56l8)ra4s?(aUW7ql8{3({BS_wkIFY)j{1LKqfuWuc
zv`xuA4QYF~J!0frBVt5@+dDYW_^U?V289^=Ii#l}S86t~EHZJW>ZwM}vdd<Lus=hi
zlhBi2YfXFF>Dn}T>(WHUu5s5{PdVEQ@YK?#_x*o3-4_E^7^IjB4>g))!}3sz)=Zln
zl`lw9_O*O4A1hN@o(%xv{w_dazsRp(F;}|IlF&S{o2x2kYm6gzz}<mFXVOh)I;Y%h
zei>%mWV&<0O$~KU-W?qN3ux%&d3Z0LxPJcH`31Oe_N&-xd{@V~gQN4MtM9Y#;hq;<
z{M2ncvVunzcXeU+!iv6cHM{>7e$mCr+c>*|vx_fvQ{DQ?_PwjQeYfy__6K}@^l1*f
zp@W!qef-+EJCJd+&$%hxP49RRMk9C~pqSDrZD{NiI*=>yYAc)njH>{MUdWu+H&_?_
zI@I@T{u=-Zur}8BU=Pu<StXv_Af|^ZO>*fX6*J^Tcn1lskd}Rsit#EST3|oo=XX3S
zP7_sP5?Z#&n^x02*)&Ll9^m#OXKRLKl!kT(hUa%)opPfCohe%U_G9IkRPup5NIt09
z{(BWdbWEVBlvu5%X%S2O7+t4+j)5w%&sc<>tJ#-JWxGs|^20Hf4o^r$b}qau9c0f$
zs%H)f1lVd?Hhq<=ehzw=YX#_|_a*~hCS`+AdW0WXkS{u?UY@u`Oheq`baSFrqsRE+
z5q2+foM$OU3-5>@;URNox;0D1{QG!RKv0pIih1!b@5#IbzepeB8$d-n{2YI)<I_!J
xra=zVDQ**QWgTKSqWRJ7QetgVQl-J=d~qFcxi*ZX+=9$sSjw$ySc>{6{{p`qA}Ig>

delta 978
zcmZuv%TE(Q7@ygleX!lOAcaC(BL%Bz;sc@rHmD&&NHo!dqOtLj+FeUG^x^D6fNTv1
z50V&>%mFmqJQ;3!F(igRKo2BdnoTquypVVR%fS$%&MYi&@JqhOeBU>}?=kZ+vJnn^
z^7|D)>FMt$`Uhz)upIjX0hk9lP=S;=%DfE*z`fT1RM6ayBj=C?Tj_-*n#QOi*w7Gm
z?1R#hypt_x9C-=DasIz~b^Ceb1#D3*pXV@C5|<j|f`(W@O<3Y~A{FrfxM&1Pnu|7y
zQ?!Y_rX-s)1a><rc|Hi9FCt(y?4ciG@gZpQnzYDySrue8c^ON)Mn$$|BkXziwZ+<U
z$%rtl^d5?F*o*9IP1fqX32fw95ZLk!kW{WY$S_MqM|@Z=^pEG9fR!)k*B|v~t^9c2
znk4i5ambMszNuyXFQs+1{bUe}R5`+EDWjQ0M0a5w$)XflM!krwmHa|Q-%)DFl+8^*
z9t)w^T7An;;1jx^q3`~N+4M|$0WI8mrGD`zrZw_TI7RBk%keNx*opu(FxxlNR}F@%
zk&~MO-zwGsuS(McTMC&Hd!p?WHoN-|s0jdTho@ZoMm~#Q$%@nl1+pfELP6?ulzh?B
zaaJ!|50V0ICw}=f>>wB9u+mAx3Cd=X+?PkCsxLTw6(`<T<w4l&2xUw!I!K?$TkgO~
z4tJ3*r77CMP=h($8a8!&J8z8)WULHMQEw;7DE%-&-YBc^46%H<;j=6kl}o0DyQztL
znCPV<iEtOQ-BpSsdPdVRK2JR+qN0rwcI)^}y{KKGZ*;TNU(Vx8G}uEr)gfACLQUQY
z(X%5I#|q_1%>IgthZzKBr7?R3%;t1>+Jf7pi}4m<Ho044Tkb2Aw6RhBA|9kZwplYp
jw$<3N2yEC$Nw9u3cA^HT-e?wJbb+q{s%ild`dpBI87Id!

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")