Merge remote-tracking branch 'origin/master'

403-html · 403-html · commit 3538a6a12a1c · 2019-05-03T17:01:45.000+02:00
diff --git a/RandSum0/index.js b/RandSum0/index.js
@@ -25,7 +25,7 @@ class genSum{
         }
     }
     pickRandNum({min,max,negative = false}){
-        let num = Math.floor(Math.random()* 100) + 0;
+        let num = Math.floor(Math.random()* max) + min;
         if(negative) num *= Math.floor(Math.random()*2) == 1 ? 1 : -1;
         return num;
     }
diff --git a/pigeons-challange/README.md b/pigeons-challange/README.md
@@ -0,0 +1,10 @@
+# Pigeons
+When I start to feed my pigeon, a minute later two more fly by. And a minute later another 3.
+Then 4, and so on. One portion of food lasts a pigeon for a minute.
+In case there’s not enough food for all the birds, the pigeons that came first, eat first. Pigeons are hungry animals and eat without stopping.
+How many pigeons I’d have to feed at least once if I have N portions wheat?
+
+-------
+
+**Enjoy**
+
diff --git a/pigeons-challange/index.html b/pigeons-challange/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Pigeons</title>
+</head>
+<body>
+    <script src="pigeons.js"></script>
+</body>
+</html>
diff --git a/pigeons-challange/pigeons.js b/pigeons-challange/pigeons.js
@@ -0,0 +1,23 @@
+function feeding(totalWheat){
+    let pigeonsTotal = 0;
+    let nextPigeonGroup = 1;
+    let currWheat = totalWheat;
+    while(pigeonsTotal < currWheat) {
+        if(pigeonsTotal+nextPigeonGroup>totalWheat) break;
+        pigeonsTotal += nextPigeonGroup;
+        currWheat -= pigeonsTotal;
+        nextPigeonGroup++;
+    }
+    return console.log(`With ${totalWheat} wheat you can feed ${pigeonsTotal} pigeons - last group of pigeons is equal to ${nextPigeonGroup} `)
+}
+
+
+// 1 pigeon - 1 wheat
+// total wheat 10 - 1 = 9
+// 2 next pigeons group + 1 curr pigeon = 3 pigeons - 3 wheat
+// total wheat 9 - 3 = 6
+// 3 next pigeons group + 3 curr pigeons = 6 pigeons - 6 wheat
+// total wheat 6 - 6 = 0
+// total wheat < pigeonsTotal = break
+
+feeding(10);

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class genSum{`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`pickRandNum({min,max,negative = false}){`
`28`		`- let num = Math.floor(Math.random()* 100) + 0;`
	`28`	`+ let num = Math.floor(Math.random()* max) + min;`
`29`	`29`	`if(negative) num = Math.floor(Math.random()2) == 1 ? 1 : -1;`
`30`	`30`	`return num;`
`31`	`31`	`}`