From e336a1d4fc0ee9616a3d94c4d1370643ae2d096f Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Wed, 8 May 2019 00:42:24 +0200
Subject: [PATCH] fixed best path algo

---
 src/routing4SITA   | Bin 21336 -> 21336 bytes
 src/routing4SITA.c |  24 +++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/routing4SITA b/src/routing4SITA
index d80bc30d891f802e2473c68a22787ff169b485b9..1ae53e7265fab0edecf2e6a824a0a068c7bb897a 100755
GIT binary patch
delta 2057
zcma)7drVVT7(eIIN=wyJXvO*nrwUTtpkpKgzPO5Y7bZ=8FcaepjMiY{3P>4?ug);s
z*ahZx%%*e5<`QQ7M`AVE+#>3XWx7POkPWwxz1V`$ZD=yl4ZZu$IoHelZ#TL9?(gwE
z?l~vDgFSe#2lraAb;yeNHAEfQXRVS1s-k7M&oN8{8YVJ-7^ZINGpAy6g|7TKdgtop
zuFjnY4rsdzN`~Vj((x(QYi=1SiSzYtdN_4R$}`g)js|>`-g0=BD5`%{QDv_xJKHYx
zIiTPttmH_}Lrt5|OrQ}%vw@cIk7G*GW-Rg<^bZd-tp(_bG-t7Ye9xB#Mo^{Du=mnv
znlDyv;FlmBti7t73clwIezVTQlol1W+_TtQTQNct))x(H!GzVzteU;`2)qopvgWOZ
z)2chEBYoorrYmaDBBJb7)C$05UbVrgrYJSvw5{H6x^Yr3#1|`7?_PYt-g)T19lDJU
zYsaZAeID&iUljO1_4%sba7bcW{;smA^<0y)?{g?Q()Ev~3CkbU>D*<T4J*+16x*mL
z>0#$aSFegXf^6jvwxuTg{UD&5&(aiERw<vfvR|qBT4}jpQdjP0dwJOybL-!1)B0H|
z)F}4%?>a8Vm0>w552|S$<r)pR^5z~*lhIjLcjWi`Eaf6k(FZN|U$nPhrQNQ%((U{7
zqN^}=3`|O!`Oy4FbG|Ex{RXj55U&|TlOXmOL`V=#2C+^M+YDlbAZiREUl1E(215k1
z1_(tpmqSP(3%mw^r3}a>_ELayxRflwjK?GsmnI2m%*(T216bA#K#J<R!$KQ7LgsIo
z9+Qb)={$qTEZnCUFghOL66+6XZ#^dM<WiE5B0|zTRsn*Jdsz@216(J%yNIC}f|JC`
zKEXAUuFYmisw<BLk!#~Ru?hEs9Ij6jI-GLzO<)po)&ijq3H>1pZNcfFU*WpfBJ|S?
zAs95qdLQGONuT6BmZZ8qVnOtNo$JIda(4(_6*}u(%k`|8LSM@eJhCcgKbIbrE(8Rn
zi&zk)<!o*sim+!00}%#R+sySWBJ{C&2tEJBmOOjrt3V)R&!i`&yE1CC5UNx<a#>ur
zdj79U%Pq@D&E5F-)5DYACXVd->S%2!Tpz7nM6$Q0pp+Hi#wZB_$uJ_hxyvBZY*G{R
za6=^AOkQA~#=31y(XDk6vZbym5)xvdjzq#QM@ghE6mCSJ>S%TDvij}eP`D=C*jTr{
zQS?9v&rDh@!;HyrFZol`+9AFVaTCPIsHUBQc=ooYU4wY(FHIYVIJNzrrp<zVxdkzV
z>0L4h7g4vzhmX-RPfpoM$PcpfwR~#oKB;sHJL+%-P!-(2K}`!gq>r?UH<LO|9p?5)
zEy+oDlO`v_-p>M=&2fQ#>dBO9$LM#SRpwX5G!4h|=Nz`t(Od-&#EbJ15+0y9-)F6d
zFA}?|>2fK92J;CXqz(D~5`3Z-Km8NFMrRke87L|UOI>c-U67r5T2FD}N@+K8;`P!V
z_+2B#pp2`_9si}^1glOLHnYUZg<s*p`1Qhs**c&nLWh!c8k9`*+)`p4)Y&1<eqbi?
zS<BXAD9}*i!^8B$k_^e~iJvLyNy3|Gb!jtj*GqjcnRR6|xc096n6+8p-z*)UM&Ix+
z#6f!AzafSFO|r{kiqBc~PO`MdO3zf}88Zyf+ZE5?pJ{QxXPx+ZHv|e(ydIGVO-}}T
GO#cEXzJ7xM

delta 1804
zcmY*ZeN0<b6u<Yir5`Y9p)G9&<COvJh)}Q#Sf=AK+F2GM)eUD18k)(58bJaCSYTwq
zY4CyIZnBU}9a|I={9`ZH_!(C=&C24}qGo|VFn&hnHU*O*vTo0F-+g<_Zt~uFzmIdy
zy{E5lej3kDW66Zgd1j=nJYvIsb2-OQIjP49o5V9D@q+Ro5jXd#{ru~K#rgK=$Ht}u
zhcEf-x}wsx@%R!qv%ze23n-F2E4j#V>mt{qCkJhvxSw3Lc@89OP~#(7WohdzSx$yi
z^!bW6B8HbEqTmyoQjvY%iJ=Mo$oa%3&1(Yha5#lEn_v%yQv(+?jKE&3*%!zgS^l=5
zhELp-Ww1)3U<F@T<6l;J=xh?v@R}*}hzlch$J(q}o9|eC)GGHpo9G60DR7gdvWv-c
z+0~n_4AM;H7*@4L@Z6!c#0d4hPi|z#N|d8t{!4A5^cD0+W_#?3lS;9aEHlfOWX3*_
zz7E4ll+$UQBNdJ(9Frm%i_$4fj#!i7Ic0V}GUX`bhr@G}mqZi{&kcO7Zp0K3n<mAq
zv0a!Lon;yQSpqskla{8}Nv+d~{~?b%H*+)VWYAeP6kCTWjTjy+x!p6$h<c5vVT7O&
zWsIoOh&)D=X+#DiiZtTJe@d5Jjrfxh*+Uw$z!(b<5z(N7kVGcfHGtJE00ccf1E8NM
zLPiF@zf1Z|k<yqXF$tzlvrYkuh>mw@7>UA&3=>oz5_q-JK?;$9xu2&%>$q2uXn#oC
zb(geNk#tP*GD+>|1_T|eX<!|Viq5O<6(8-7IF|bxMS@<{E&+nvKWJdNUnn}C&fFg`
z{adEPduMn{(F<X0bd$%J{vp#{z`UsFJ`>a1DMGN(A?l7PnqJ+>Za~nxnFiLoR?+!P
zmK$Jti0QPqN6`y6GCiFlcvLoW%c~qqExil~O0UqsN(X;b419#yFEYadGtk;+6uppV
zx&-LS&-Z8MhY;y-J92zQ2sK5<N@?8v@Rr{r!&gm9oBxd;cekdIDZ}hh-e$M#Xzl9e
zqp|L`Y919m!<UwB=Sd~MkG#pd9z%^Ce0ytOH{agzbZZwvc%yDx2znXedf{(bo`84}
zVhhAm%j|!8VMUgI09<=rmgx-9nk@4WTOhVkj7YJk0Jo8Pj~~yIevh~Q7bxMSQtds~
zm$<qO^c96Mp%%EVLD@d~yWiFt#&xgi#|)!s!$#eHU53$wP%g-$a0SU_Pd+!lN-PCC
z4a=*tjN`F_@pL%q17x{0g6;8OS(3wcf-C%H$t6GvLNQXy<&bCvk6om*Vvd7P^tStc
z##WLSa8q!9pp{#6krRQU{Of9p9XD}<$d31Lhv5DQHw0xIi>~;ufzz})sqCeR8C73l
zSA3x=X)xR2>rWSSsL3W#PETeZ<jpRX%~RMZ10T=bz6V2r&Kf_K$jO=<yasni{F|Di
zI(#pQ)%60sQ0IrunM1u`JREw5b}9)!#jQBVE8$A)C1=BXE%c*CSD!9ku=ALad(A{X
mX(-dSVJ9mM58=}!*a%~QZ!BFB>1?dBtf^>?kH6PAt^Xg)s1~09

diff --git a/src/routing4SITA.c b/src/routing4SITA.c
index 41543b7..2685b65 100644
--- a/src/routing4SITA.c
+++ b/src/routing4SITA.c
@@ -28,10 +28,14 @@ int main() {
 
     pthread_join(startThread, NULL);
 
-    printf("\nBest Path: ");
     
-    for(int i = 0; i < data->bestpath->depth; i++){
-     printf("%i --> ", data->bestpath->predecessorsBestPath[i]);   
+    printf("pathdepth: %i\n", data->bestpath->depth);
+    
+    
+    printf("\nBest Path: %i", data->bestpath->predecessorsBestPath[0]);
+    
+    for(int i = 1; i <= data->bestpath->depth; i++){
+     printf(" --> %i", data->bestpath->predecessorsBestPath[i]);   
     }
     printf("\nWith cost of: %i\n", data->bestpath->lowestCost);
     
@@ -57,22 +61,24 @@ void *Search(void* arguments) {
 
         if(data->bestpath->lowestCost == -1) {
             //first solution found
-            printf("first solution found\n");
+            printf("first solution found! %i\n", data->depth);
             data->bestpath->lowestCost = data->cost;
             data->bestpath->depth = data->depth;
             for(int j = 0; j < data->depth; j++) {
                 data->bestpath->predecessorsBestPath[j] = data->predecessors[j];
             }
+              data->bestpath->predecessorsBestPath[(data->bestpath->depth)] = data->node->id;
         } else {
 
             if(data->bestpath->lowestCost > data->cost) {
                 //new best solution found
-                printf("new best solution found\n");
+                printf("new best solution found! %i\n", data->depth);
                 data->bestpath->lowestCost = data->cost;
                 data->bestpath->depth = data->depth;
                 for(int j = 0; j < data->depth; j++) {
                     data->bestpath->predecessorsBestPath[j] = data->predecessors[j];
                 }
+          data->bestpath->predecessorsBestPath[(data->bestpath->depth)] = data->node->id;
             }
         }
         
@@ -95,12 +101,16 @@ void *Search(void* arguments) {
         nextdata->node = (data->node->nodesnext[i]);
         nextdata->bestpath = data->bestpath;
         nextdata->cost = data->node->nodescost[i] + data->cost;
-        nextdata->depth++;
+        nextdata->depth = data->depth + 1;
 
         for(int j = 0; j < data->depth; j++) {
             nextdata->predecessors[j] = data->predecessors[j];
+            
+            printf("data->predecessors: %i\n", data->predecessors[j]);
+            
         }
-        nextdata->predecessors[(nextdata->depth)+1] = data->node->id;
+    
+        nextdata->predecessors[((nextdata->depth) - 1)] = data->node->id;
 
         pthread_create(&threads[i], NULL, Search, nextdata);
     }