Removed reduce dependencies in assigments

remarcmij · remarcmij · commit 53e6799922bf · 2017-11-28T15:00:39.000+01:00
diff --git a/Week5/MAKEME.md b/Week5/MAKEME.md
@@ -23,31 +23,26 @@ _Deadline Wednesday_
 
 1. Say you would like to write a program that doubles the odd numbers in an array and throws away the even number.
 
-Your solution could be something like this:
-```js
-let numbers = [1, 2, 3, 4];
-let newNumbers = [];
-
-for(let i = 0; i < numbers.length; i++) {
-    if(numbers[i] % 2 !== 0) {
-        newNumbers[i] = numbers[i] * 2;
+    Your solution could be something like this:
+    ```js
+    let numbers = [1, 2, 3, 4];
+    let newNumbers = [];
+
+    for(let i = 0; i < numbers.length; i++) {
+        if(numbers[i] % 2 !== 0) {
+            newNumbers.push(numbers[i] * 2);
+        }
     }
-}
 
-console.log("The doubled numbers are", newNumbers); // [2, 6]
+    console.log("The doubled numbers are", newNumbers); // [2, 6]
 
-```
+    ```
 
-rewrite the above program using `map` and `filter` don't forget to use `=>`
+    Rewrite the above program using `map` and `filter` don't forget to use `=>`
 
-2. Use the array of the previous assignment, write a program that add the even numbers to the resulting array twice, but the odd numbers only once. Don't forget to use `=>`.
-
-Your output should be:
-```js
-console.log("The final numbers are", newNumbers);// [1, 2, 2, 3, 4, 4]
-```
 
 Underneath you see a very interesting small insight in Maartje's work:
+
 ```js
 let monday = [
         {
@@ -67,10 +62,10 @@ let monday = [
             duration : 200
         }
     ];
- 
+
 let tuesday = [
         {
-            name     : 'Keep writing summery',
+            name     : 'Keep writing summary',
             duration : 240
         },
         {
@@ -90,17 +85,16 @@ let tuesday = [
             duration : 40
         }
     ];
-     
-let tasks = [monday, tuesday];
+
+let tasks = monday.concat(tuesday);
 ```
 
-3. Write a program that does the following:
+2. Write a program that does the following below. Use `map` and `filter`. You will also need a `forEach` or a `for` loop for the 'summing up' part.
 
 - Collect two days' worth of tasks.
 - Convert the task durations to hours, instead of minutes.
-- Filter out everything that took two hours or more.
-- Sum it all up.
-- Multiply the result by a per-hour rate for billing (you can decide yourself what Maartje should make per hour).
+- Filter out everything that took two hours or more
+- Multiply the each duration by a per-hour rate for billing (you can decide yourself what Maartje should make per hour) and sum it all up.
 - Output a formatted Euro amount.
 - Don't forget to use `=>`
 
@@ -124,11 +118,57 @@ Go trough the reading material in the [README.md](/Week5/README.md) to prepare f
 ```
 How to hand in your homework:
 • Clone your existing "hyf-javascript2" Github repository.
-• Create a new folder "week2" USING THE COMMAND LINE 
-• Save your homework files inside this folder. 
-• When you are done with your homework use add/commit and push to upload your homework. 
+• Create a new folder "week2" USING THE COMMAND LINE
+• Save your homework files inside this folder.
+• When you are done with your homework use add/commit and push to upload your homework.
 • Write a description for your “commit”.
 • Your hyf-javascript2/week2 should now contain all your homework files.
 Place the link to your repository folder in Trello.
 ```
 
+<!--
+let wage = tasks
+  .map((task) => {
+    return {
+      name: task.name,
+      duration: task.duration / 60
+    }
+  })
+  .filter((task) => task.duration >= 2)
+  .reduce((wage, task) => {
+    return wage + task.duration * 50
+  }, 0);
+
+console.log(`Maartje has earned € ${wage.toFixed(2)}`);
+
+let wage2 = 0;
+tasks
+  .map((task) => {
+    return {
+      name: task.name,
+      duration: task.duration / 60
+    }
+  })
+  .filter((task) => task.duration >= 2)
+  .forEach((task) => {
+    wage2 += task.duration * 50
+  }, 0);
+
+console.log(`Maartje has earned € ${wage2.toFixed(2)}`);
+
+let longTasks = tasks
+  .map((task) => {
+    return {
+      name: task.name,
+      duration: task.duration / 60
+    }
+  })
+  .filter((task) => task.duration >= 2);
+
+let wage3 = 0;
+for (let task of longTasks) {
+  wage3 += task.duration * 50
+}
+
+console.log(`Maartje has earned € ${wage3.toFixed(2)}`);
+-->
