From 4c87caedfe398e3c3855ffdfe072baa634492667 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 11 Mar 2018 18:20:33 +0100 Subject: [PATCH] add better younger comperator for millisenconds --- dist/smarttime.classes.timestamp.d.ts | 3 ++- dist/smarttime.classes.timestamp.js | 12 +++++++++--- test/test.ts | 6 ++++-- ts/smarttime.classes.timestamp.ts | 9 ++++++++- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dist/smarttime.classes.timestamp.d.ts b/dist/smarttime.classes.timestamp.d.ts index 274a366..1450c65 100644 --- a/dist/smarttime.classes.timestamp.d.ts +++ b/dist/smarttime.classes.timestamp.d.ts @@ -35,5 +35,6 @@ export declare class TimeStamp { * @param TimeStampArg */ isOlderThan(TimeStampArg: TimeStamp, tresholdTimeArg?: number): boolean; - isYoungerThan(TimeStampArg: TimeStamp, tresholdTimeArg?: number): boolean; + isYoungerThanOtherTimeStamp(TimeStampArg: TimeStamp, tresholdTimeArg?: number): boolean; + isYoungerThanMilliSeconds(millisecondArg: number): boolean; } diff --git a/dist/smarttime.classes.timestamp.js b/dist/smarttime.classes.timestamp.js index 2fdbc47..8df737a 100644 --- a/dist/smarttime.classes.timestamp.js +++ b/dist/smarttime.classes.timestamp.js @@ -30,7 +30,7 @@ class TimeStamp { * @param timeStampArg */ static fromTimeStamp(timeStampArg) { - let localTimeStamp = new TimeStamp(); + const localTimeStamp = new TimeStamp(); localTimeStamp.change = localTimeStamp.milliSeconds - timeStampArg.milliSeconds; return localTimeStamp; } @@ -46,7 +46,7 @@ class TimeStamp { return false; } } - isYoungerThan(TimeStampArg, tresholdTimeArg = 0) { + isYoungerThanOtherTimeStamp(TimeStampArg, tresholdTimeArg = 0) { if (this.milliSeconds > TimeStampArg.milliSeconds + tresholdTimeArg) { return true; } @@ -54,6 +54,12 @@ class TimeStamp { return false; } } + isYoungerThanMilliSeconds(millisecondArg) { + const nowTimeStamp = new TimeStamp(); + const compareEpochTime = nowTimeStamp.epochtime - millisecondArg; + const compareTimeStamp = new TimeStamp(compareEpochTime); + return this.isYoungerThanOtherTimeStamp(compareTimeStamp); + } } exports.TimeStamp = TimeStamp; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUE7OztHQUdHO0FBQ0g7SUF1Q0UsWUFBWSxVQUFtQjtRQUwvQjs7V0FFRztRQUNJLFdBQU0sR0FBVyxJQUFJLENBQUM7UUFHM0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2hCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUN6QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDMUMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNuQyxDQUFDO1FBQ0QsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3hDLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUE5Q0Q7O09BRUc7SUFDSSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsZUFBZTtRQUM1QyxNQUFNLENBQUMsSUFBSSxTQUFTLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVEOzs7T0FHRztJQUNJLE1BQU0sQ0FBQyxhQUFhLENBQUMsWUFBdUI7UUFDakQsSUFBSSxjQUFjLEdBQUcsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNyQyxjQUFjLENBQUMsTUFBTSxHQUFHLGNBQWMsQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDLFlBQVksQ0FBQztRQUNoRixNQUFNLENBQUMsY0FBYyxDQUFDO0lBQ3hCLENBQUM7SUFpQ0Q7OztPQUdHO0lBQ0ksV0FBVyxDQUFDLFlBQXVCLEVBQUUsa0JBQTBCLENBQUM7UUFDckUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxlQUFlLEdBQUcsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFDcEUsTUFBTSxDQUFDLElBQUksQ0FBQztRQUNkLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO0lBQ0gsQ0FBQztJQUVNLGFBQWEsQ0FBQyxZQUF1QixFQUFFLGtCQUEwQixDQUFDO1FBQ3ZFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDLFlBQVksR0FBRyxlQUFlLENBQUMsQ0FBQyxDQUFDO1lBQ3BFLE1BQU0sQ0FBQyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixNQUFNLENBQUMsS0FBSyxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUM7Q0FDRjtBQXBFRCw4QkFvRUMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUE7OztHQUdHO0FBQ0g7SUF1Q0UsWUFBWSxVQUFtQjtRQUwvQjs7V0FFRztRQUNJLFdBQU0sR0FBVyxJQUFJLENBQUM7UUFHM0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2hCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUN6QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDMUMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNuQyxDQUFDO1FBQ0QsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3hDLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUE5Q0Q7O09BRUc7SUFDSSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsZUFBZTtRQUM1QyxNQUFNLENBQUMsSUFBSSxTQUFTLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVEOzs7T0FHRztJQUNJLE1BQU0sQ0FBQyxhQUFhLENBQUMsWUFBdUI7UUFDakQsTUFBTSxjQUFjLEdBQUcsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUN2QyxjQUFjLENBQUMsTUFBTSxHQUFHLGNBQWMsQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDLFlBQVksQ0FBQztRQUNoRixNQUFNLENBQUMsY0FBYyxDQUFDO0lBQ3hCLENBQUM7SUFpQ0Q7OztPQUdHO0lBQ0ksV0FBVyxDQUFDLFlBQXVCLEVBQUUsa0JBQTBCLENBQUM7UUFDckUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxlQUFlLEdBQUcsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFDcEUsTUFBTSxDQUFDLElBQUksQ0FBQztRQUNkLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO0lBQ0gsQ0FBQztJQUVNLDJCQUEyQixDQUFDLFlBQXVCLEVBQUUsa0JBQTBCLENBQUM7UUFDckYsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUMsWUFBWSxHQUFHLGVBQWUsQ0FBQyxDQUFDLENBQUM7WUFDcEUsTUFBTSxDQUFDLElBQUksQ0FBQztRQUNkLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO0lBQ0gsQ0FBQztJQUVNLHlCQUF5QixDQUFDLGNBQXNCO1FBQ3JELE1BQU0sWUFBWSxHQUFHLElBQUksU0FBUyxFQUFFLENBQUE7UUFDcEMsTUFBTSxnQkFBZ0IsR0FBRyxZQUFZLENBQUMsU0FBUyxHQUFHLGNBQWMsQ0FBQztRQUNqRSxNQUFNLGdCQUFnQixHQUFHLElBQUksU0FBUyxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDekQsTUFBTSxDQUFDLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzVELENBQUM7Q0FDRjtBQTNFRCw4QkEyRUMifQ== \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index efb46a8..8e08d3a 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,3 +1,4 @@ +// tslint:disable-next-line:no-implicit-dependencies import { expect, tap } from 'tapbundle'; import * as smarttime from '../ts/index'; @@ -16,7 +17,7 @@ tap.test('should have valid linuxtime', async () => { // tslint:disable-next-line:no-unused-expression expect(testTimeStamp.isOlderThan(testTimeStamp2)).to.be.true; // tslint:disable-next-line:no-unused-expression - expect(testTimeStamp.isYoungerThan(testTimeStamp2)).to.be.false; + expect(testTimeStamp.isYoungerThanOtherTimeStamp(testTimeStamp2)).to.be.false; }); let testHrtMeasurement: smarttime.HrtMeasurement; @@ -33,8 +34,9 @@ tap.test('should create valid HrtMeasurements', async tools => { // check units tap.test('should combine units', async () => { - let computedTime = smarttime.getMilliSecondsFromUnits({ + const computedTime = smarttime.getMilliSecondsFromUnits({ years: 2, + // tslint:disable-next-line:object-literal-sort-keys months: 2, weeks: 2, days: 2, diff --git a/ts/smarttime.classes.timestamp.ts b/ts/smarttime.classes.timestamp.ts index 7607b98..0ab0e20 100644 --- a/ts/smarttime.classes.timestamp.ts +++ b/ts/smarttime.classes.timestamp.ts @@ -65,11 +65,18 @@ export class TimeStamp { } } - public isYoungerThan(TimeStampArg: TimeStamp, tresholdTimeArg: number = 0) { + public isYoungerThanOtherTimeStamp(TimeStampArg: TimeStamp, tresholdTimeArg: number = 0) { if (this.milliSeconds > TimeStampArg.milliSeconds + tresholdTimeArg) { return true; } else { return false; } } + + public isYoungerThanMilliSeconds(millisecondArg: number) { + const nowTimeStamp = new TimeStamp() + const compareEpochTime = nowTimeStamp.epochtime - millisecondArg; + const compareTimeStamp = new TimeStamp(compareEpochTime); + return this.isYoungerThanOtherTimeStamp(compareTimeStamp); + } }