From ca2d3cdba3292f9a24b22a334ca049d7a0021310 Mon Sep 17 00:00:00 2001 From: Bob Weigel Date: Mon, 30 Mar 2026 10:37:23 -0400 Subject: [PATCH] update for TestData changes --- hapiclient/test/compare.log | 120 ++++++++++++++++++++++++ hapiclient/test/data/test_dataset.pkl | Bin 3056 -> 3064 bytes hapiclient/test/data/test_parameter.pkl | Bin 3056 -> 3064 bytes hapiclient/test/test_hapi.py | 6 +- 4 files changed, 124 insertions(+), 2 deletions(-) diff --git a/hapiclient/test/compare.log b/hapiclient/test/compare.log index e69de29..977cb85 100644 --- a/hapiclient/test/compare.log +++ b/hapiclient/test/compare.log @@ -0,0 +1,120 @@ + +Dataset = dataset1; Parameter(s) = scalar; run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1405 0.1138 0.0001 +csv; pandas 0.1644 0.1104 0.0393 +csv; pandas; no len. 0.1285 0.1107 0.0026 +csv; numpy 0.1448 0.1293 0.0006 +csv; numpy; no len. 0.1528 0.1366 0.0005 + +Dataset = dataset1; Parameter(s) = scalar,vector; run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1406 0.1120 0.0001 +csv; pandas 0.1477 0.1280 0.0042 +csv; pandas; no len. 0.1406 0.1207 0.0032 +csv; numpy 0.1837 0.1678 0.0007 +csv; numpy; no len. 0.1488 0.1316 0.0008 + +Dataset = dataset1; Parameter(s) = ; run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.2053 0.1687 0.0004 +csv; pandas 0.1406 0.1138 0.0089 +csv; pandas; no len. 0.1630 0.1371 0.0081 +csv; numpy 0.1675 0.1461 0.0042 +csv; numpy; no len. 0.1487 0.1238 0.0069 + +Dataset = dataset1; Parameter(s) = scalar; run = short. cache = True; usecache = False +_____________________________________________________________ +Method total d/l->file read & parse file +_____________________________________________________________ +binary 0.2047 0.1489 0.0109 +csv; pandas 0.1789 0.1320 0.0142 +csv; pandas; no len. 0.2006 0.1373 0.0066 +csv; numpy 0.1893 0.1298 0.0045 +csv; numpy; no len. 0.1836 0.1260 0.0053 + +Dataset = dataset1; Parameter(s) = scalar,vector; run = short. cache = True; usecache = False +_____________________________________________________________ +Method total d/l->file read & parse file +_____________________________________________________________ +binary 0.1687 0.1163 0.0117 +csv; pandas 0.1722 0.1198 0.0143 +csv; pandas; no len. 0.2083 0.1543 0.0073 +csv; numpy 0.1875 0.1297 0.0057 +csv; numpy; no len. 0.1960 0.1360 0.0058 + +Dataset = dataset1; Parameter(s) = ; run = short. cache = True; usecache = False +_____________________________________________________________ +Method total d/l->file read & parse file +_____________________________________________________________ +binary 0.1738 0.1211 0.0087 +csv; pandas 0.1728 0.1248 0.0148 +csv; pandas; no len. 0.2127 0.1561 0.0131 +csv; numpy 0.1439 0.0850 0.0103 +csv; numpy; no len. 0.1147 0.0782 0.0110 + +Dataset = dataset1-Aα☃; Parameter(s) = Time; run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1639 0.1324 0.0001 +csv; pandas 0.1486 0.1280 0.0027 +csv; pandas; no len. 0.1335 0.1132 0.0027 +csv; numpy 0.1447 0.1268 0.0004 +csv; numpy; no len. 0.1046 0.0866 0.0006 + +Dataset = dataset1-Aα☃; Parameter(s) = unicodescalar-1-byte (A); run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1387 0.1048 0.0001 +csv; pandas 0.0882 0.0660 0.0017 +csv; pandas; no len. 0.0993 0.0777 0.0022 +csv; numpy 0.1299 0.1115 0.0003 +csv; numpy; no len. 0.1212 0.1044 0.0007 + +Dataset = dataset1-Aα☃; Parameter(s) = unicodescalar-2-byte (α); run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1160 0.0692 0.0001 +csv; pandas 0.1288 0.1082 0.0021 +csv; pandas; no len. 0.1348 0.1153 0.0021 +csv; numpy 0.1344 0.1175 0.0003 +csv; numpy; no len. 0.2600 0.2430 0.0007 + +Dataset = dataset1-Aα☃; Parameter(s) = unicodescalar-3-byte (☃); run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1149 0.0827 0.0001 +csv; pandas 0.1327 0.1142 0.0021 +csv; pandas; no len. 0.0873 0.0678 0.0020 +csv; numpy 0.1518 0.1332 0.0005 +csv; numpy; no len. 0.0924 0.0728 0.0008 + +Dataset = dataset1-Aα☃; Parameter(s) = unicodescalar-4-byte (👍); run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1154 0.0808 0.0001 +csv; pandas 0.0945 0.0724 0.0022 +csv; pandas; no len. 0.1325 0.1134 0.0019 +csv; numpy 0.1116 0.0938 0.0003 +csv; numpy; no len. 0.1330 0.1148 0.0008 + +Dataset = dataset1-Aα☃; Parameter(s) = unicodevector (A;α;☃;👍); run = short. cache = False; usecache = False +___________________________________________________________ +Method total d/l->buff parse buff +___________________________________________________________ +binary 0.1416 0.1073 0.0002 +csv; pandas 0.1306 0.1102 0.0027 +csv; pandas; no len. 0.0904 0.0697 0.0024 +csv; numpy 0.0921 0.0738 0.0005 +csv; numpy; no len. 0.0990 0.0811 0.0008 diff --git a/hapiclient/test/data/test_dataset.pkl b/hapiclient/test/data/test_dataset.pkl index ccba5787e5b6f6b72e854806c770540bc0d14408..17b6246976699204e71728ab32e5c589d3b3bfee 100644 GIT binary patch literal 3064 zcmcIm30o6M5asd!6&3N;wY{T~I057kqaui438F+DQPd{sWM)lfQgaAlH@ohA-}mt& z_8;z6%}kIG*L6QX`SQ^{Gd1;Izk1cvPn#;(5Yt;58X8yoUl>^vxU~i=~2^Sx&U3F40=OeMMZ9Zk^s)gO}E{ zv-IP<>-BZ?C?m7V$|!8rTj**!ot(ioy^W?N>Byq;l;h%tIouel;HFp*W6^DF52k68 zrkjJQS1u{s5~MU;+v5jY^)-~ow@lB)4!xP?x6&iHEeOw1*k3L0Ngv!0oWh zui%cD(H`7&GqNBZ+-YnHF0-~jUr@Nq=+GPKog(fwI)j{+v~W)#Mpn5Q$1HiKZQ)*h zFGbCmmJ$o{3H>uYL-c8ya79Turk%xo1h${Sf&v9#rsd%qgvYwjT;-L62aFDbp}1`E z?qqL&??6vq?*Izpzab71#GzUU*K_c2v?Q9FRvwQS9aBco`JfMX261q%hsNK*Uwszt;?2z?WUEk2|WmA9R8 zQI_yT1y6=$&D$i(DQF1FGcU6OyPz?+@biT-#-Yh4dOIn@Nc6t2bHY=u7cs;Hu{mA4 zT(SacRWgw+l2pQ~8M;YXHmIfr-9QZy8C26|v4#;(>~;QM>~+B)UKd{j zuVLbKsg@UeawJkL^5p0WPZE*KA(8*(%`pPH!a(fJP=LUjyh@c4OD#MT?Ar`b? ziOkLoa*ce*EtwhlJ7Cm3kvZ`?@tCe%FuU?bl}6;s zn=4#76BzFW&P;Q4ZoP);+$OSjm@IEMp=d>FeiQYmK9QsE);W5XDcy@f6ErIlB1`Y5 z7iwEsz`n4iuB@QO6#JboJ#VrlttI0Jpq4+Ag=XJH7=K?=^p1-J;qa0y0W6fVOU zT!C?zfU5v-4JKg4}7s_fAUq(HRHq66Zms*GU-le_)B;Q4NhYC kYXyG`Pe~a&tMK>9zgmLUDJs{MInrhgf>1!Jr8a&^rj2OPeMtvQfcBj(4iF9|O zCq0c#daDXBTwg^rtB7=eUn-GG({~zM^o<;0lq)4UwU}s?-cA=^gk@8y0s5vXezm?j z%;*OmuBqW#O>dzKIVUf%_4?l}`WiYbOV2Zk65I49I=cb5E>PEVMqb)EiR;xfliBnX zZqPSzzDR$Ob7LLnCcTZ~Du!#6r7v9%H_zY}t%h4e{eo30;kF5t*QO9`SBF`P4!0}h zlC+Dyi92AYy5mz!LAx6!e-4Hd4Wl2RE;P)RGm}MpiY8fsfsCR3J9=+G7Lx0 z3#TA_>G=^Oriq9B;Hl}7iih0{6rXYr(VXU5Zl}-`eG=+B5ZO7En#MCE)Jb>QDB`)h z#7U7Bp3FIR9(!X`C$C^1HEYowXQ>A5i?WfA`bl;`qr_vB__C2RMb0T#99!DHusmT1 zFYXf~=9JJod8<$$@SG}_XDvv~%;0%wHVBhf=2MyT9TzWfx1-)f z9=k|bLvI}GQVeU@B$|$f=zn=}jQvY8Y_%r!zRGK?5{$=b;5w!D?6oYoV20z|}3d5(9dXsNy_Xm|ro* z7O)x^@%?Ur=-+--`gdaVHKum$f>rPjaD zqL&1Ef%;fUQI$Ta;isBOmHBMN%0L^egY~chHo_*@3|n9;Y=d^#4m+R&c0woYg59tO z_QF2c4+0LrK{y15;RqasW1zutH~}Z23lfloQ;>o*bVCoEhBMF$eQ*}~VE_i<9Aw}; zT!4!(1eahKM&L4x!W9^UakvTq*Wfx#zzvv$n{W%JAPcwQ4%`JD?!h$NhX*hN58)9! z1_NdxSKrOgUv%?}<=y;}D*P2!_yE<2H=~!k@#|QPzu_8x%R5OMt1c;X=>6{&%ltjP zQU0Ln{G-PHTZ|^J`fk7*$M^{T6z!W&$aOyx)-URTU$vE*P(R7vqNlIZ)4vBY?%6*A WsTRlB(BwG&sopZWlPUZwNd61sENm|T diff --git a/hapiclient/test/data/test_parameter.pkl b/hapiclient/test/data/test_parameter.pkl index ccba5787e5b6f6b72e854806c770540bc0d14408..17b6246976699204e71728ab32e5c589d3b3bfee 100644 GIT binary patch literal 3064 zcmcIm30o6M5asd!6&3N;wY{T~I057kqaui438F+DQPd{sWM)lfQgaAlH@ohA-}mt& z_8;z6%}kIG*L6QX`SQ^{Gd1;Izk1cvPn#;(5Yt;58X8yoUl>^vxU~i=~2^Sx&U3F40=OeMMZ9Zk^s)gO}E{ zv-IP<>-BZ?C?m7V$|!8rTj**!ot(ioy^W?N>Byq;l;h%tIouel;HFp*W6^DF52k68 zrkjJQS1u{s5~MU;+v5jY^)-~ow@lB)4!xP?x6&iHEeOw1*k3L0Ngv!0oWh zui%cD(H`7&GqNBZ+-YnHF0-~jUr@Nq=+GPKog(fwI)j{+v~W)#Mpn5Q$1HiKZQ)*h zFGbCmmJ$o{3H>uYL-c8ya79Turk%xo1h${Sf&v9#rsd%qgvYwjT;-L62aFDbp}1`E z?qqL&??6vq?*Izpzab71#GzUU*K_c2v?Q9FRvwQS9aBco`JfMX261q%hsNK*Uwszt;?2z?WUEk2|WmA9R8 zQI_yT1y6=$&D$i(DQF1FGcU6OyPz?+@biT-#-Yh4dOIn@Nc6t2bHY=u7cs;Hu{mA4 zT(SacRWgw+l2pQ~8M;YXHmIfr-9QZy8C26|v4#;(>~;QM>~+B)UKd{j zuVLbKsg@UeawJkL^5p0WPZE*KA(8*(%`pPH!a(fJP=LUjyh@c4OD#MT?Ar`b? ziOkLoa*ce*EtwhlJ7Cm3kvZ`?@tCe%FuU?bl}6;s zn=4#76BzFW&P;Q4ZoP);+$OSjm@IEMp=d>FeiQYmK9QsE);W5XDcy@f6ErIlB1`Y5 z7iwEsz`n4iuB@QO6#JboJ#VrlttI0Jpq4+Ag=XJH7=K?=^p1-J;qa0y0W6fVOU zT!C?zfU5v-4JKg4}7s_fAUq(HRHq66Zms*GU-le_)B;Q4NhYC kYXyG`Pe~a&tMK>9zgmLUDJs{MInrhgf>1!Jr8a&^rj2OPeMtvQfcBj(4iF9|O zCq0c#daDXBTwg^rtB7=eUn-GG({~zM^o<;0lq)4UwU}s?-cA=^gk@8y0s5vXezm?j z%;*OmuBqW#O>dzKIVUf%_4?l}`WiYbOV2Zk65I49I=cb5E>PEVMqb)EiR;xfliBnX zZqPSzzDR$Ob7LLnCcTZ~Du!#6r7v9%H_zY}t%h4e{eo30;kF5t*QO9`SBF`P4!0}h zlC+Dyi92AYy5mz!LAx6!e-4Hd4Wl2RE;P)RGm}MpiY8fsfsCR3J9=+G7Lx0 z3#TA_>G=^Oriq9B;Hl}7iih0{6rXYr(VXU5Zl}-`eG=+B5ZO7En#MCE)Jb>QDB`)h z#7U7Bp3FIR9(!X`C$C^1HEYowXQ>A5i?WfA`bl;`qr_vB__C2RMb0T#99!DHusmT1 zFYXf~=9JJod8<$$@SG}_XDvv~%;0%wHVBhf=2MyT9TzWfx1-)f z9=k|bLvI}GQVeU@B$|$f=zn=}jQvY8Y_%r!zRGK?5{$=b;5w!D?6oYoV20z|}3d5(9dXsNy_Xm|ro* z7O)x^@%?Ur=-+--`gdaVHKum$f>rPjaD zqL&1Ef%;fUQI$Ta;isBOmHBMN%0L^egY~chHo_*@3|n9;Y=d^#4m+R&c0woYg59tO z_QF2c4+0LrK{y15;RqasW1zutH~}Z23lfloQ;>o*bVCoEhBMF$eQ*}~VE_i<9Aw}; zT!4!(1eahKM&L4x!W9^UakvTq*Wfx#zzvv$n{W%JAPcwQ4%`JD?!h$NhX*hN58)9! z1_NdxSKrOgUv%?}<=y;}D*P2!_yE<2H=~!k@#|QPzu_8x%R5OMt1c;X=>6{&%ltjP zQU0Ln{G-PHTZ|^J`fk7*$M^{T6z!W&$aOyx)-URTU$vE*P(R7vqNlIZ)4vBY?%6*A WsTRlB(BwG&sopZWlPUZwNd61sENm|T diff --git a/hapiclient/test/test_hapi.py b/hapiclient/test/test_hapi.py index fc038a3..bb80dbc 100644 --- a/hapiclient/test/test_hapi.py +++ b/hapiclient/test/test_hapi.py @@ -69,6 +69,7 @@ def test_dataset(): return else: metatest = readpickle(pklFile) + import pdb; pdb.set_trace() assert DeepDiff(meta,metatest) == {} @@ -332,9 +333,10 @@ def runall(): if __name__ == '__main__': #runall() - #test_dataset() + test_dataset() + #test_parameter() #test_reader_short() #test_unicode() #test_request2path() - test_reader_short() + #test_reader_short() #test_none_stop()