From 70cebc0aa19f900cac6bf0bca8cee79fd2e9934a Mon Sep 17 00:00:00 2001
From: Kilian Scheidecker <kilian.scheidecker@orange.fr>
Date: Wed, 22 May 2024 15:12:54 +0200
Subject: [PATCH] fixed return order

---
 backend/app/__pycache__/main.cpython-310.pyc  | Bin 986 -> 980 bytes
 backend/app/main.py                           |   6 +--
 .../src/__pycache__/optimizer.cpython-310.pyc | Bin 6114 -> 6107 bytes
 backend/app/src/optimizer.py                  |  37 ++++++++++--------
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/backend/app/__pycache__/main.cpython-310.pyc b/backend/app/__pycache__/main.cpython-310.pyc
index 21f3cee4583cade7331b40935c4fb79e719f22cd..cd67059540ba463b9a64189908a944b49246cc02 100644
GIT binary patch
delta 66
zcmcb`eubSkpO=@50SIK@`lcyP<lV%mI`M$4Qc7w`VrEWp?JdsS#ESUhlGK9YTf7BD
PnRzAgP^rzVj8~Ze$R8I(

delta 71
zcmcb@ev6$qpO=@50SJD*_D$28$h(PAW8wi>jgtKM<ovwi{G8O<Tb#Lx74gL-sRhNi
S1PY2W^Gf0ovK#+jWdZ<!dK<|A

diff --git a/backend/app/main.py b/backend/app/main.py
index 84b3141..d7e153c 100644
--- a/backend/app/main.py
+++ b/backend/app/main.py
@@ -5,8 +5,8 @@ from fastapi import FastAPI
 app = FastAPI()
 
 
-@app.get("/optimize/{max_steps}/{print_to_console}")
-def main(max_steps: int, print_to_console: bool):
+@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
@@ -23,7 +23,7 @@ def main(max_steps: int, print_to_console: bool):
     landmarks.append(landmark("arrivée", -1, (0, 0)))
 
 
-    visiting_order = solve_optimization(landmarks, max_steps, print_to_console)
+    visiting_order = solve_optimization(landmarks, max_steps, print_details)
 
     #return visiting_order
 
diff --git a/backend/app/src/__pycache__/optimizer.cpython-310.pyc b/backend/app/src/__pycache__/optimizer.cpython-310.pyc
index 55a6337409776ed6c3207b9db525d84153adfb21..e60b82c34deb09c2e891f1f4f1cc3ba6d701d1f9 100644
GIT binary patch
delta 488
zcmZ{gK~EDw6vyYyY<IW2v)d`9r60jIK@JAtKme0+(P)f4)HE7H7%;VfIy-P6Z&Q*z
z5>LwkLi8h$aPh;`n;*bWK#Xtdp<bMq{PN!W=l$Qy{9O65l738*h|#<F_55I|dzTIx
zP%jS}R}+jsgxQg;Vx@o{dn@1YT;>TT2xD#rNPUzW?DI1lpg@nR07Hy4*Ft+=!aSbM
zk98$aG3_(W`pibuiwnqW+Rvr+u~vZg$HIKG64}h7R(Q0>%PV&BAKSSJN*%1Re~q#;
z<T^ZI<~wQ5_|_)6it>i(=&L9Im`yRJRem9Ig^Et9{XMDAI`NARH$XpOnuK9_zqncU
znlGbyue@yTfGVfW2TzAVcCxp(pJnE;n^<>Pc6j3O&|%e~L+I2^*X6GWL-omwj_v69
z{X4yHcSna=`MUL}zDCkiobDb@Av0T4l-I50-Zmvlc%VQDDHcHSRJ1+6qJ#o|-WERh
bfZ}%)c;NIlL=b|!5B-p4Bxw;Z!=>pTJ|}Fx

delta 411
zcmYk1F-yZh6vyx7k~B?|^t4UQDmd7oRuHWeQ4|Xf3Ti<?bSO<b*kbUKIK6-v1V`Z<
z1ocA*;)jWwlY<{Y!3&6Z!w>$vAOCyrt@++`0^2r;eAk~lL$Chq99DpdVdZ`%GO%=7
zOd+v+EwLjVtrUE1M0p&UNKi!$EfH0xJAWS9zTP7L-EdEKl)}fzLM??&a$+4TiJds;
zAdD1#gGJe5uaI*TSoOAkW!o>La0RINMojpttj)iDi5$O(_5<<FCz=9~sEj4Kh@R4<
zjO8xzNtZ+{Us`-r_e~D+D(*^%w!16t+zw2L%$;rX<$Tb{u`Y2`2;+W#5Qcn7rp!F(
zjpIRw^MLcY+*!;~m#8x_Uvmrn;4BQr1F>COaMto!OCqBey|K8hH8xgdVpIhNj9PRO
onBq`RH9>_ud0>J8)|YND%0RjFsIC}bP(%8bbkuKC6EKzi0M12SO8@`>

diff --git a/backend/app/src/optimizer.py b/backend/app/src/optimizer.py
index 4c1b631..2681469 100644
--- a/backend/app/src/optimizer.py
+++ b/backend/app/src/optimizer.py
@@ -261,7 +261,7 @@ def path_length(P: list, resx: list) :
     return np.dot(P, resx)
 
 # Main optimization pipeline
-def solve_optimization (landmarks, max_steps, printing_console) :
+def solve_optimization (landmarks, max_steps, printing_details) :
 
     # SET CONSTRAINTS FOR INEQUALITY
     c, A_ub, b_ub = init_ub_dist(landmarks, max_steps)              # Add the distances from each landmark to the other
@@ -283,15 +283,7 @@ def solve_optimization (landmarks, max_steps, printing_console) :
     # Solve linear programming problem
 
     res = linprog(c, A_ub=A_ub, b_ub=b_ub, A_eq=A_eq, b_eq = b_eq, bounds=x_bounds, method='highs', integrality=3)
-    circle = has_circle(res.x)
-    i = 0
-
-    # Break the circular symmetry if needed
-    while len(circle) != 0 :
-        A_ub, b_ub = break_circle(landmarks, A_ub, b_ub, circle)
-        res = linprog(c, A_ub=A_ub, b_ub=b_ub, A_eq=A_eq, b_eq = b_eq, bounds=x_bounds, method='highs', integrality=3)
-        circle = has_circle(res.x)
-        i += 1
+    
 
 
     # Raise error if no solution is found
@@ -305,16 +297,29 @@ def solve_optimization (landmarks, max_steps, printing_console) :
         res = linprog(c, A_ub=A_ub, b_ub=b_ub, A_eq=A_eq, b_eq = b_eq, bounds=x_bounds, method='highs', integrality=3)
 
         if not res.success :
-            raise ValueError("No solution could be found, even when increasing max_steps using the heuristic")
+            s = "No solution could be found, even when increasing max_steps using the heuristic"
+            return s
+            #raise ValueError("No solution could be found, even when increasing max_steps using the heuristic")
     
+    # If there is a solution, we're good to go, just check for
+    else :
+        circle = has_circle(res.x)
+        i = 0
 
-    if printing_console is True :
-        if i != 0 :
-            print(f"Neded to recompute paths {i} times because of unconnected loops...")
+        # Break the circular symmetry if needed
+        while len(circle) != 0 :
+            A_ub, b_ub = break_circle(landmarks, A_ub, b_ub, circle)
+            res = linprog(c, A_ub=A_ub, b_ub=b_ub, A_eq=A_eq, b_eq = b_eq, bounds=x_bounds, method='highs', integrality=3)
+            circle = has_circle(res.x)
+            i += 1
+
+        if printing_details is True :
+            if i != 0 :
+                print(f"Neded to recompute paths {i} times because of unconnected loops...")
             X = print_res(res, landmarks, P)
             return X
-    else :
-        return untangle(res.x)
+        else :
+            return untangle(res.x)