From 8b3e8710c9399d72c5bbe79b6f13a1fd8776ae2f Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Tue, 27 Jun 2023 12:07:53 +0100 Subject: [PATCH] added new properties_input for unit testing --- .../recommendations/FloorRecommendations.py | 4 +++- .../tests/test_data/input_properties.pkl | Bin 34169 -> 34268 bytes .../tests/test_floor_recommendations.py | 21 +++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/model_data/recommendations/FloorRecommendations.py b/model_data/recommendations/FloorRecommendations.py index 8b47e31e..d120dba0 100644 --- a/model_data/recommendations/FloorRecommendations.py +++ b/model_data/recommendations/FloorRecommendations.py @@ -84,7 +84,9 @@ class FloorRecommendations(BaseUtility): PART_L_YEAR_CUTOFF = 2002 FLOOR_LEVELS = { - "Ground": 0 + "Ground": 0, + # We don't know what floor level, we just make sure it's not 0 + "mid floor": 1 } def __init__(self, property_instance: Property, uvalue_estimates: UvalueEstimations): diff --git a/model_data/tests/test_data/input_properties.pkl b/model_data/tests/test_data/input_properties.pkl index 6fd5b7976d825a0da9c3b7154a1a745f03751d7b..09aa1dc953b753f4bedc4e736f58bfd9f66b61b4 100644 GIT binary patch delta 2489 zcmbVOYitx%6lSK|UCQ=ppU~G(ifqA!mO>vqEFvudy3;4rR-o)|r+fEyc4xb@L$igl zfQl_lRC33d8WVniCN_$}8v`av3xbct9|$G}FviNST7h6#3@Fw+vyZlbLQIoy?{@CJ zbIy0Z@0`7RkpA%yt=p@6^ScwepfS0RGv~m0$tK6U1$X=8 zkt>lcaybeln9$zDlo+xRD~UDK>f=&6pv{Ih z(`N@<$1{vuV4QBW+mxo$n2fC`LZ6#f=C9RmdY)iE2+BHAYEF^hy2u6S{+5z3_m-mJ z+#qCW@|H&JP?L%hY>w`|1v41fLcaFH7YM>u71{{M`VK*|@tgv;;`W6LV(B3YHFOo? z50)IEsJC%#NgYjfqv7Ud_(JJUIw_gF1Dv$*k?Pc!@kwK$d_b}qps9Sz`5!w$~?MhSrE|3mXnCqT#PDPmmvDAK4l8~ z@+_ichu7+Iab5-fS0z}D{0A!lht*_M%2|1qQ*8Hy>Y?<@@lFwCRW#Tis6c6P@uF}A zV4WIqlwUcc-s<%^tvnNAlX39YUZ>lkOyOKMctU#=jd-|Cys7 z<5(*Ve2d%#bJX|cswq#fFpqo=z1hhd+G zQ+`li2~9*zJg4c3>zFF5sa6)XO~lG1?Ey)$ftc_>(8B`kZ*@?V7mv0rr*)fkgqNzi za@4RbJ4zB7s#}B3Z@U!X>GbvkDo@orDhW?GV7oe%pzR!AGX^h_dmd-$Ne18*vR$j_ zWP0!#PVNL0-Ay4+?`-6*(xcb*>hTdrWi-l6v@4szsc;oV!l>`U6!ksUxoSi6B8M6y z-Dx>KDoD}p^i{+!1zs5OOG;n1KIC$8&a{*J)>* zYEKcJf?EOiSnwAM?z7-;7EH)9h0ad1hqHDma0Vfng_MT0hW|2o`o;XEs`+GNridqml3g5 z?9s$F99S7PWen81VJW&$sz=9X>d~IKRCKd63%|6#k~Xm6Uk4*E^OiAKN5c4DGCZWl PuXb^GjYw0naf|-}Y{nxH delta 2421 zcmbW2drTBp6o;K*Sl$Sghb#gkpe|AYg(65RJ|afNu|Pr8D9-K<+`a5F%g&A#8hoWR ztd5WNjd<8VxTEyJ8gO$ojQg9SZ0xBxCHf>*a{(RSG-DPD(7 z2WPdo6>eL-q{ynrCh15o*sb^I7H}CQCobea0hd&(7T+Ovw1k&@7j)4UqJs$*bSN=7 zf;i&ii8T!3lIAcY=uF%+RGoBf`Up@JE#4(MI$D4vdL12Y#^#0tZb*)aU`Fufltd=^ z8D`29RpUIe+#2vWWy**I*9Gu98f&(p@zlJeQ9;!rw~J1v5^yO=D~i9qvief@(8`l3 zFA-0ec9|JPrRj@F2=}-wd@#KriaCNm$S!A@6Zj_oJr-I_`7^dc ziDDM|G=DlXj(*B-iir$8A85?OTW1Zj@*MvPOYn_0^@aK-g%>;QytT_MDvAyZ$vXi) zZP+5i78|z2u=5RDN~{l-5v!Sk>nKBLfQ04b(jU-UmVC~jc*SDRSz@eON^Bn()i_dC zNmt>rkn>V$et`MAFMgag3Ts)iOJW%=$8=FWz0NyuhvbWr68urILRzBMw z^Qz|BMSWVdLupZDr^BxMfIlV`+=i(%HVPh2r&km;%%N8ywCL1A%T5YYn@V)$;=Mrf zxMamEdi4o(wOF@DZu5vPm*mmme~}gpxDOJBAJH5rVnK@~k-8mT8<6aJpB7K<(2tf> z)Lv0l@BsSKl9IvzdbpNG9R}N9VdleNwJ5jf@j67OZqS9BsPje~Q#mV=vEt&z`5fzJ z(FJ)1?p$`1O)QEa!MsO)eyCY1LQqT6^3oUZ>x*6UF221+2c&P#ovr(=H~TETIXQWRC? zv#=1ovC6XONrmmlP4*9qndE@>SH~vM=+7VfCiXe^aT0ySYFEZ2ykt#S(=_k0NqJwO zS=U|n&x^EC;bDcthGSo^;kY9t3$&C=#W&W)Fku~M*AX2b!RP8NEZe}LTfCWtG8!l? zLuT8v*xOhZm@;S9hu{xvo*8JYRm~gApHRfmOzDTS@9arIH=CpVtufYY-$|41gMoGq zB>jMzw1fsSbe$64<`lb$Dq&bz6I)g>oJh-(9et{51rdQ6Z-P8W3LmXy)Hp>iU&hyX zB)jBs*xLDJ_~#7*!?;m@_a1zD6K1#u;)?!=$UwU`SBBuB8|#*!r?z|<<`>uU3g!3O z*2*A1R2@@_&9?mkaHl0_%`hCGAAU@qhY`VViMvtuFabD(t*wAzWd?oGoq_f>#N%6S zl`PYM3*ojvxO6am)_#Ct262g!{Wm_ZT`lkePw_o(VeoeCISY?ukNL&o4nO<>8|{ zda0Ijc2xzn6akHSSc;a+G@+BxCbT1F8os)xE}*TvUgz3jxR!+RzqI9}@zYrihlt)( Ht5ozaN@WF? diff --git a/model_data/tests/test_floor_recommendations.py b/model_data/tests/test_floor_recommendations.py index e6a3c012..95e17ce1 100644 --- a/model_data/tests/test_floor_recommendations.py +++ b/model_data/tests/test_floor_recommendations.py @@ -4,15 +4,16 @@ import os from unittest.mock import Mock from model_data.recommendations.FloorRecommendations import FloorRecommendations -with open( - os.path.abspath(os.path.dirname(__file__)) + "/model_data/tests/test_data/input_properties.pkl", "rb" -) as f: - input_properties = pickle.load(f) -with open( - os.path.abspath(os.path.dirname(__file__)) + "/model_data/tests/test_data/uvalue_estimates.pkl", "rb" -) as f: - uvalue_estimates = pickle.load(f) +# with open( +# os.path.abspath(os.path.dirname(__file__)) + "/model_data/tests/test_data/input_properties.pkl", "rb" +# ) as f: +# input_properties = pickle.load(f) +# +# with open( +# os.path.abspath(os.path.dirname(__file__)) + "/model_data/tests/test_data/uvalue_estimates.pkl", "rb" +# ) as f: +# uvalue_estimates = pickle.load(f) class TestWallRecommendations: @@ -48,3 +49,7 @@ class TestWallRecommendations: assert obj assert obj.property assert obj.uvalue_estimates + + def test_premises_below(self, input_properties, uvalue_estimates): + recommender = FloorRecommendations(property_instance=input_properties[0], uvalue_estimates=uvalue_estimates) + recommender.recommend()