|
@@ -29,17 +29,29 @@ public class Elapsed {
|
|
|
sTime = System.nanoTime();
|
|
|
}
|
|
|
|
|
|
+ public String elapsedTimeStr() {
|
|
|
+ return elapsedTimeStr(getElapsed());
|
|
|
+ }
|
|
|
+
|
|
|
public static String elapsedTimeStr(long elapsed) {
|
|
|
+ long hours = TimeUnit.HOURS.convert(elapsed, TimeUnit.NANOSECONDS);
|
|
|
+ long minutes = TimeUnit.MINUTES.convert(elapsed, TimeUnit.NANOSECONDS);
|
|
|
long seconds = TimeUnit.SECONDS.convert(elapsed, TimeUnit.NANOSECONDS);
|
|
|
- long milliSeconds = TimeUnit.MILLISECONDS.convert(elapsed, TimeUnit.NANOSECONDS) % 1000;
|
|
|
+ long miliSeconds = TimeUnit.MILLISECONDS.convert(elapsed, TimeUnit.NANOSECONDS) % 1000;
|
|
|
long microSeconds = TimeUnit.MICROSECONDS.convert(elapsed, TimeUnit.NANOSECONDS) % 1000;
|
|
|
long nanoSeconds = TimeUnit.NANOSECONDS.convert(elapsed, TimeUnit.NANOSECONDS) % 1000;
|
|
|
|
|
|
+ if (hours > 0) {
|
|
|
+ return String.format("Elapsed: %,d hr. %2d min. %2d sec. %3d ms. %3d us. %3d ns.", hours, minutes, seconds, miliSeconds, microSeconds, nanoSeconds);
|
|
|
+ }
|
|
|
+ if (minutes > 0) {
|
|
|
+ return String.format("Elapsed: %2d min. %2d sec. %3d ms. %3d us. %3d ns.", minutes, seconds, miliSeconds, microSeconds, nanoSeconds);
|
|
|
+ }
|
|
|
if (seconds > 0) {
|
|
|
- return String.format("Elapsed: %,d sec. %3d ms. %3d us. %3d ns.", seconds, milliSeconds, microSeconds, nanoSeconds);
|
|
|
+ return String.format("Elapsed: %2d sec. %3d ms. %3d us. %3d ns.", seconds, miliSeconds, microSeconds, nanoSeconds);
|
|
|
}
|
|
|
- if (milliSeconds > 0) {
|
|
|
- return String.format("Elapsed: %3d ms. %3d us. %3d ns.", milliSeconds, microSeconds, nanoSeconds);
|
|
|
+ if (miliSeconds > 0) {
|
|
|
+ return String.format("Elapsed: %3d ms. %3d us. %3d ns.", miliSeconds, microSeconds, nanoSeconds);
|
|
|
}
|
|
|
if (microSeconds > 0) {
|
|
|
return String.format("Elapsed: --- ms. %3d us. %3d ns.", microSeconds, nanoSeconds);
|