From 63bdfd94a1fa4820ba4188b62f62948176ac1e69 Mon Sep 17 00:00:00 2001 From: Kilian Scheidecker Date: Wed, 29 May 2024 22:57:11 +0200 Subject: [PATCH] cleaned up folders and defined proper structs --- backend/Pipfile | 1 + backend/Pipfile.lock | 3 +- backend/app/__init__.py | 0 .../app/__pycache__/__init__.cpython-310.pyc | Bin 199 -> 0 bytes backend/app/__pycache__/main.cpython-310.pyc | Bin 980 -> 0 bytes backend/app/dependencies.py | 1 - backend/app/main.py | 34 -------------- backend/app/src/__init__.py | 0 .../src/__pycache__/__init__.cpython-310.pyc | Bin 203 -> 0 bytes .../src/__pycache__/optimizer.cpython-310.pyc | Bin 6107 -> 0 bytes backend/{app => }/src/landmarks_manager.py | 4 +- backend/src/main.py | 42 ++++++++++++++++++ backend/{app => }/src/main_example.py | 0 backend/{app => }/src/optimizer.py | 0 backend/src/structs/landmarks.py | 24 ++++++++++ backend/src/structs/landmarktype.py | 4 ++ backend/src/structs/preferences.py | 28 ++++++++++++ 17 files changed, 103 insertions(+), 38 deletions(-) delete mode 100644 backend/app/__init__.py delete mode 100644 backend/app/__pycache__/__init__.cpython-310.pyc delete mode 100644 backend/app/__pycache__/main.cpython-310.pyc delete mode 100644 backend/app/dependencies.py delete mode 100644 backend/app/main.py delete mode 100644 backend/app/src/__init__.py delete mode 100644 backend/app/src/__pycache__/__init__.cpython-310.pyc delete mode 100644 backend/app/src/__pycache__/optimizer.cpython-310.pyc rename backend/{app => }/src/landmarks_manager.py (91%) create mode 100644 backend/src/main.py rename backend/{app => }/src/main_example.py (100%) rename backend/{app => }/src/optimizer.py (100%) create mode 100644 backend/src/structs/landmarks.py create mode 100644 backend/src/structs/landmarktype.py create mode 100644 backend/src/structs/preferences.py diff --git a/backend/Pipfile b/backend/Pipfile index f02576b..7ffd4d8 100644 --- a/backend/Pipfile +++ b/backend/Pipfile @@ -8,5 +8,6 @@ numpy = "*" scipy = "*" fastapi = "*" osmpythontools = "*" +pydantic = "*" [dev-packages] diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock index f07cd8e..d41ed09 100644 --- a/backend/Pipfile.lock +++ b/backend/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "15cc819367b908ccf7d61e3f2b45574c248556600dfeaa795e19045d6781fe90" + "sha256": "4293390eadd968364de0b376810eb66c68a4876d24a87987dc61010ad92c5712" }, "pipfile-spec": 6, "requires": {}, @@ -890,6 +890,7 @@ "sha256:71b2945998f9c9b7919a45bde9a50397b289937d215ae141c1d0903ba7149fd7", "sha256:834ab954175f94e6e68258537dc49402c4a5e9d0409b9f1b86b7e934a8372de7" ], + "index": "pypi", "markers": "python_version >= '3.8'", "version": "==2.7.2" }, diff --git a/backend/app/__init__.py b/backend/app/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/backend/app/__pycache__/__init__.cpython-310.pyc b/backend/app/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 678d7d066fb628b94456ab8b9b89e3cd338ff648..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmd1j<>g`kg7aH^(?IlN5P=LBfgA@QE@lA|DGb33nv8xc8Hzx{2;x_kvsFxJacWU< zOm=2YW@3y>esXDUYFN^wkD zVsVLXUTR5seo?k=USe5hdSXdteqKycVsdtBUP?@2K|xG>d}dx|NqoFsLFFwDo80`A Q(wtN~kQ<7bfCLKz08t+`9{>OV diff --git a/backend/app/__pycache__/main.cpython-310.pyc b/backend/app/__pycache__/main.cpython-310.pyc deleted file mode 100644 index cd67059540ba463b9a64189908a944b49246cc02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 980 zcmY+Cy>8nu5XVW0mgTQ}7#X@0P=^i%nq&`(qCtuRL7N~z&_xg+Fe2p=mPCQ1-Nvye z_bEChW1b^#p|z8TzCf4sC^$|`frr!YPWtnXCwsj%g7y0ES^9<`^vAxuTn%{n2wO*B z7-Bd>ISw(lz5~7!I<@a+Zcaji5hn{2HhAOKW8@CA25&Nt`zc{f=KmrK9JY9ywMLG5 z$6E^o-?lI7J?Jb!0S$1~*D{;%Se8cQVoHsW1yDbu1W%0wC zoc@fp;iaA*-jqrdCT84Fk?DEWTF0v1MksNt=4wIt$b)?XTmJ?#M0026+#-V+W)5=~ z?j01qB7`-Vw?Udf{0-6q(%v8)Al(hp1G2S2wx6{O=+Dp$FWkAyc4mm}&fJt-qCx+B z+=LUdhx?K$vwVa#a1;hqn`y_$u?o0IQ=Tmoz^mxe7ChaiDhU`5j1n?0zw@V{?Lg>d zay(IMW;+tLb6FT@zIo<$Y(hVgMIsejXZt|M)=;Iy^Mc*`6IvR;g(CCv)#yKyH zjxJ7uFQ;EmkI#esKwlS0bVf@Z$inI?DVUB@7@Ylrn;%k*_6s@@!+O4=E1HbpOc5L{ z%Bd(0%Ik_)$JV0vz!1NWUp`&8OH>~Ml^@48Gmg&(ov^1>a_}^isxGfCG;CUFS_);G zT)7}rxkGL$7bdkLS5ju{zZEp+aaf$c;9N*o;{;M`7 GkN*L_kNi^r diff --git a/backend/app/dependencies.py b/backend/app/dependencies.py deleted file mode 100644 index 2cb6801..0000000 --- a/backend/app/dependencies.py +++ /dev/null @@ -1 +0,0 @@ -import app.src \ No newline at end of file diff --git a/backend/app/main.py b/backend/app/main.py deleted file mode 100644 index 257d572..0000000 --- a/backend/app/main.py +++ /dev/null @@ -1,34 +0,0 @@ -from .src.optimizer import solve_optimization -from .src.landmarks_manager import Landmark -from fastapi import FastAPI - -app = FastAPI() - - -@app.get("/optimize/{max_steps}/{print_details}") -def main(max_steps: int, print_details: bool): - - # CONSTRAINT TO RESPECT MAX NUMBER OF STEPS - #max_steps = 16 - - - # Initialize all landmarks (+ start and goal). Order matters here - landmarks = [] - landmarks.append(Landmark("départ", -1, (0, 0))) - landmarks.append(Landmark("tour eiffel", 99, (0,2))) # PUT IN JSON - landmarks.append(Landmark("arc de triomphe", 99, (0,4))) - landmarks.append(Landmark("louvre", 99, (0,6))) - landmarks.append(Landmark("montmartre", 99, (0,10))) - landmarks.append(Landmark("concorde", 99, (0,8))) - landmarks.append(Landmark("arrivée", -1, (0, 0))) - - - visiting_order = solve_optimization(landmarks, max_steps, print_details) - - #return visiting_order - - return("max steps :", max_steps, "\n", visiting_order) - - -"""if __name__ == "__main__": - main()""" \ No newline at end of file diff --git a/backend/app/src/__init__.py b/backend/app/src/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/backend/app/src/__pycache__/__init__.cpython-310.pyc b/backend/app/src/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 3c06a0824710e098468b6c39d10d3d27ee83ac35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmYk0u?oU47=%;lAVS|Et3!PN5m9t0+9HVC4<)9lgtmW5{#5BBx%)J(j=q7D>7)nu z9e2~2D4H;@_aiNbd=2W2QF) diff --git a/backend/app/src/__pycache__/optimizer.cpython-310.pyc b/backend/app/src/__pycache__/optimizer.cpython-310.pyc deleted file mode 100644 index e60b82c34deb09c2e891f1f4f1cc3ba6d701d1f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6107 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