From 7927e7241c77265847969b38f86840cec30e4d27 Mon Sep 17 00:00:00 2001
From: HappyZ <zhuyanzi@gmail.com>
Date: Thu, 23 May 2019 14:51:37 -0500
Subject: [PATCH] bug fix

---
 floormap_editor.py            |   2 +-
 floormaps/exp_room.pickle     | Bin 98541 -> 98541 bytes
 libs/spacemap.py              |  14 ++++++--------
 syngen_floorplan_multipath.py |   2 +-
 tests/spacemap.py             |   4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/floormap_editor.py b/floormap_editor.py
index 778323e..5f3834a 100644
--- a/floormap_editor.py
+++ b/floormap_editor.py
@@ -28,7 +28,7 @@ def exproom():
     orientations = np.empty((64, 64), dtype=float) * float('nan')
 
     wall_penetration = -30.0
-    wall_reflection = -10.0
+    wall_reflection = -15.0
     glass_penetration = -3.0
     glass_reflection = -3.0
     # walls
diff --git a/floormaps/exp_room.pickle b/floormaps/exp_room.pickle
index 9b269a69ce530fd6a1e1fa1519aeb54a1b221e91..14f60a2c7ed635b64ed9c86b2348fe3ddc386a48 100644
GIT binary patch
literal 98541
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

literal 98541
zcmeI5J#So95QgvKB)FhRgG5V#<c3rf6i8TsiYujvXebbh9iv4eA2OT56>e-RlDnMz
z6MjH`RuBbbvura`q>Sbn4a>YPd~>XOo-^}4v&T{zpWk@-$F!K%Uq6n6>yIBld-U||
z&heAelRJ-|{kr<)!RhIPvvK{=Pp2oxPaglaI(>G$8ZXB6&9^U(>kl74+`RH)%+tmA
zW^pvG#{F?HFXqGf@Nz6~T;F`SI(vGu-t@uGU%q*3UTogjyIy=X?%lih-QRD%-hP{>
z)i`>7cRGJtkG?4ZC7=Y9fD%vwN<axH0VSXWlz<X234HNt^8-D1GY6y7z1(_tZ`6j;
z1SoG5r!<U)hg04tPD2HyEmPhoPH7ko52w6QoQ4WYTc*5GoYF8F9!`0qI1Lq)woG}W
zIHh4UJe=}IaT+QpZJF{$aZ1BzcsS*a;xtrH+A`&h;*^Hb@Nmi-#c8OZv}MX0#VHM=
z;o+1wiqlX*Y0H#1ic=a!!^0_W6sMtr(v~T26sI(dhKEz$C{9BKr7ct5C{Ae@4G*Wh
zQJjVfN?WG9QJm5+8Xiu0qc{x}l(tNHqd28uG(4R0MsXS{C~cYYMsZ5RXm~i~jp8&^
zP}(x(jpCGs(eQA}8^vj;ptNPm8^tLNqv7F{H;U6xL21jBH;PjlM#IA?ZxpAYg3^{L
zZxp9AjE09(-Y8B(1*I)h-Y8CK7!41nyiuHn3QAk1yiuIeFd80Cd80TD6_mD2d80U`
zVKh9P@<wqQDkyE4@<wq=!)SOo<&EMrR8ZP7<&EN$hSBhF${WRLsGziE${WQg4Wr@V
zlsAggP(f+SlsAe~8b-szDQ^^~p@PzuDQ^^~G>nFaQ{E^}Lj|QRQ{E^}X&4O;r@T>|
zh6+ksro3%A`>!_b?Ami%f7fT}5bAIxpalM735?Y^TJ9}x&C|tL?q7}j<6vIQhx6g(
zSl)hqcRJtJ`@^fvzw}fN>jX3hngh*&J_ou7bPwnr&^@4gK=**|0o?<;_FsakcXMxT
zbBNyK6en7T_WOPxQQjzy{Q3Mv^P;>_oM=DV@0%aW8^w`7pTB5clsAeK?MM54^Fw)~
zIP&N77tM?EMscG3XuofMC~p);{(SzTc~RadPP8BG_stLGjpE3k&tEhz${WRr_M`p2
z`Juc~9QpJ4i{?dnqd3uiwBI*BlsAeae?EWFyeMxJC)$tp`{sx8MseiN=P#NU<&EM*
z`_X>i{7~K~j{N!jMf0M(QJiQ$+V7hm${WRzKcBy7UX(YA6YWR)ee*+kqd4;C^B2vF
z@<wr@{b;{$ekgAgNB(^NqIpr?C{DB=?f1<O<&EOVpU+=3FUlLmiT0!YzWJfNQ5^a6
z`HSX7d80Vdeze~=Ka@9$BY!@B(Yz>c6erq`_WS0C@<wsw&*v|i7v+uOMElWx-~3SC
zD31L3{6+JkyiuHJKicn`AIclWkw2fmXkL^ziWBWe`+f66d80V;=kpiMi}FTsqWx&U
zZ+<9m6i5Di{-SwN-Y8DAAMN+e59N*G$e+(&G%v~<#fkQ#{l593yipwa^ZASBMR}t*
z(SEewH$Rj&iX(qMf6=@sZxkomkM{fKhw?^o<j?0Xniu7b;zaw=e&761-YAaz`TRxm
zqP$U@Xg}KTn;*&>#gRXszi3{RH;NPONBe#ALwVbB^xWjXYdPq1<NMqwFXgpP;Qu=Z
zV>OOmes;dmyxd#fnx~7g+`k(4$HBaq59h<nvAq5K?)2{~)AaiH&C7Z!hjjv)1I>Zv
zK%WEM1G)!v59l7yJ)nC)_kiw!Y5L^zZ@>TR(?7q~b2oC>+*{l4(R-ZYMC;K0jfwZo
zf$~Oi-nVYO=kxroyeMxJ=UsK`=ZtTgBjt_a*!r~2@xINK@<wsCb?KSweVZ@kjpA(U
z(o_D|31|*-=U_vR=S*?rJJ+|(m-0q&Y<*hi&I9F*;>dTdZ<{aWjpEq)w9cIe${WRz
z?_A$DU&<TBvGr-4I}emMiX-2-zHPpgH;QBH(>iw^C~p);zH@!sd?{}f$JVEH?mST5
zD2{yR`nLH}-YAZ(PwU)ypuABW`Ofui^QF8|99y5(x${7Iqd4-N>)Yl_d80VCKCN@-
zf$~Oi<U7~5&6n~<acq5B=gtG=jpE36u5X(!<&EOl`n1lS2g)18k?&mJHebpc#j*8i
zojVVdH;N<QxxQ__lsAfF>(e@S9w=`VN4|4?+k7c+6vx)5b?!V+-YAZI=lZt!Qr;+z
ztxxORd7!*e9Qn@mZS$qPQ5;*J*17XQd80V;o$K4?OL?O>wmz+M=YjG@apXJKx6POG
zMsaL?TIbFK<&EOVcdl=nFXfHm*!r~2od?Pr#gXq^-!@;$8^y8pX`MR{lsAea-?_eR
zzLYnLW9!p8cOEEj6i2>uecOB~ZxqMYr*-Z;P~IqxeCPVM`BL5}j;&AY+<Bn9Q5^Zs
v^=<Q|yipumpVqnaKzY;O|Jt>`d$u*7J74<zD&KVinuA@NgRvS%CwKk<p&a-6

diff --git a/libs/spacemap.py b/libs/spacemap.py
index 7cdcd1c..c8e2727 100644
--- a/libs/spacemap.py
+++ b/libs/spacemap.py
@@ -522,22 +522,20 @@ class SpaceMap():
         for path in self.endpaths:
             current_p = path
             target_p_found = None
+            original_path_flag = True
             while current_p is not None:
                 target_p = getPathFromRay(current_p, rx_loc, self)
                 if target_p is None:
                     break
-                if (
-                    abs(target_p.getAngle() - current_p.getAngle()) < 
-                    self.ray_trace_deg_tol * target_p.getTraveledDistance() and
-                    target_p not in rx_loc_paths
-                ):
+                angle_diff = abs(target_p.getAngle() % (2 * np.pi) - current_p.getAngle() % (2 * np.pi))
+                if angle_diff < self.ray_trace_deg_tol * max(target_p.getTraveledDistance(), 2):
                     if target_p.getEndingPower() < NOISE_FLOOR:
-                        break
+                        continue
                     target_p_found = target_p
                 current_p = current_p.prev_ray
-            if target_p_found is not None:
+                original_path_flag = False
+            if target_p_found is not None and target_p_found not in rx_loc_paths:
                 rx_loc_paths.append(target_p_found)
-
         # clean up for too nearby paths
         removeRedundantPaths(rx_loc_paths)
         return aggreatePower(rx_loc_paths), rx_loc_paths
diff --git a/syngen_floorplan_multipath.py b/syngen_floorplan_multipath.py
index 3a5496d..1acd329 100644
--- a/syngen_floorplan_multipath.py
+++ b/syngen_floorplan_multipath.py
@@ -84,7 +84,7 @@ def generateData(floormap, tx_locs, args):
         for power in powers:
             rss_vec = []
             starttime = int(time.time())
-            tx_loc = SpaceBlock(0, 0)
+            tx_loc = SpaceBlock(3.2, 3.2)
             floormap.traceRays(power, tx_loc)
             for j in range(0, rx_locs.shape[0], args.procnum):
                 procs = []
diff --git a/tests/spacemap.py b/tests/spacemap.py
index 863d383..4cafae9 100644
--- a/tests/spacemap.py
+++ b/tests/spacemap.py
@@ -53,8 +53,8 @@ def test():
 
     plotSpace(spacemap, cminmax=(-50, 0.0))
 
-    rx_locs = [SpaceBlock(3.2, 3.2), SpaceBlock(5.2, 4.3)]
-    spacemap.traceRays(0.0, SpaceBlock(0.0, 0.0))
+    rx_locs = [SpaceBlock(3.2, 3.3), SpaceBlock(3.2, 3.4), SpaceBlock(3.2, 3.5)]
+    spacemap.traceRays(-40, SpaceBlock(3.2, 3.2))
     for rx_loc in rx_locs:
         rx_loc_rss, rx_loc_paths = spacemap.traceRay(rx_loc)
         multipaths = []