Skip to content

Fixed diff method #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aminmsvi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed diff method #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de001c7
- Fixed bug where diff method did not return a negative value when th…
aminmsvi Sep 7, 2018
d0874b4
- Removed coverage folder from .gitignore.
aminmsvi Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
.settings/org.eclipse.core.resources.prefs
node_modules
.idea
.nyc_output
.nyc_output
211 changes: 104 additions & 107 deletions dist/persian-date.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId])
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
Expand Down Expand Up @@ -923,9 +923,6 @@ var PersianDateClass = function () {
val === 'weeks' || val === 'week' ? diff / 6048e5 : // 1000 * 60 * 60 * 24 * 7
diff;
}
if (output < 0) {
output = output * -1;
}
return asFloat ? output : Math.round(output);
}

Expand Down Expand Up @@ -1985,7 +1982,7 @@ var Algorithms = function () {
astronomical calendar in which a
given Julian day falls. Returns an
array of two elements:
[0] Persian year
[0] Persian year
[1] Julian day number containing
equinox for this year.
* @param {*} jd
Expand Down Expand Up @@ -2532,11 +2529,11 @@ var ASTRO = function () {
/* EQUINOX -- Determine the Julian Ephemeris Day of an
equinox or solstice. The "which" argument
selects the item to be computed:
0 March equinox
0 March equinox
1 June solstice
2 September equinox
3 December solstice
*/
*/
/**
* @desc Periodic terms to obtain true time
* @type Array
Expand Down Expand Up @@ -2697,8 +2694,8 @@ var ASTRO = function () {

/* Calculate angles. The correspondence between the elements
of our array and the terms cited in Meeus are:
ta[0] = D ta[0] = M ta[2] = M' ta[3] = F ta[4] = \Omega
*/
ta[0] = D ta[0] = M ta[2] = M' ta[3] = F ta[4] = \Omega
*/

ta[0] = this.dtr(297.850363 + 445267.11148 * t - 0.0019142 * t2 + t3 / 189474.0);
ta[1] = this.dtr(357.52772 + 35999.05034 * t - 0.0001603 * t2 - t3 / 300000.0);
Expand Down Expand Up @@ -3101,114 +3098,114 @@ module.exports = PersianDateClass;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

var Container = function Container() {
_classCallCheck(this, Container);
_classCallCheck(this, Container);

this.gDate = null;
/**
*
* @type {number}
*/
this.modifiedjulianday = 0;
this.gDate = null;
/**
*
* @type {number}
*/
this.modifiedjulianday = 0;

/**
*
* @type {number}
*/
this.julianday = 0;
/**
*
* @type {number}
*/
this.julianday = 0;

/**
*
* @type {{day: number}}
*/
this.gregserial = {
day: 0
};
/**
*
* @type {{day: number}}
*/
this.gregserial = {
day: 0
};

this.zone = 0;
this.zone = 0;

/**
*
* @type {{year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number, weekday: number, unix: number, leap: number}}
*/
this.gregorian = {
year: 0,
month: 0,
day: 0,
hour: 0,
minute: 0,
second: 0,
millisecond: 0,
weekday: 0,
unix: 0,
leap: 0
};
/**
*
* @type {{year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number, weekday: number, unix: number, leap: number}}
*/
this.gregorian = {
year: 0,
month: 0,
day: 0,
hour: 0,
minute: 0,
second: 0,
millisecond: 0,
weekday: 0,
unix: 0,
leap: 0
};

/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.juliancalendar = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};
/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.juliancalendar = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};

/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.islamic = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};
/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.islamic = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};

/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.persianAlgo = this.persian = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};
/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.persianAlgo = this.persian = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};

/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.persianAstro = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};
/**
*
* @type {{year: number, month: number, day: number, leap: number, weekday: number}}
*/
this.persianAstro = {
year: 0,
month: 0,
day: 0,
leap: 0,
weekday: 0
};

/**
*
* @type {{year: number, week: number, day: number}}
*/
this.isoweek = {
year: 0,
week: 0,
day: 0
};
/**
*
* @type {{year: number, week: number, day: number}}
*/
this.isoweek = {
year: 0,
week: 0,
day: 0
};

/**
*
* @type {{year: number, day: number}}
*/
this.isoday = {
year: 0,
day: 0
};
/**
*
* @type {{year: number, day: number}}
*/
this.isoday = {
year: 0,
day: 0
};
};

module.exports = Container;
Expand Down
2 changes: 1 addition & 1 deletion dist/persian-date.min.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions src/pDate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,9 +683,6 @@ class PersianDateClass {
val === 'weeks' || val === 'week' ? diff / 6048e5 : // 1000 * 60 * 60 * 24 * 7
diff;
}
if (output < 0) {
output = output * -1;
}
return asFloat ? output : Math.round(output);
}

Expand Down
26 changes: 24 additions & 2 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,12 +738,12 @@ describe('English Format', function () {


describe('Diff', function () {
it('set', function () {
it('a.diff(b) !== undefined', function () {
let a = new pDate([1392, 1, 1]),
b = new pDate([1392, 2, 2]);
assert.ok(a.diff(b));
});
it('set', function () {
it('a.diff(b) a > b', function () {
let a = new pDate([1392, 1, 1]),
b = new pDate([1391, 1, 1]);
assert.deepEqual(a.diff(b, 'year'), 1);
Expand All @@ -754,6 +754,28 @@ describe('Diff', function () {
assert.deepEqual(a.diff(b, 'second'), 31622400);
assert.deepEqual(a.diff(b), 31622400000);
});
it('a.diff(b) a < b', function () {
let a = new pDate([1391, 1, 1]),
b = new pDate([1392, 1, 1]);
assert.deepEqual(a.diff(b, 'year'), -1);
assert.deepEqual(a.diff(b, 'month'), -12);
assert.deepEqual(a.diff(b, 'day'), -366);
assert.deepEqual(a.diff(b, 'hour'), -8784);
assert.deepEqual(a.diff(b, 'minute'), -527040);
assert.deepEqual(a.diff(b, 'second'), -31622400);
assert.deepEqual(a.diff(b), -31622400000);
});
it('a.diff(b) a === b', function () {
let a = new pDate([1391, 1, 1]),
b = new pDate([1391, 1, 1]);
assert.deepEqual(a.diff(b, 'year'), 0);
assert.deepEqual(a.diff(b, 'month'), 0);
assert.deepEqual(a.diff(b, 'day'), 0);
assert.deepEqual(a.diff(b, 'hour'), 0);
assert.deepEqual(a.diff(b, 'minute'), 0);
assert.deepEqual(a.diff(b, 'second'), 0);
assert.deepEqual(a.diff(b), 0);
});
});


Expand Down