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/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/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/5_kyu.js b/tasks/5_kyu.js index e69de29..c54939d 100644 --- a/tasks/5_kyu.js +++ b/tasks/5_kyu.js @@ -0,0 +1,39 @@ +define(function () { + return { + gap: function(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); + } + }, + variance: function (town) { + 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; + } +} + + }; +}); + + + + diff --git a/tasks/7_kyu.js b/tasks/7_kyu.js index e69de29..4b41bb4 100644 --- a/tasks/7_kyu.js +++ b/tasks/7_kyu.js @@ -0,0 +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; + } +}; +}) + diff --git a/tasks/8_kyu.js b/tasks/8_kyu.js index e69de29..8981fab 100644 --- a/tasks/8_kyu.js +++ b/tasks/8_kyu.js @@ -0,0 +1,6 @@ +define(function () { + return { + Kata: function(length, width, height){return length * width * height} + }; +}) + diff --git a/tasks/template.js b/tasks/template.js index 4d24ed8..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