From 136974fb5194db9b8c17605a3397928a58b55261 Mon Sep 17 00:00:00 2001 From: EDUARDO MAIA MACHADO <emm14@inf.ufpr.br> Date: Thu, 8 Oct 2015 09:39:18 -0300 Subject: [PATCH] resolvido problema com referencia --- bst | Bin 19667 -> 19667 bytes include/bst_lib.h | 2 +- lib/bst_lib.a | Bin 11816 -> 11928 bytes obj/bst_lib.o | Bin 11240 -> 11352 bytes src/bst_lib.cpp | 10 +++++----- src/main.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bst b/bst index 0e3c369d4c667788070552a114119fcfdd9a2ce5..ae82def670b7145618b319007006307ae9fc2d26 100755 GIT binary patch delta 2554 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 E0107I(f|Me delta 2571 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 ZGhUdy&_$lHdGbLQbw-iRFI`@-0|1oBUu^&Y diff --git a/include/bst_lib.h b/include/bst_lib.h index ea0ac21..97e8296 100644 --- a/include/bst_lib.h +++ b/include/bst_lib.h @@ -33,7 +33,7 @@ class Tree{ public: Node *root; Node* createNode(int key, string truck, Node *father); - bool insertNode(int key, string truck, Node *father, Node *current); + Node* insertNode(int key, string truck, Node *father, Node *current); Node* binarySearch(int key, Node *current); }; diff --git a/lib/bst_lib.a b/lib/bst_lib.a index e710adc24ebdba929d6daf0dc2190841880c5eff..d4140fc2afb62a284a77592ffb58011e73e59bc4 100644 GIT binary patch delta 1224 zcmZ1xGb46_46Ct$xw-L1#qW#|)?`^GNoHeHqsf*``iv(wXEIG-k#b^WVDRX6-Qm%B z`~?F81B12e75@1LS`L&{Prk?@KiP=g%A)fSM8P$f8joJr2Qc=_jSQFu%mEot0W*LT zZouS6>=vvcAk!u*aD;EJ;AmiE1zF0l`8#J0qh==y!%W5+28LBktczI~PB6tWFzjY# z-OIvolUbR8VIB)B1H%pwacOf8w+@q791{Zr3rM>opFkUvGcTKKGc$9@=5xH87#Sx{ zZsa%TydVXVW?)E|e30Lq=_dQ+hkRm_1q3u$Z?ZEmFicJq5}q6&puzZHa;1PhlY!Rc zT>^GY44jjH3D_}tXic^fv}2OvoLnVn$5=6Wr=UGkg4X0;f_97zlP!hpnO1RvO`9O3 z!MI`aP9b~7ipf8P?3omJCR+*HF`k%QDQwU9Ve?L5c1A|~$p=Nm8EZD*6sc!sjGG)O zq0S`4wz)}yk5BR=*aHj<ObiSRq6`cSfBr+j-^q@u;*xxj&;iRzAj!&3KBy+ns5E(_ zx;Ufy<d16Nj5?Das*5w4OjcAEmvlhVC4;0ZY;vHwxM2a3tUi)#6Oy<Xl6c?bMs;z? zsZd!i1_lN;1_p)$kbq^F1$M)Hup5?u-LMAihK)$-<)Lap)CsU@m!YyCU+W>+^$0Bc z7KiK~uq->sdIm^{A?wwgyih}2(f}$8bLV-Gr3?%Vrjsvfh%;JEo~S9#Xg`@zQ=HL# z@<B~;MxV)sn&OhNP+cJRAcu3#<U~zz#zL^(GO*riu-;~nUdetWUD8OtSUmZornux5 zBw1uL4^LLq5@$RCHuEgl%u8T1Z-LC5d_s$d7dg&;fz0CN03}zbpCu;yYKw=03}<45 zcuoc?3-Yr9L<meOLd8M8Qbcl}8dMylUJ0xcLg-C))E1YtM3P00x!B2t+TxN)P+5?f zMo4C+PhO}k&X@yI0}3x~amKRAFSWxNYc@OTtY@?k0=bugfx!f%59$#R(;jME2#A9u IUIP^e0J0!V`Tzg` delta 1158 zcmbOcyCP<S46Bi`fw9>}#qW#|)?`^GNoFGxgUOam`iu)UXEIG-k&<I%VDRX6-Qm%B z`~?F81B12e75@1LS`L(CPF}z&Klw1bm0GXs1DNc~`3#uK=YW)_!IV$t=g{W}-NDGf z!0_5{ay*CW<OB{W_U0oV(XodoY@Wr@z_?j~E1OaC88gF7#u^5ORZOf6EDYP2;usiK zGPBNNVc5#7%)s!QnU#TIDhn$E!}`rzxOJEqttUU^6=5{o{Ec@LBV+#LmHg(ME2KaU zW?+z*{F2|Car<ON0ei;nlM@B(8Fx%xC}7WYKy&gV0XwD}9Fvs<?U-(8PEHcE<NU?} z(G)dVP(*n09zhkxfXNR9?U_DkPF51KV~m)bC}hvrG<l(rJ!8k@heGy@9FrA=?KyvN zL$s{`YpW4fVO%hIp|CyUiOmm%*%>8e*&))l5Q@Qvfq{XEfr%k%GoxrdGo$t7MhSJM z53HM4N$~M8zMgzhO`P%1<cF%_jNFqM)x{+RSRwkj7#J87AWSeRI@wTNTv7^2RtYQ) zA(SR3s*6kNL1md37#L(27#RNihX9w!6V=5f<B(+akz}(bH)@D87Eb=CE-qOHRfBGO zHQ4qBBw1wJJ3zKGE(Mt*xdEyM<OV$?TlRxxPvMZg36_0=LzaEApr*Ja9~;E4Ah&^- z=OJ7M;mMAg;*1iL8MVY2WhWPEiZiNCHq;Vl)SA3dQ(V#-q!b(l3=9%T?(v#@QB$1J zAFMY7tTz&@HxZ;)G8ajgG?K2y$%$Ixl9P~Rk<DB<d7_p$<1(<BtHEY&0Gqi3Y~~Rp zUC6O>17zl84s9M)WV60PRl|JC1j<DW3=F@(rvC?-F3AE-Y9KYp@xe2BqqexDIFhV9 zG^{|B_2h@z;*t(fSx`I~A^FgCvY?JQqZddGD0Fnh8AB#V>Vz{!ZQiJ}p3&k1G>S|> U`k=uIV!~2=2#A9u9tE`q0RD>}^#A|> diff --git a/obj/bst_lib.o b/obj/bst_lib.o index 3f98ad5bf4906bff78aa5262671b3d57b94c5481..c48485e11d20846c2ffbbfee518e3df709619a17 100644 GIT binary patch delta 1195 zcmaD6ej{Rn2IGm1niE*0oERAxJi1+Xcyu0r!N9=4VC{N^fBu1%10~gyC$h;;{={Ns z(Rm1>;2KPgN3ZJx82jZ$222CyfDEXB8NdlQVDchX3)T>jX_FtYhHtiDYhYvrS<0|^ zJ9`eJW+w~7OvV}phE+_gi&+>>FvT%2>}F=&%ffJzS($-h9t$f2!wwK}X|oTf4wG0M z69WSaNV_ASKpT@YFPm#KGjqu1KJHD7j1wn2@|tsAkOE0FFeFTF<TYoy$v$}@kJ#i3 zyc(=G*%=rZCMyaEPZr?QV0<vylFy#WKx=XppB)ne=j2^{c1#{xlYjBqG0AaGw&J&A zte9NMZ_kvVHF+1m9b?1fpZxYrt2n`?1qf&`ZkSvtV9!`Fd8dFqlLF7=UjlZFCnj48 z+B1IGTq(%T$Y?*gQAnJzX7fy;dS=GB$&zB~OhRm%oy7R~BtL>Zz`(%7z`!8Nz`*e5 zKLq@p%&06b$p;A?u&e}<tnB1Q6>&zT$%U%ojOvp&s)#e{OkSue&S*0Ep^CVq1ClNo zBwb;X1y#ij3y@^>kz|{Y#Kn-r`zAZ8ic3y~%5pI<Ft9N&FdTpcEW<3Y8|H)EumtRe zHDEVvL{cvgRSTj{fK9s$l?C})56P}aVA;1gWdDF=*+JGbKtc>zujb@LHE~G;s4UE# z=RuY-Fff=-o~S0yXf-)dU7XQ=@<BCmM)%2$>f($(lRv77OU6QVf!u=}&N-76)x{YL z!FtQUdaJ>Dn?ZUd`;l}>Bl%+S<c;d$l3S2uk<C0j`JuWv;|Z{tXTfG(0-JdYWai`! z4IW<PIQs=Mi<bkGT%mrJn9Qpw9ttv?i4o#C8K^AC&k7JBFsTR?2l+}7$$e^2agcf? zuu2G_H<?jWT+$Lr7CGi(CmU*tOC~{OL1r2unVCL0QB#~T2c!lRUYg>JWs_HGhBMY| iX4G2GXdwi0F9QRE2}mE*BOs<d)VL532T8mJDh>c)jX@6p delta 1129 zcmcZ+@gjVJ2IGQ_niE*0<QN$kJi1+Xcyu0r!N9=4VC{N^fBu1%10|W06PV>EH?vx) z^}0TQ$-bP=fT?^ANO>Ae`Q-Dg`W&G<7#SECUi(d!XEU9wz$V4se8eL<_V9$wQEUy2 zn;)=eGip9#W|+xX!@#hLiM4@+VH;B%1H(#Y)>$kJTbY#^7=AOeGB8YKVP#-gzqy1{ zhl$a8@<MJAM#Ih9xHmB}=1<P#HRoI*1#&P0gT&;OyylGCCqLx1XWTwnk<XrS$K*sl zd!_@LlNa&XG2P&p{0Ky8PFCW#<NU?}(G)fLqM-2P8h#bVfXNH_?U_DkPJYC1#~3kL zQNW(DX>y`~J!8k@g#z}B9Frdk*mM5ihG<&>)@CE9!nj~^qM$wFiOmZI*%>8e*&))l z5Q@Qvfq{XEfr%k%^Fg6{W=8ADj$-OeA6PeMiSh9<zMec$MV#@^<b}%OjNFqCs)$Pp zutM~4F)%PFK$u`sbn-_PaY-p8StYPIgixBSs46b02bE=FU|^78U|{(39|Bw^2dauo z#v#e-Bgtk>c2pB*ES$ViRa~+Rss`QmYOw7MNV3SbcYthXTnaKrasyNi$PIc(w(JMX zp28t}6D<1#hb;T#i)!MMd~6WEg4_mTo`-N5geNnqi!(}0KBz9vC_C9uU7S&M@<(-X zMy<(->f(~tAf@0aU|^6ya*x;KiR$8v{$RZ!V7-xGy@?>blDSB_q>*$rPFB<qmz;zo zi)`k?$$=W;jLX1gt_GXA0c_?Du$f1YbRoyi4Un0WPiXL{BAfLUsv727CQvS7U|{$K zHvK=ybV(LyQUj?$jt`#6g_`1$;z+Xc(69ng){_@%ic2~`WkK;|gycil$rm-n8NEPi sK%t{0&KNRTQY)M>YIC91dPa*6&?qti>4OF<hzU#eAs`Ntcoftc023V>Q~&?~ diff --git a/src/bst_lib.cpp b/src/bst_lib.cpp index 4f10ae3..2551d46 100644 --- a/src/bst_lib.cpp +++ b/src/bst_lib.cpp @@ -82,7 +82,7 @@ Node* Tree::createNode(int key, string truck, Node *father){ return aux; } -bool Tree::insertNode(int key, string truck, Node *father, Node *current){ +Node* Tree::insertNode(int key, string truck, Node *father, Node *current){ if(current==&nullNode){ std::cout << "insertNode - 1" << std::endl; cout << current << endl; @@ -90,15 +90,15 @@ bool Tree::insertNode(int key, string truck, Node *father, Node *current){ cout << current << endl; }else if(current->getKey() > key){ std::cout << "insertNode - 2" << std::endl; - insertNode(key, truck, current, current->getLeftNode()); + current->setLeftNode(insertNode(key, truck, current, current->getLeftNode())); }else if(current->getKey() < key){ std::cout << "insertNode - 3" << std::endl; - insertNode(key, truck, current, current->getRightNode()); + current->setRightNode(insertNode(key, truck, current, current->getRightNode())); }else{ std::cout << "Chave ocupada!" << std::endl; - return 0; + return &nullNode; } - return 1; + return current; } Node* Tree::binarySearch(int key, Node *current){ diff --git a/src/main.cpp b/src/main.cpp index 0f4d754..0ec1268 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) { cin >> auxKey; if(binaryTree.binarySearch(auxKey, binaryTree.root) == &nullNode){ cout << binaryTree.root << endl; - binaryTree.insertNode(auxKey, auxTruck, &nullNode, binaryTree.root); + binaryTree.root=binaryTree.insertNode(auxKey, auxTruck, &nullNode, binaryTree.root); cout << binaryTree.root << endl; } }else if(input == "print"){ -- GitLab