From 08ed4de72411980241e8ab855c38b20ac212a16f Mon Sep 17 00:00:00 2001
From: Tarandeep <tmittal@ryerson.ca>
Date: Thu, 8 Apr 2021 16:10:16 -0400
Subject: [PATCH] Change method names between across and within

I do dumb things sometimes.
---
 .../__pycache__/calculations.cpython-37.pyc   | Bin 2510 -> 2510 bytes
 .../__pycache__/distance_algo.cpython-37.pyc  | Bin 2444 -> 2446 bytes
 .../__pycache__/distance_calc.cpython-37.pyc  | Bin 748 -> 873 bytes
 python/__pycache__/gui.cpython-37.pyc         | Bin 2572 -> 2580 bytes
 python/__pycache__/layout.cpython-37.pyc      | Bin 1684 -> 1692 bytes
 .../__pycache__/order_division.cpython-37.pyc | Bin 1798 -> 1804 bytes
 python/__pycache__/order_lines.cpython-37.pyc | Bin 1039 -> 1041 bytes
 .../space_allocation.cpython-37.pyc           | Bin 2547 -> 2559 bytes
 python/export.py                              |   2 +-
 python/layout.py                              |   4 ++--
 10 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/__pycache__/calculations.cpython-37.pyc b/python/__pycache__/calculations.cpython-37.pyc
index facb1ee738abd9684b7229be0b0db4704fed52f1..34bb1f511f7b5ff543d5f8453e4ca89746823b9e 100644
GIT binary patch
delta 175
zcmX>nd`_6xiI<m)0SLl><|TaI$oqtu@z&%|%$<x<lWSO}>fd4uPt8ovC~?zdDiQ^%
zDiQ+{n#@J)AT|exkN^oV6>)>uJd+LCgeM2HYBS1Au4heRgXoz2oYjI2q^wAGvMQTB
zqx|Glwo8oSlP%cyFlui8%C5r5XfRodQ<+g=vK^<Ts1!)042X~i5t<;vU~&(q69AuH
BCba+n

delta 175
zcmX>nd`_6xiI<m)0SNL8GZH>+<bA@-7&ZA5b0?$Z<QkT#`cZ7*shQ~+C2pEbMIt~|
zMWR4Llevf;#O44I;vfO0B5n|yXR;xi@Z?}tZAPid^{h#35FL}Bvs$o$lod%&R%Nqi
zl%1T)c8O7JvIYAdM)l2K*;N=B^(ISkDl^JWw&S!El?17j0uizxLLEftP43}z0sxc4
BB;Wu5

diff --git a/python/__pycache__/distance_algo.cpython-37.pyc b/python/__pycache__/distance_algo.cpython-37.pyc
index 0823ebd34d6a7234b5b8c8ae094da0ca6dc05ce1..960f241883f33d3fe765a2ce5d2a616c1e967647 100644
GIT binary patch
delta 479
zcmZ{gy-ve06oq?}G;#As+eE6mqoORVEG)nXbU|IRgwR;1B8@9MRTrc#jEKbpPr$&4
zcmp1Q2k?s^BnGa71Qm!3pN{U$Iri~wbQgt(LEyIVyLzwA-}+DCg|U;m6<wVjPfli{
zRwjy+AP#1tq^bS2dTen|-Wx9v$lM-EVLpH-ht_siXL0WvzC5)O=smBj8`#z3q|HOU
z-9jik*O`KM_2iE;vG*Xt_}5Wmw0?~L7$(jLVtMU+tOK2HmbBtM9UW=J8V(|Hct`6#
zBK5G@5t}bcTGP}OjMuc#y_+MHH(hd0t9r}|nv%RMwGf;AFhltT8uDsN56VlH<76#H
z$QD>YAU1s<?bx&p7gY#87!7??7KA1r;Gg4!C@0GbHqA0c*n;xBW}F+i;=0T48rrjQ
Ui{`z3oGG$DXT?(1odNVd0jybKbN~PV

delta 479
zcmZ`#u};G<6s(gpNz>L1ByH7!tt!gG%ED3@fi9?X8X5~#a^uQQ1p`tSM#SO)@c|65
zA^w05-~;?E47^t)s6fQZ>2%L`_W3Tljp$*s8C2kVc;*u;dZFjmt_ccud3HQLnW@s)
zK#UJCoGH$X`!#y1NUHCxHxla1?P+B{5~_PnKdeKPq~Fler%poR*GuPy?4g`g<rYr2
z0gRhrrjijVf1HWCPdX6)K3E%_ALBoUu{R)HeeHd$LQJ<gD`bq(9fU4|2atHOhP(}6
z>d@>+%om)M%mhlvlI7TYeT1n`mr}B#9EqG6KjR#U+U$oJjT{VFF=a!3Ats=#R3ETH
z9O9GMZV<m3+pZk|qohGX_;ERe+Hwc>jS}B@X_|{^ni^j$n9NEcr3E92O@5a^&&D0r
UuiXO8_y=>5FFDg!wKfSq0U9u6vj6}9

diff --git a/python/__pycache__/distance_calc.cpython-37.pyc b/python/__pycache__/distance_calc.cpython-37.pyc
index 07daada1572235d55612fc469c13465e68c93dc9..05271c605fd99484f6eed4d50d5d0003c0944848 100644
GIT binary patch
delta 308
zcmaFE`jU;$iI<m)0SK1-%u6U?naHQlxNV}HWjz;HNJeI{0uUuC<ffKn<fkZ<7N@2t
zB&L<57Acfuq$;Fj7MCREC8sJR=A`ErWtL>*f>bBx=jImVq?V*Y^p|Jm<S3LRW~YL+
z<mIQN7Auq#C6=WYfep(`0cywt@=6p+^5G_OB{OcU<Ycsr;)U7a2hw<p1ICSFcXAC0
zcXjoP;`H$kcMS@24GM|k3=If?GAHk5JSfZy^i;71$ZL!&%q)yR$TYd1N#2eFDB`Ed
pbc;PcJ|#anKE4PfP{e{tumicbIBatBQ%ZAE?LYxk%mgG@m;spOSz7=A

delta 160
zcmaFK_J)<uiI<m)0SM0i_D=Z0JdsbI(Q=}l<;E}EjEuJ?F-a)gVs~;433qk%yT$3_
zAMP3y<{A`oi!(GJ0Lq+f!E{iV186|82FMsj7G@SkAY`7*!z^#d3l#CwWV*#3AD@z+
j93Ni<5-4IpC3t|`TO2mI`6;D2sdj8YUNIApU||9PRtzMB

diff --git a/python/__pycache__/gui.cpython-37.pyc b/python/__pycache__/gui.cpython-37.pyc
index afa3e07a2ca9196a98f38ee410ed3a5c31cc0f66..cd0d750d6df7f21ed497b9077f6cf44ccd82b215 100644
GIT binary patch
delta 101
zcmeAXnIgjL#LLUY00g28`3Xxm@~UtO@Bw+n4InWl78VvpuF3YC>TGO`9Lzk7lN&fi
kG}suqnE8MlK4zdKkcL4%peP?B1PU+<u}ogXnaRis0DGqjqW}N^

delta 87
zcmbOt(j&s_#LLUY00c8v<s|rQ<W=G1;|21HD?nmQEG&GJ9XZt%`IvbaAs9r$ARn^;
TGgNePKc^HU>*Q6OnT#v|Dk%#@

diff --git a/python/__pycache__/layout.cpython-37.pyc b/python/__pycache__/layout.cpython-37.pyc
index 146a59a34079a388b7e70ddcf27b8642015e0c4d..11c36e9765dcc8efbc340cb172a1f3011d08fa6c 100644
GIT binary patch
delta 321
zcmbQjJBOFoiI<m)0SK~w<t2n|<bA;86vdg7Seaj15}%S5#gmhtoLG{XpH~dz-D1qV
z#h4Yvos(Hy;+&sTnwwV~#hRR-<Ch=BnV4KsnwSF=UCB_SI9Z>0KBLIw^UUh3Oma*`
z%A0>PJ2JW{0&OV*6G}kVE&lwXl++@p%COX;lFa1990Q<Wu?&!4U}RzBW8`4s0McAQ
zECj?7j66U#4{MRm<QmojXLX>eA`K9s2_n!;7KEDYkzbTqm7iCVnBxXiRm=e-7??n2
z^Dq|aPS$19uvZ4@)&UW^AOc|y!kHX4x%nxjIjMGRKo!NHpkiU=VC3N7kl_#m0MwO6
A=l}o!

delta 291
zcmbQkJB63miI<m)0SIQU%1IF2$oqiF=@w^BVr715NqkD$EuNhG<iwK9{Jdfik1_KW
zW7aM1oXp}9=lq<~+`QsjtjYN~e)+dJ6O&6y6LWx~D;bK^ChIfLXB3)zo>`rhQI4rd
zWAkrjM@9!Vpe;pULLJDu#h+i4l3L_c8J1d9l9`;CqXQHy76TFtj6#eYOdO0Xj9iRj
zj53ToK$?fO$Z&EKYk?z3Rgo@;&;t=@W(q>h^vEyDtjf<TNzAbWsw!p!5+GA~7>kT1
fo3d%hYk>3`f(RoJfiMN)yva3e(yVM8QXE16I~7IX

diff --git a/python/__pycache__/order_division.cpython-37.pyc b/python/__pycache__/order_division.cpython-37.pyc
index 0796292763cbaa2384a1716e2720169114bdca17..0a6d5ee4496797a425e16c1c6ffed994f81c2f07 100644
GIT binary patch
delta 305
zcmY*Tu}Z{16wKRf!Wxq0$cdbwatJo({e)t9C^iRfWk{BDx!WY{ZqUNo%5J~l8sY5x
z2^(vhe1YF!<?|Zx!5d~^W|$}b%=vkiB>`UXUEc=$jlYK={Ac(9+^^|e2yR_t<dvzU
zxlpAOnO$~g)~ZFVW$nbUY;?PlPF7pXOx4o%@x4@wJ12H@@i1>zot8bV3Mc#IuT1#s
zXgCtARpoM~tm~<hy6vN~>9E#6Mknk5XKeyA@tf%NW`M$8{w`&dq(I3Y!4GpbfCM<<
z5F=9HTcm)D<iH?>6x|$Hc!Zf<)D*^$V>W>iVPK~IB|aYSV=pdHTAC?RGx-mv{wqF&
F_y>;}Nmu{?

delta 299
zcmY*TyGjE=6wRHT4Vz_mBAXC`5E0QIi1`5@g+)L_NMU8z9paG8?lLor7S>kj<_jz%
zHvWW-onUi6!f)`#M!W|u=Ufiwp0#)q;xtX;7EO9q-hQTU;ynQLU%>}-{WG84ps=no
z^3oL2oU7bnYM0H4wQ5mnSvu_Hm9AIP$>P^CRi(7pzL#oo=dh#a53_33Xo<X-JBjgM
z82YQQH^it``EshPL++%mG0dxmV*O)y6pg6Xre(%{6TVz`N!W{R)0ndaI2&*t3|Q9L
zffxj#4;cu?VGBV#f&>zB3W$O|y7fsPLdH0YVaOsd6aU&i*x#i@`mMAy6QXAPe;xbp
H_6WisEfP&t

diff --git a/python/__pycache__/order_lines.cpython-37.pyc b/python/__pycache__/order_lines.cpython-37.pyc
index e114589207a977f9b9c955bb47b582f7710cd3eb..e42e106aa7e3c41394b9dd7e8058e40772129212 100644
GIT binary patch
delta 175
zcmeC@n8?BF#LLUY00akq<t2RI$g9W1s5IGzDTy&^@_eQl)=`{^IXUrZnK`M&QGzLH
z@o7c*x$&uq$r)g=DE{R9yyV1^)I1<giBCz3;>;_}jjv2iEGmwgT*R#ICJZ#WSOjD~
zn+OL7BOefQFtISPFiJ3rF&0Sz#WmS(vB$@!<R{0+-(o9B%u7iuE@A?T7x94zeh?u!
K`7W~|BPRfXX)Xu=

delta 150
zcmbQp(a*u_#LLUY00d`$dneRy<ke$hl$mV9l*D*z@_eQl*0(qlb8_O-GILUkZwaQP
z#iteJ=f<ZdCTD=fZt*AQ=OrhWq~-x}N_<M%EzZ2s-1y4W#G>L`lZ%+uWqE-n7Yl*R
pXBFY(VB`Zr4ki{R8AdV2BKgTXm}R*6fpSFxAVPlfeP%;OW&ri8DZ>B&

diff --git a/python/__pycache__/space_allocation.cpython-37.pyc b/python/__pycache__/space_allocation.cpython-37.pyc
index a562b069bd8f30244d20c35c872a106e99418fa1..bd31fb754a290cfad28672abaaf94bc731ac6801 100644
GIT binary patch
delta 530
zcmY*W!D`z;5Y0+jd9B!r8{2iEh8ia!cAze`dn#=qNlQb(5aK{#E{RY?BqB><SHW&C
zrQfih;8W?T^aJ_}J?qj#PdVq1Lk{ii)|Y6Rw{PY>W@pe%{cqjft5%&A{NCRsXWt%t
zcYm1_jFSlDAG2Eq<6wyK0)DtwNLGQpjYQ_<ehBgleN90Aq?-+JKBW9|5(Yso3VQ4%
z7Xipy`V{3YyNh^WKS2!bu@CIs+z;a2EQ3-K%#OS~1Xq_-3!z$oqjTL3n8*TOjMH;q
zlicI^aXMSF{WLDDIQ5@v9D?GbuPc08J}NDGO<YKvsI^Fi*k*-vOamEm!iYl*QbT5t
zb@{v0eoU353a&QcO&x9Hec51(4Tf#{MqzpLNbns@u1y6L;S-(g9(6WA7VKrEt$lnG
zFOZ#bbFht!Yv?J~ML5L}H3T)7ODytGg;62AD^JU<&(BbSwON#mhJHF7_;C~@IWJ?C
zuObwsR1EM3gau8mrrAf{Qc6Q9W`xGRO4U36pS?do!Cp<%^Q$;`W1~Y)VHpfJT^_c6
F_zz3PcZvW2

delta 576
zcmYjO&ui2`6y8ZPvt!(iVYi@^g4$I|K`Y&g2idMvE$pRIx`KF0!(=p}*-V&8+3H37
z8*=j8litKXz<<H>I|-gVd+1T$j2=vQ-}~`>^YZ59_wd&+dfe}a9eh4~DvvJ)pQCR+
z1@CzQ?GJzb5_q#Q+I{#E1v$A4{Apq8v=KS9@98dq_A9-$0^tj#Pv*IljRAU;R<9+r
z7xXUDx7j-4j9o{}*?|DQe<ozPSJ%+3<nl0Wa)?~XwlKB@gf4gOfSXzhbD%Qd^Cs2J
zky`$Xo~ROnQi*McV~0B*J9^Sy>z=<H;f2gIdo9u<%)jG%=rJOkgv28;Mk`)OA{t}P
zgMb9V13$)k>@(yT^T-<d$elyaP=!i8ZCCmE$nI;?gCIRCjDCd4Pu~JXcuVJdhc`yh
ze&-M0Z8)9YMh8ROn~+Ib;>>ANs4B@`=?OA_Vb@0Y5Khoc55Z0zkyU(q#4($F=q5>~
zM3Mlj(<)1i-bWo=Sr*mKSg6I8C<|FNI>M?RbdHhhDzk+@EC*VhF6uY>rlr>GDZfDF
k)TZ{c|Bd2?vhx6+EL3({$|=Ll*sj4<j*E!VxHp*n0Xcw@zyJUM

diff --git a/python/export.py b/python/export.py
index 17d1e13..bb43837 100644
--- a/python/export.py
+++ b/python/export.py
@@ -198,7 +198,7 @@ def evaluationFile(randomD, coiD, weightD, abcHD, abcVD, exportPath):
     abcv_df = pd.DataFrame(abcVD)
 
     alldf = [random_df, coi_df, weight_df, abch_df, abcv_df]
-    names = ["random", "coi", "weight", "abc horiz", "abc verti"]
+    names = ["random", "coi", "weight", "across aisle", "within aisle"]
     sumDist = []
 
     for i in range(len(alldf)):
diff --git a/python/layout.py b/python/layout.py
index a967450..6b42544 100644
--- a/python/layout.py
+++ b/python/layout.py
@@ -45,7 +45,7 @@ def layoutDistance(layout_df):
     return locations_df
 
 
-def orderByVertical(locationDistance, aisles):
+def orderByHorizontal(locationDistance, aisles): #across aisle
     locationDistance = locationDistance.sort_values(
         by=['Column', 'Row'], ascending=False)
     returnFrame = pd.DataFrame()
@@ -67,7 +67,7 @@ def orderByVertical(locationDistance, aisles):
     return returnFrame
 
 
-def orderByHorizontal(locationDistance, aisles):
+def orderByVertical(locationDistance, aisles): #within aisle
     # sort by aisle, then by row, starting from bottom and working to the top
     returnFrame = locationDistance.sort_values(
         by=['Column', 'Row'], ascending=False)