diff --git a/.DS_Store b/.DS_Store index fe13f73..471757c 100644 Binary files a/.DS_Store and b/.DS_Store differ 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 42df94f..70e9874 100644 Binary files a/app/src/flask-server/modele/__pycache__/modele.cpython-39.pyc and b/app/src/flask-server/modele/__pycache__/modele.cpython-39.pyc differ 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__":