From 2e6fcc214e3d4952e0d235de4044d611bc98b63e Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 16:43:58 +0500 Subject: [PATCH 01/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index c749300..a6b1431 100644 --- a/math.js +++ b/math.js @@ -3,5 +3,5 @@ exports.isStar = true; exports.sum = function (a, b) { - // Реализуйте сложение в этой функции + return Number(a) + Number(b); }; From 8618669d4260c7cafdb8c17153fff01ea01617e4 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:23:29 +0500 Subject: [PATCH 02/31] Update math.js --- math.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/math.js b/math.js index a6b1431..b1323e5 100644 --- a/math.js +++ b/math.js @@ -3,5 +3,7 @@ exports.isStar = true; exports.sum = function (a, b) { - return Number(a) + Number(b); + return setTimeout(function () { + return Number(a) + Number(b); + }, 7000); }; From f963502b1bb97a47afee787c71c6cca8be3a2461 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:27:55 +0500 Subject: [PATCH 03/31] Update math.js --- math.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/math.js b/math.js index b1323e5..b88525e 100644 --- a/math.js +++ b/math.js @@ -3,7 +3,10 @@ exports.isStar = true; exports.sum = function (a, b) { - return setTimeout(function () { - return Number(a) + Number(b); - }, 7000); + var now = Date.now(); + while (Date.now() - now < 10000) { + var a = 1; + } + + return Number(a) + Number(b); }; From 823c2c5aea4c932611578ce047c266f31d2925ab Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:30:01 +0500 Subject: [PATCH 04/31] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index b88525e..c3d7884 100644 --- a/math.js +++ b/math.js @@ -4,9 +4,9 @@ exports.isStar = true; exports.sum = function (a, b) { var now = Date.now(); + var count = 0; while (Date.now() - now < 10000) { - var a = 1; + count++; } - return Number(a) + Number(b); }; From d26b9e064c8370594cb22f7b5ebad41968b14e40 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:32:29 +0500 Subject: [PATCH 05/31] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index c3d7884..4306377 100644 --- a/math.js +++ b/math.js @@ -6,7 +6,7 @@ exports.sum = function (a, b) { var now = Date.now(); var count = 0; while (Date.now() - now < 10000) { - count++; + count = 0; } - return Number(a) + Number(b); + return Number(a) + Number(b) + Number(count); }; From 63ec2329b51d4a98565587ec1cd7e00c28e102f4 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:34:11 +0500 Subject: [PATCH 06/31] Update math.js --- math.js | 1 + 1 file changed, 1 insertion(+) diff --git a/math.js b/math.js index 4306377..9e470f0 100644 --- a/math.js +++ b/math.js @@ -8,5 +8,6 @@ exports.sum = function (a, b) { while (Date.now() - now < 10000) { count = 0; } + return Number(a) + Number(b) + Number(count); }; From 3a63243505aa8874f31b1cdec6f76f16fdb2c442 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:35:41 +0500 Subject: [PATCH 07/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index 9e470f0..f6d967b 100644 --- a/math.js +++ b/math.js @@ -5,7 +5,7 @@ exports.isStar = true; exports.sum = function (a, b) { var now = Date.now(); var count = 0; - while (Date.now() - now < 10000) { + while (Date.now() - now < 1800) { count = 0; } From 6a3ff209a474b277f934518606ed010fa0117fdd Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:40:26 +0500 Subject: [PATCH 08/31] Update math.js --- math.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/math.js b/math.js index f6d967b..249af55 100644 --- a/math.js +++ b/math.js @@ -11,3 +11,12 @@ exports.sum = function (a, b) { return Number(a) + Number(b) + Number(count); }; + +exports.whileTrue = function (count) { + var c; + while(true) { + c = 0; + } + + return c; +} From b0b3db40fd64dd45223c26d84fcb03c200fe139a Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:42:32 +0500 Subject: [PATCH 09/31] Update math.js --- math.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index 249af55..359ac8c 100644 --- a/math.js +++ b/math.js @@ -12,11 +12,12 @@ exports.sum = function (a, b) { return Number(a) + Number(b) + Number(count); }; -exports.whileTrue = function (count) { +exports.whileTrue = function () { + //eslint disable var c; while(true) { c = 0; } return c; -} +}; From f85194515a5364ef88d7434baa35418be8971a92 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:45:06 +0500 Subject: [PATCH 10/31] Update math.js --- math.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/math.js b/math.js index 359ac8c..8747057 100644 --- a/math.js +++ b/math.js @@ -13,11 +13,11 @@ exports.sum = function (a, b) { }; exports.whileTrue = function () { - //eslint disable - var c; - while(true) { - c = 0; + // eslint disable + var c = 1; + while (c > 0) { + c = 1; } return c; -}; +}; From 84684c25fec4eb0cb4293c9e46d68a6c1f05e7c2 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 19:46:49 +0500 Subject: [PATCH 11/31] Update math.js --- math.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/math.js b/math.js index 8747057..168a231 100644 --- a/math.js +++ b/math.js @@ -3,13 +3,7 @@ exports.isStar = true; exports.sum = function (a, b) { - var now = Date.now(); - var count = 0; - while (Date.now() - now < 1800) { - count = 0; - } - - return Number(a) + Number(b) + Number(count); + return Number(a) + Number(b); }; exports.whileTrue = function () { From 907c806a689d6257a97ac6f65a1d41512c83fc51 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 20:13:36 +0500 Subject: [PATCH 12/31] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index 168a231..466593e 100644 --- a/math.js +++ b/math.js @@ -2,8 +2,8 @@ exports.isStar = true; -exports.sum = function (a, b) { - return Number(a) + Number(b); +exports.sum = function (a, b, c) { + return Number(a) + Number(b) + Number(c); }; exports.whileTrue = function () { From c46891f0a2cb12112f846a9e1abbc373be377fef Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 20:15:08 +0500 Subject: [PATCH 13/31] Update math.js --- math.js | 1 + 1 file changed, 1 insertion(+) diff --git a/math.js b/math.js index 466593e..b0871c9 100644 --- a/math.js +++ b/math.js @@ -3,6 +3,7 @@ exports.isStar = true; exports.sum = function (a, b, c) { + c = c || 0; return Number(a) + Number(b) + Number(c); }; From 3b3a773d89322ed90190113faa0b45d96573463c Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Tue, 25 Oct 2016 20:15:27 +0500 Subject: [PATCH 14/31] Update math.js --- math.js | 1 + 1 file changed, 1 insertion(+) diff --git a/math.js b/math.js index b0871c9..dd2a8c1 100644 --- a/math.js +++ b/math.js @@ -4,6 +4,7 @@ exports.isStar = true; exports.sum = function (a, b, c) { c = c || 0; + return Number(a) + Number(b) + Number(c); }; From 5c1905b93f4829cae3ec697ae6310cc9906f18fa Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 15:51:45 +0500 Subject: [PATCH 15/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index dd2a8c1..e1ea910 100644 --- a/math.js +++ b/math.js @@ -5,7 +5,7 @@ exports.isStar = true; exports.sum = function (a, b, c) { c = c || 0; - return Number(a) + Number(b) + Number(c); + return Number(a) + Number(b) + Number(c) + 1; }; exports.whileTrue = function () { From 625e8cc761cbac0a9b670f7b6facae5d74bd7e84 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 15:53:26 +0500 Subject: [PATCH 16/31] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index e1ea910..79c6262 100644 --- a/math.js +++ b/math.js @@ -1,11 +1,11 @@ 'use strict'; -exports.isStar = true; +exports.isStar = false; exports.sum = function (a, b, c) { c = c || 0; - return Number(a) + Number(b) + Number(c) + 1; + return Number(a) + Number(b) + Number(c); }; exports.whileTrue = function () { From 0965d53362b543c854eddbf727e97695ff798022 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 16:12:30 +0500 Subject: [PATCH 17/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index 79c6262..a26823a 100644 --- a/math.js +++ b/math.js @@ -3,7 +3,7 @@ exports.isStar = false; exports.sum = function (a, b, c) { - c = c || 0; + c = c || 0; return Number(a) + Number(b) + Number(c); }; From 1b0fbe9807a2274e57ae220d15a730abed0dae24 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 16:13:55 +0500 Subject: [PATCH 18/31] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index a26823a..dd2a8c1 100644 --- a/math.js +++ b/math.js @@ -1,9 +1,9 @@ 'use strict'; -exports.isStar = false; +exports.isStar = true; exports.sum = function (a, b, c) { - c = c || 0; + c = c || 0; return Number(a) + Number(b) + Number(c); }; From 473c7ad56f93ded53e1f2a068c22de67d047940a Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 16:31:50 +0500 Subject: [PATCH 19/31] Update math.js --- math.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/math.js b/math.js index dd2a8c1..ed4f288 100644 --- a/math.js +++ b/math.js @@ -5,6 +5,8 @@ exports.isStar = true; exports.sum = function (a, b, c) { c = c || 0; + + return Number(a) + Number(b) + Number(c); }; From b1d581115d6c6010a4d0fdfcb159fbd8b0e1b82b Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 16:32:42 +0500 Subject: [PATCH 20/31] Update math.js --- math.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/math.js b/math.js index ed4f288..e1ea910 100644 --- a/math.js +++ b/math.js @@ -5,9 +5,7 @@ exports.isStar = true; exports.sum = function (a, b, c) { c = c || 0; - - - return Number(a) + Number(b) + Number(c); + return Number(a) + Number(b) + Number(c) + 1; }; exports.whileTrue = function () { From a5be711c7204c892da1522812e5b2c120f4558f9 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 16:33:38 +0500 Subject: [PATCH 21/31] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index e1ea910..79c6262 100644 --- a/math.js +++ b/math.js @@ -1,11 +1,11 @@ 'use strict'; -exports.isStar = true; +exports.isStar = false; exports.sum = function (a, b, c) { c = c || 0; - return Number(a) + Number(b) + Number(c) + 1; + return Number(a) + Number(b) + Number(c); }; exports.whileTrue = function () { From fedb966b0b584dd165e7e4427c7134f2f6b7c823 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 16:34:23 +0500 Subject: [PATCH 22/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index 79c6262..a9e60b2 100644 --- a/math.js +++ b/math.js @@ -5,7 +5,7 @@ exports.isStar = false; exports.sum = function (a, b, c) { c = c || 0; - return Number(a) + Number(b) + Number(c); + return a + Number(b) + Number(c); }; exports.whileTrue = function () { From 8b3855a4553bcca0d127358ca4091856f8066f8c Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 16:35:03 +0500 Subject: [PATCH 23/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index a9e60b2..79c6262 100644 --- a/math.js +++ b/math.js @@ -5,7 +5,7 @@ exports.isStar = false; exports.sum = function (a, b, c) { c = c || 0; - return a + Number(b) + Number(c); + return Number(a) + Number(b) + Number(c); }; exports.whileTrue = function () { From 45f06d560bcdc8152530b8c20f90e00d9434c211 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 23:20:46 +0500 Subject: [PATCH 24/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index 79c6262..2dfebf8 100644 --- a/math.js +++ b/math.js @@ -5,7 +5,7 @@ exports.isStar = false; exports.sum = function (a, b, c) { c = c || 0; - return Number(a) + Number(b) + Number(c); + return Number(a) + Number(b) + Number(c) + 1; }; exports.whileTrue = function () { From df5c55bd5fa8901627131403e70b4ed46acfe173 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Sun, 30 Oct 2016 23:21:21 +0500 Subject: [PATCH 25/31] Update math.js --- math.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/math.js b/math.js index 2dfebf8..dd2a8c1 100644 --- a/math.js +++ b/math.js @@ -1,11 +1,11 @@ 'use strict'; -exports.isStar = false; +exports.isStar = true; exports.sum = function (a, b, c) { c = c || 0; - return Number(a) + Number(b) + Number(c) + 1; + return Number(a) + Number(b) + Number(c); }; exports.whileTrue = function () { From ca344b11e98714679ee39492e6d1971f6651138a Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Mon, 31 Oct 2016 19:37:22 +0500 Subject: [PATCH 26/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index dd2a8c1..9e7b10b 100644 --- a/math.js +++ b/math.js @@ -5,7 +5,7 @@ exports.isStar = true; exports.sum = function (a, b, c) { c = c || 0; - return Number(a) + Number(b) + Number(c); + return a + Number(b) + Number(c); }; exports.whileTrue = function () { From 2c9904e3213778adf59f04f20cca9770cac1c5bb Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Mon, 31 Oct 2016 19:40:12 +0500 Subject: [PATCH 27/31] Update math.js --- math.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/math.js b/math.js index 9e7b10b..965c972 100644 --- a/math.js +++ b/math.js @@ -4,6 +4,11 @@ exports.isStar = true; exports.sum = function (a, b, c) { c = c || 0; + + var c = 1; + while (c > 0) { + c = 1; + } return a + Number(b) + Number(c); }; From 530f22fd588106b88d33c5882b5ec28a89518c59 Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Mon, 31 Oct 2016 19:42:20 +0500 Subject: [PATCH 28/31] Update math.js --- math.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/math.js b/math.js index 965c972..e3d7b18 100644 --- a/math.js +++ b/math.js @@ -3,8 +3,6 @@ exports.isStar = true; exports.sum = function (a, b, c) { - c = c || 0; - var c = 1; while (c > 0) { c = 1; From 94786de391345d935e9144ca2ad47cbb98a1ff1e Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Mon, 31 Oct 2016 19:44:54 +0500 Subject: [PATCH 29/31] Update math.js --- math.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/math.js b/math.js index e3d7b18..65865c0 100644 --- a/math.js +++ b/math.js @@ -3,9 +3,9 @@ exports.isStar = true; exports.sum = function (a, b, c) { - var c = 1; - while (c > 0) { - c = 1; + var d = 1; + while (d > 0) { + d = 1; } return a + Number(b) + Number(c); From bb23ef4b48092b5363a74dc7972fd5a18dfc733e Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Mon, 31 Oct 2016 19:53:13 +0500 Subject: [PATCH 30/31] Update math.js --- math.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/math.js b/math.js index 65865c0..f74c88a 100644 --- a/math.js +++ b/math.js @@ -3,9 +3,8 @@ exports.isStar = true; exports.sum = function (a, b, c) { - var d = 1; - while (d > 0) { - d = 1; + while (c > 0) { + c = 1; } return a + Number(b) + Number(c); From 6f77e536ae92d704f6853faae64f9e73be2c593c Mon Sep 17 00:00:00 2001 From: Natalia Aksenova Date: Mon, 31 Oct 2016 19:54:47 +0500 Subject: [PATCH 31/31] Update math.js --- math.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/math.js b/math.js index f74c88a..2c81f16 100644 --- a/math.js +++ b/math.js @@ -7,7 +7,7 @@ exports.sum = function (a, b, c) { c = 1; } - return a + Number(b) + Number(c); + return Number(a) + Number(b); }; exports.whileTrue = function () {