From 599a4ce2522a188d4b8400ec8fa6e167037375a8 Mon Sep 17 00:00:00 2001 From: LukaszChrostowski Date: Fri, 5 Jan 2024 22:00:31 +0100 Subject: [PATCH] =?UTF-8?q?Praca=20nad=20integracj=C4=85=20backendu=20z=20?= =?UTF-8?q?frontendem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 8196 -> 8196 bytes app/package.json | 2 +- app/src/components/Hero.jsx | 18 ++++++----- .../modele/__pycache__/modele.cpython-39.pyc | Bin 817 -> 959 bytes app/src/flask-server/modele/modele.py | 5 +++ app/src/flask-server/server.py | 29 ++++++++++-------- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.DS_Store b/.DS_Store index fe13f732f99701c649b4849676d8df95bcbb8a9e..471757c8538ea6662d7215966888395f09d64d9a 100644 GIT binary patch delta 23 ecmZp1XmQwZLxj!PKu5vIeDXy>hs|=L&$s|!mIuxN delta 16 XcmZp1XmQwZLuB$^0k_R^qR+ShJPQV) diff --git a/app/package.json b/app/package.json index 3f606a2..d9e8e00 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "react_bs_web", "private": true, - "proxy": "http://localhost:5173", + "proxy": "http://127.0.0.1:5000/", "version": "0.0.0", "type": "module", "scripts": { diff --git a/app/src/components/Hero.jsx b/app/src/components/Hero.jsx index 1912757..52997f7 100644 --- a/app/src/components/Hero.jsx +++ b/app/src/components/Hero.jsx @@ -10,7 +10,7 @@ const Hero = () => { const toggleDropdown = () => setIsOpen(!isOpen); const handleMinuteChange = (e) => setGameMinute(e.target.value); - const [data,setData] = useState([{}]) + const [data, setData] = useState(""); //zmienne globalne //zmienna mówiąca który przycisk jest aktywny, jest ona wykorzystywana //przez listener nanoszący zawodników na boisko. 1 - strzelec , 2 - bramkarz , 3 - obronca, 4 - napasnik. zmienna przez aktywacje przycskówk bb1, bb2, bb3 i bb4 @@ -107,10 +107,10 @@ const Hero = () => { var pName = "Bramkarz" var pColor = "#03e7fc" }else if(possition == 2){ - var pName = "Napastnik" + var pName = "Obrońca" var pColor = "#0324fc" }else if (possition ==3){ - var pName = "Obrońca" + var pName = "Napastnik" var pColor = "#fc6703" } var player = document.createElement('div'); @@ -201,13 +201,11 @@ const Hero = () => { }) } - - - // Wyłanie zapytania do serwera + // // Wyłanie zapytania do serwera function sentQuestion() { var ball = document.querySelector('.football'); if (ball) { - fetch("http://localhost:5173/LRegresion" + shooterX + "&" + shooterY).then( + fetch("http://127.0.0.1:5000/get_model").then( res=> res.json() ).then( data => { @@ -222,6 +220,10 @@ const Hero = () => { } } + + + + /* Funkcja dodająca listener do boiska*/ function boiskoListener(ev){ ev.preventDefault() @@ -408,7 +410,7 @@ const Hero = () => {
- +
diff --git a/app/src/flask-server/modele/__pycache__/modele.cpython-39.pyc b/app/src/flask-server/modele/__pycache__/modele.cpython-39.pyc index 42df94f8582bf1b6c508a74a981fe67ab445913e..70e987484f0594367d788ce8fa68e684d78bdb7c 100644 GIT binary patch delta 333 zcmdnUwx69hk(ZZ?0SNqaXQVEg$ScceGErMcm@S39g&~SPg(;Xplj9{we&xobct$oB zAghRZ@^MBRHZ~BGeKH@DtTZ2p$pIv8vF7Hdq~=7iM#Sf(mak+e5})kIG`U_9D3uJv zaKH#;F#)kN5Et_Ri4uks#%9J^h7<;%g-m``d==?Q`T4~qdRh5NIhjdCAjO)DMPfjz zNE}W`09m(0p-STmic(WDlS_bfeo~?!P^uWDi-D;qMG8o1azwE~4Pyp!qu2@(^HLIv yi$Dr*vE(L}WE6ot2Xbo>NCT2RU>m`fao7MoSelb+2l7EN$jdy89E?279NYk1i9!kh delta 190 zcmdnbzLAYLk(ZZ?0SHRx^`wSP2*s}7Iax#;O zm_RDo3KH{D5{rujfSg+_xrrqiMPS20YKufs2{Diw4jZ7^r8%i~j6hy7$YLHw4n`hk E0Q_SnEC2ui diff --git a/app/src/flask-server/modele/modele.py b/app/src/flask-server/modele/modele.py index 65fad96..60891f6 100644 --- a/app/src/flask-server/modele/modele.py +++ b/app/src/flask-server/modele/modele.py @@ -13,3 +13,8 @@ def LogisticRegression_predict_proba(position_x, position_y, angle, match_minute return model.predict_proba(X_new)[0][1].round(2) #kolejne modele + +def xgboost_predict_proba(): + + model = load('xgboost.joblib') + diff --git a/app/src/flask-server/server.py b/app/src/flask-server/server.py index a19df12..c3336e2 100644 --- a/app/src/flask-server/server.py +++ b/app/src/flask-server/server.py @@ -5,32 +5,35 @@ from modele.modele import LogisticRegression_predict_proba app = Flask(__name__) CORS(app) +app.config['CORS_HEADERS'] = 'Content-Type' # model Api -@app.route("/members") -def members(): - return{"members":["Member1","Member2","Member3"]} +# @app.route("/members") +# def members(): +# return{"members":["Member1","Member2","Member3"]} # zapytanie o regresje logistyczną na podstawie pozycji piłki -@app.route("/LRegresion&") -def LRegresion(x,y): +# @app.route("/LRegresion&") +@app.route("/get_model") +def get_model(): - x = int(x[0:2]) - y = int(y[0:2]) + #x = int(x[0:2]) + #y = int(y[0:2]) - response = LogisticRegression_predict_proba(position_x=x, - position_y=y, + response = LogisticRegression_predict_proba(position_x=5, + position_y=5, angle = 13.67, match_minute=13, Number_Intervening_Opponents=3, Number_Intervening_Teammates=0, isFoot=1, isHead=0) - print(x) - print(y) - print(response) - return {"response":[str(response)]} + #print(x) + #print(y) + #print(response) + res = str(response) + return {"response":res} # uruchomienie serwera if __name__ == "__main__":