From b802c204583de8ec0a88b9123b34808e5fefa9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 02:14:28 +0500 Subject: [PATCH 01/10] Update math.js --- math.js | 1 + 1 file changed, 1 insertion(+) diff --git a/math.js b/math.js index c749300..72d3602 100644 --- a/math.js +++ b/math.js @@ -4,4 +4,5 @@ exports.isStar = true; exports.sum = function (a, b) { // Реализуйте сложение в этой функции + return a+b; }; From 97ab793311103a439a86e00c3097efebdf931285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 02:45:50 +0500 Subject: [PATCH 02/10] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index 72d3602..fbb0d74 100644 --- a/math.js +++ b/math.js @@ -4,5 +4,5 @@ exports.isStar = true; exports.sum = function (a, b) { // Реализуйте сложение в этой функции - return a+b; + if (isNaN(a) && isNaN(b)) return NaN; else return a+b; }; From 7c7b5447605b229337ba4966e03f09851d492bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 02:52:02 +0500 Subject: [PATCH 03/10] Update math.js --- math.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index fbb0d74..6643ebb 100644 --- a/math.js +++ b/math.js @@ -3,6 +3,7 @@ exports.isStar = true; exports.sum = function (a, b) { - // Реализуйте сложение в этой функции - if (isNaN(a) && isNaN(b)) return NaN; else return a+b; + if (isNaN(a) && isNaN(b)) + return NaN; + else return a+b; }; From 462ebe6e8b9382667222126956ddf5199a4f103b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 22:30:33 +0500 Subject: [PATCH 04/10] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index 6643ebb..1458d12 100644 --- a/math.js +++ b/math.js @@ -3,7 +3,7 @@ exports.isStar = true; exports.sum = function (a, b) { - if (isNaN(a) && isNaN(b)) - return NaN; + if (isNaN(a) && isNaN(b)) + return NaN; else return a+b; }; From d4bca110f5d1dc3f4e77a9329b27562baa14c11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 22:59:53 +0500 Subject: [PATCH 05/10] Update math.js --- math.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index 1458d12..c11977f 100644 --- a/math.js +++ b/math.js @@ -3,7 +3,8 @@ exports.isStar = true; exports.sum = function (a, b) { - if (isNaN(a) && isNaN(b)) + if (isNaN(a) && isNaN(b)) { return NaN; - else return a+b; + } + else return a + b; }; From 94d4b2566efed8638ce5c12fccb9d1c6be5bcfa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 23:08:19 +0500 Subject: [PATCH 06/10] Update math.js --- math.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/math.js b/math.js index c11977f..fd73232 100644 --- a/math.js +++ b/math.js @@ -6,5 +6,7 @@ exports.sum = function (a, b) { if (isNaN(a) && isNaN(b)) { return NaN; } - else return a + b; + else { + return a + b; + } }; From 4b498d73187e0bd1a802b079aaba30d72cda2ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 23:16:36 +0500 Subject: [PATCH 07/10] Update math.js --- math.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/math.js b/math.js index fd73232..6266de6 100644 --- a/math.js +++ b/math.js @@ -6,7 +6,6 @@ exports.sum = function (a, b) { if (isNaN(a) && isNaN(b)) { return NaN; } - else { - return a + b; - } + + return a + b; }; From cce97b005bba620ecc004c3adf0f92242b6ce0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 23:19:16 +0500 Subject: [PATCH 08/10] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index 6266de6..78d545b 100644 --- a/math.js +++ b/math.js @@ -6,6 +6,6 @@ exports.sum = function (a, b) { if (isNaN(a) && isNaN(b)) { return NaN; } - + return a + b; }; From 7aeef59417985acf6d9b6d2e76dacfe7276f03e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 23:37:46 +0500 Subject: [PATCH 09/10] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index 78d545b..c174f2d 100644 --- a/math.js +++ b/math.js @@ -3,7 +3,7 @@ exports.isStar = true; exports.sum = function (a, b) { - if (isNaN(a) && isNaN(b)) { + if (isNaN(a) || isNaN(b)) { return NaN; } From 37bb61f8499e0906a1627c3704a543fff06b068c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D1=80=D0=B0?= Date: Sun, 9 Oct 2016 23:39:34 +0500 Subject: [PATCH 10/10] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index c174f2d..8b5c1a9 100644 --- a/math.js +++ b/math.js @@ -4,7 +4,7 @@ exports.isStar = true; exports.sum = function (a, b) { if (isNaN(a) || isNaN(b)) { - return NaN; + return Error; } return a + b;