From 02aa17938916f269bf55cdd947020ed074ccb0eb Mon Sep 17 00:00:00 2001 From: Matthew Ellison Date: Fri, 1 Mar 2019 20:03:04 -0500 Subject: [PATCH] Fixed bug where part returned by getStr was off by a factor of 10 --- mattrixwv/Stopwatch.class | Bin 3039 -> 3028 bytes mattrixwv/Stopwatch.java | 4 ++-- testStopwatch.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mattrixwv/Stopwatch.class b/mattrixwv/Stopwatch.class index da3ba87740f803ffb7ecdc512d24dbff9af95875..2c50653da50b3328ed7b4ee63712564530372399 100644 GIT binary patch delta 1140 zcmZWnSx*yD6#iy9?Y$i?6ibkRfTDt>RhCvjaRDiah=7P&MbQEkMWje8?$&+ZaMZ*Y zU-eOOK|-SO#Tb1tM&Et*FPNa7JJTr9dHC*k&-a}(bIzG>SzojKAAe510Z@f|I&!hb z2@jeitkuzsbvjzmDp{LOvGtO*kNQg!L2PishYp=!qhy<7%+Y)C5bYW3oJs3Kq*QX_6rOm$}l8w0K)qsW750`CmIZnhr1ytM!leV@!M@VA?*2$mT;K$bFr1Xx34v2MEpP^B$ypbT zdg8J8aCoRC65kW;jkz2+$8lcZ0xoh~;<(Ilh2tv6wdbGJU8?OmZWxR0_Z>H-<+ky~ zUaZ_PrtFWjy9x@8PmX-!ox_*#&@w=?QDtK$qu%HgG&Jg$&`-Aj=?a}L?<*)?)v#VS~mbTICr{4$>9miaa)Gf7;U6hl0>`EPn9?YxRg zEFniVmJ!O<<|JF=-f^&T@Fx_rdUDVS)3@Am8*h1DrmSZvHKecjqh#i#ME}hVl4IpG zN9uo$Msn0lbGZI( zWou7qC@KQRFTFD%_mB@U1s6k*!B<{TFoiCY*Qc0|jrQDNW~@e|IZl;!>Vubf4(+g* oPNZ{+c(AZG2e)8g6xryaa1jlEC$+oF#BLLNOzbr=V#&LI16)+CAOHXW delta 1090 zcmZ8gNmCO+6#gceq$gt+OV|pKB|;Dq!xj(?A`t{c1Vr2rMFNQ+AVGq-AjW-PfN|pw z=nsAn z3mj+?uuDZVT2!=Rw_t55#r6o+K3!TAuESmnT-c`)>=*2SiaNB5?Lo7*g$mMV_I5;w zf)0j5!qKVXFpj9GN0$Xo9JP|6*9u91L4Z+!EWm_b1;-f%7zQQq#^K?>Xzh?M6bgix z0Yfi8B}(!MhGFfSR2VLWo1+ND93?1b2y%?zB*Q322xA6OH_2`Hq#UE~s>acse_o z&J`7mkdmoDWz^oHtPKl$3<;n^O?0eEMhRO`B`!eGY`Ts_tKygkn};$-T!P3l>+wp$ zt$*FQbV=dnQFkIN!T&R=$x;0$L;I?vC#_VgCCwYrv{XyRKS~2B+oDR-Dy4~(ny50l zN@*pf7TXESv^mRce)`}75?ZVorZ>p!FgoXvwSesQ4%roD3$S_QS6HWwsP48Lz#~6L zZK}M8+z77_+#cah!SfF`(ly9s443|8Ljhqdx!u diff --git a/mattrixwv/Stopwatch.java b/mattrixwv/Stopwatch.java index c4c95b0..258b962 100644 --- a/mattrixwv/Stopwatch.java +++ b/mattrixwv/Stopwatch.java @@ -101,8 +101,8 @@ public class Stopwatch{ } //Turn the number into a string - Double durationFraction = ((duration % 1) * 100); - String time = String.format("% 3d.%03d", duration.intValue(), durationFraction.intValue()); + Double durationFraction = ((duration % 1) * 1000); + String time = String.format("%d.%03d", duration.intValue(), durationFraction.intValue()); //Tack on the appropriate suffix for resolution switch(resolution){ diff --git a/testStopwatch.java b/testStopwatch.java index d715cf1..6f3a4fe 100644 --- a/testStopwatch.java +++ b/testStopwatch.java @@ -56,6 +56,7 @@ public class testStopwatch{ //Print the results System.out.printf("The timer results in: %s\n", timer.getStr()); + System.out.printf("The timer results in: %f milliseconds\n", timer.getMilli()); if(!failed){ System.out.println("All tests completed successfully");