From 27d024d76c3c860bc4e0c5c75955127186eaa60a Mon Sep 17 00:00:00 2001 From: crazyzlj Date: Fri, 4 Nov 2016 21:56:36 +0800 Subject: [PATCH] update --- ...-any.whl => PyGeoC-0.1.0-py2-none-any.whl} | Bin 9289 -> 9592 bytes dist/PyGeoC-0.1.0.tar.gz | Bin 0 -> 8138 bytes dist/PyGeoC-0.1.tar.gz | Bin 7893 -> 0 bytes setup.py | 2 +- test/StatisticsByMask.py | 14 +++++++------- 5 files changed, 8 insertions(+), 8 deletions(-) rename dist/{PyGeoC-0.1-py2-none-any.whl => PyGeoC-0.1.0-py2-none-any.whl} (58%) create mode 100644 dist/PyGeoC-0.1.0.tar.gz delete mode 100644 dist/PyGeoC-0.1.tar.gz diff --git a/dist/PyGeoC-0.1-py2-none-any.whl b/dist/PyGeoC-0.1.0-py2-none-any.whl similarity index 58% rename from dist/PyGeoC-0.1-py2-none-any.whl rename to dist/PyGeoC-0.1.0-py2-none-any.whl index 3eb225ff9eec58133646181f8d16b12efb6f9c88..e4911b0a3147ffc2a741d677f87f9df3c621ec73 100644 GIT binary patch delta 3073 zcmZ`*X*iS(7oH3$go&|@(2TM48ipkMnq@GIT{2NrmTXxvqOm4J*;5TtS)0gGw(Kop z#uma@YDOBbZR`})NB!viyx;dc*ZFa->)g+|uKRw@Id_N2rfGRBp9I9)9YqPyKi{|y z07wA>08#(|0E08W;Aen9$}7qv(@miw_&Do|v{4D(`LBf1vU0>bY^uK7SAx6LWH+|c z15qlebU;XVdAdnkA|pG8;ymrR-Wb8G$eM!OQ+OJtlZ3s46grd>kRsOQQ5327*4m0+ zcRCBGY}Atv|JxrhfWQoONMY67k^)m;>$Z20v91xar~FmTT$IxwLy2!`qsxW(>jbiT z?p7VXQGK8bb88w{XR=J`QCID^K#Oz{nt9w_Vs9`*B((BG3l1j(vD(9(Zi+S&}j8G$yV8y?Ljj7p*=rN3>PI`#drH>Ci`Z=oIa) z5&<-__PtsF=Vlb}1TUFdy4s5GnB_lkF#+RphpZN}O{h$}G%ey&-|Qt?(&?0Y@rt(7 z6YV8N(cvK^$;1;ZAE5iKOzYho_l)^!n+|g}zVdnSLB+pTS#PUfK{*N?m?@QJ#@~8y zT^da-ra-fdQUogE!+9YRKkSr3b>N(3!Z9DEm9}x(PFw~e#8C_AR3*ZzH{dvqUZXco zOW4?6Y|$_9FgJt97Y?R-67Hgn7LIy4=Zr(H70qP}AAS6OT}ZIS2ePF{Hb*1HYs~eI z^$aUu%z&)?JHj3S?8^P#QI`PU$z*mydavBsP)IrwtnllgCv>Eys|&jnAI{JZB*qsjAzY ze=`nROhuGGb#%%;kkuZ zX3M@&2sd7;;WcaFn(;uRCQ+Sz0$Gzp+9%Q3%<2-e+90*i|jBb_wb;qUL{ z&-knly{GyLEF{Kvxzxuj;SGN!5&ClDrUxVZW<%v+Xt!;Qs zIsHT^`YbxC3$u3Iw^GgZQdj{;SN{!7`|g!Tn=x68CMSnh8|rNY`Ze}YVP&m$jfA5b zp~o-qbzAE>89_U;@+?Vec+AXrh1u$9YV0wEodVrSdll|v*^cNqAqP8c=JQ0fDH)6( zzx((D`9o!+f^iVm7v3N{b5j!C>P^klXgHGMa~tXR!lNwY%lBI471m;p?7|5;iw}|! z7>kSd)R1znvYbO1EO1@2ZZAIHmbVgMoM*s^TCeuR_Qc3K>PRjFRF%gV=NJN^{PD{{ zh~VL=u-EpuJ{#RT72~b2O&x)gjtzE?JT(d1U0N}{~9~)~!154{u!2=zYk4$;@e~K_( zB}SqZW#ks3tw4r&Vg3LEen(2W($?ybShwd^tgq5Zus9xmaLY5{7)bh}s}V&W)lWwW z+v`Y<97YHGku)Mgyq%sV9POa|B$t$}J#8JaowDzSd3Vv=o^~Hq~x3r0hO~{njD8*s1;uB6x9wn?obiE-|tl zz&Tx0E}N)f(^g)?o}DS@r!7VXT@43j1i?4XzWy+(HMX@l@Ftpi2FF|o=hN3sgK@%= z&NQ5`8kvxKR+d)jb8&uCt&~L}HV;NMvzp`9YOeR=wndiTHyGEqHZy!5AKNXxzO0D2 zA4(Q1juXTWx1FZiPQ`06-IgrsZ+rVC4lFq4pl~%AzzFXNT@`C{_EvTJ5=cY{z_nuU zN1~Fgl9w5u1!sm$9``@gO^DP;9_R2`xUbLk94V8aAvZudI~2hX!_FyYg%L2|?Zt+C zbEh8SU_ZMg<^|}|!Ue0>R!M%r4>{ReS)F9}o8iaW`lAo?#T45YkrMZv|ABhbKV{#@ z;_w0-WpbFTya={7U)HdK#pfKDI|)2C7HOHfQ9jNfxb$39E);L1HY z#k2WRE5LQ4@TBF76OQh;2lcO$sPslhDt{TFo>#3yyYNktHYnLerVI12`8!Y5M=>2B z=wC)OT>&b(Z`XfH$^S3cvNP4cp6aM;;62AP8!G(^ve&=-flTd%FrkvaAbYR(AIJ%z zJzaEQzae|?_#a5*UPv-b^jDX?SN#tJBD|-|5KP?e7d3k}+8>Ddj(PZ}cld`b_`TmS UW^DU+%lUTR^E(R>AhDbM2W}%h@c;k- delta 2750 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 literal 0 HcmV?d00001 diff --git a/dist/PyGeoC-0.1.tar.gz b/dist/PyGeoC-0.1.tar.gz deleted file mode 100644 index ae15eca6876228bb1f78bb54ce4185bb4eb6cb42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7893 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 diff --git a/setup.py b/setup.py index a05bae6..53b45b8 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def run_tests(self): # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='0.1', + version='0.1.0', description='Python for GeoComputation', long_description=long_description, diff --git a/test/StatisticsByMask.py b/test/StatisticsByMask.py index dbc459f..d9294ce 100644 --- a/test/StatisticsByMask.py +++ b/test/StatisticsByMask.py @@ -18,22 +18,22 @@ def StatisticsByMask(simf, obsf, maskf): E2 = 0. for row in range(rows): for col in range(cols): - if not FloatEqual(maskdata[row][col], nodata): - tmpx, tmpy = maskr.GetCentralCoors(row, col) + if not maskdata[row][col] == nodata: + tmpx, tmpy = maskr.GetCentralCoors(row + 1, col + 1) simV = simr.GetValueByXY(tmpx, tmpy) obsV = obsr.GetValueByXY(tmpx, tmpy) if simV is not None and obsV is not None and \ - not FloatEqual(simV, simNodata) and not FloatEqual(obsV, obsNodata): + not simV == simNodata and not obsV == obsNodata: n += 1 E += (simV - obsV) E2 += (simV - obsV) * (simV - obsV) - # print n, E, E2 + print n, E, E2 ME = E / n RMSE = math.sqrt(E2 / n) return ME, RMSE if __name__ == "__main__": - MaskRasterFile = r'C:\z_data_m\ArtificialDEM\MASK.tif' - SimulateRasterFile = r'C:\z_data_m\ArtificialDEM\SaddleSCA.asc' - TheoryRasterFile = r'C:\z_data_m\ArtificialDEM\SCATh.tif' + MaskRasterFile = r'C:\Users\ZhuLJ\Desktop\ME_RMSE_testdata\region.tif' + SimulateRasterFile = r'C:\Users\ZhuLJ\Desktop\ME_RMSE_testdata\result.tif' + TheoryRasterFile = r'C:\Users\ZhuLJ\Desktop\ME_RMSE_testdata\theoSCA_1m.asc' ME, RMSE = StatisticsByMask(SimulateRasterFile, TheoryRasterFile, MaskRasterFile) print "ME: %f, RMSE: %f" % (ME, RMSE)