From 382b57e2718863be9544143b22ca0c2e13b9ee51 Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 May 2019 10:46:07 +0300 Subject: [PATCH 1/4] fix empty symbol in the end of tasks --- tasks/5_kyu.js | 36 ++++++++++++++++++++++++++++++++++++ tasks/6_kyu.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ tasks/7_kyu.js | 11 +++++++++++ tasks/8_kyu.js | 8 ++++++++ 4 files changed, 105 insertions(+) diff --git a/tasks/5_kyu.js b/tasks/5_kyu.js index e69de29..b9d0e2d 100644 --- a/tasks/5_kyu.js +++ b/tasks/5_kyu.js @@ -0,0 +1,36 @@ +function gap(g,m,n){ +let unswer=[]; +let primeNumbers=[]; +primeNumbers.length=n+1; +primeNumbers.fill(0,0,n+1) +for (let i=2; i*iacum+=(+currentVal),0)/12; + myData.avgFall=avg; + return(avg); + } + } +function variance(town, data) { + let regTown=new RegExp(""+town+"\\W",'gi') + + let searchTown=data.search(regTown); + if (searchTown==-1) { + myData.errorTown=-1; + return -1 + } else { + let startTownLine=data.indexOf(':',searchTown) + let searchEndFallline=data.indexOf('\n',searchTown) + let endTownLine=searchEndFallline==-1 ? data.length : searchEndFallline; + let rainFallArr=data.slice(startTownLine,endTownLine).split(/\W\w\w\w\s/); + rainFallArr.shift(); + myData.rainFall=rainFallArr; + let avg=rainFallArr.reduce((acum,currentVal)=>acum+=(+currentVal),0)/12; + myData.avgFall=avg; + + myData.varianceFall=myData.rainFall.reduce((acum,currentVal)=>acum+=Math.pow((currentVal-myData.avgFall),2),0)/12; + return myData.varianceFall; + } +} + +mean('Londonn', '20'); +variance('Londonn', '20') diff --git a/tasks/7_kyu.js b/tasks/7_kyu.js index e69de29..a7361cc 100644 --- a/tasks/7_kyu.js +++ b/tasks/7_kyu.js @@ -0,0 +1,11 @@ +function whereIsHe( p, bef, aft ){ + let posNumb=0; + for (let i=1; i<=p; i++){ + if (i-1<=aft && p-i>=bef) { + posNumb++; + } + } + return posNumb; +} + +whereIsHe( 3,5,5 ) \ No newline at end of file diff --git a/tasks/8_kyu.js b/tasks/8_kyu.js index e69de29..2021ace 100644 --- a/tasks/8_kyu.js +++ b/tasks/8_kyu.js @@ -0,0 +1,8 @@ + +function converter (mpg) { + return +(mpg*1.609344/4.54609188).toFixed(2) +} + + +converter (10) + From f5e508bc43489a52cb2675980573c23bc5018e5c Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 May 2019 22:18:48 +0300 Subject: [PATCH 2/4] commit all tasks first attemp --- main.js | 18 ++++++++++++++++-- tasks/5_kyu.js | 9 ++++++--- tasks/6_kyu.js | 31 ++++++++++++++++++++++++++----- tasks/7_kyu.js | 23 +++++++++++++---------- tasks/8_kyu.js | 12 +++++------- 5 files changed, 66 insertions(+), 27 deletions(-) diff --git a/main.js b/main.js index c4c03e6..05ae1c7 100644 --- a/main.js +++ b/main.js @@ -1,3 +1,17 @@ require("amd-loader"); -var msg = require('./tasks/template'); -msg.print("run!"); +// var msg = require('./tasks/template'); +// msg.print("run!"); + + +var kyu8_1=require('./tasks/8_kyu'); +console.log(kyu8_1.Kata(6.3,2,5)); + +var kyu7=require('./tasks/7_kyu'); +console.log(kyu7.whereIsHe(5, 2, 3)); + +var kyu6=require('./tasks/6_kyu'); +console.log(kyu6.mean("London")); +console.log(kyu6.variance("Beijing")); + +var kyu5=require('./tasks/5_kyu'); +console.log(kyu5.gap(2, 5, 7)); \ No newline at end of file diff --git a/tasks/5_kyu.js b/tasks/5_kyu.js index b9d0e2d..c54939d 100644 --- a/tasks/5_kyu.js +++ b/tasks/5_kyu.js @@ -1,4 +1,6 @@ -function gap(g,m,n){ +define(function () { + return { + gap: function(g,m,n){ let unswer=[]; let primeNumbers=[]; primeNumbers.length=n+1; @@ -10,7 +12,6 @@ for (let i=2; i*i=bef) { - posNumb++; - } - } - return posNumb; -} +define(function () { + return { + whereIsHe: function whereIsHe( p, bef, aft ){ + let posNumb=0; + for (let i=1; i<=p; i++){ + if (i-1<=aft && p-i>=bef) { + posNumb++; + } + } + return posNumb; + } + }; +}) -whereIsHe( 3,5,5 ) \ No newline at end of file diff --git a/tasks/8_kyu.js b/tasks/8_kyu.js index 2021ace..8981fab 100644 --- a/tasks/8_kyu.js +++ b/tasks/8_kyu.js @@ -1,8 +1,6 @@ - -function converter (mpg) { - return +(mpg*1.609344/4.54609188).toFixed(2) -} - - -converter (10) +define(function () { + return { + Kata: function(length, width, height){return length * width * height} + }; +}) From f015085f4b74f80d969ac7e13b95c2efe2a1192e Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 17 May 2019 09:30:39 +0300 Subject: [PATCH 3/4] another test --- tasks/6_kyu.js | 3 +-- tasks/7_kyu.js | 22 +++++++++++----------- tasks/template.js | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tasks/6_kyu.js b/tasks/6_kyu.js index 9ebae6e..78c336f 100644 --- a/tasks/6_kyu.js +++ b/tasks/6_kyu.js @@ -17,8 +17,7 @@ const data = "Beijing:Jan 3.9,Feb 4.7,Mar 8.2,Apr 18.4,May 33.0,Jun 78.1,Jul 224.3,Aug 170.0,Sep 58.4,Oct 18.0,Nov 9.3,Dec 2.7" + "\n" + "Lima:Jan 1.2,Feb 0.9,Mar 0.7,Apr 0.4,May 0.6,Jun 1.8,Jul 4.4,Aug 3.1,Sep 3.3,Oct 1.7,Nov 0.5,Dec 0.7"; -const towns = ["Rome", "London", "Paris", "NY", "Vancouver", "Sydney", "Bangkok", "Tokyo", - "Beijing", "Lima", "Montevideo", "Caracas", "Madrid", "Berlin"] + define(function () { return { diff --git a/tasks/7_kyu.js b/tasks/7_kyu.js index d948d77..4b41bb4 100644 --- a/tasks/7_kyu.js +++ b/tasks/7_kyu.js @@ -1,14 +1,14 @@ -define(function () { - return { - whereIsHe: function whereIsHe( p, bef, aft ){ - let posNumb=0; - for (let i=1; i<=p; i++){ - if (i-1<=aft && p-i>=bef) { - posNumb++; - } - } - return posNumb; +define(function () { + return { + whereIsHe: function whereIsHe( p, bef, aft ){ + let posNumb=0; + for (let i=1; i<=p; i++){ + if (i-1<=aft && p-i>=bef){ + posNumb++; } - }; + } + return posNumb; + } +}; }) diff --git a/tasks/template.js b/tasks/template.js index 4d24ed8..ced6f30 100644 --- a/tasks/template.js +++ b/tasks/template.js @@ -1,7 +1,7 @@ define(function () { return { print: function(msg) { - console.log(msg); + // console.log(msg); } }; }); \ No newline at end of file From a545ed3208ebb1a2b8509cb70919fac147445801 Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 17 May 2019 09:39:22 +0300 Subject: [PATCH 4/4] another test2 --- .eslintrc.js | 3 ++- package.json | 2 +- tasks/template.js | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index edadc67..d969a52 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,8 @@ module.exports = { "env": { "browser": true, - "es6": true + "es6": true, + "amd": true }, "extends": "eslint:recommended", "globals": { diff --git a/package.json b/package.json index 085b793..a75234d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "codewarstasks", "version": "1.0.0", "description": "", - "main": "index.js", + "main": "main.js", "dependencies": { "amd-loader": "0.0.8", "requirejs": "^2.3.6" diff --git a/tasks/template.js b/tasks/template.js index ced6f30..aeeb100 100644 --- a/tasks/template.js +++ b/tasks/template.js @@ -1,7 +1,7 @@ -define(function () { - return { - print: function(msg) { - // console.log(msg); - } - }; -}); \ No newline at end of file +// define(function () { +// return { +// print: function(msg) { +// // console.log(msg); +// } +// }; +// }); \ No newline at end of file