for loop exercises

espvtes · espvtes · commit a8f3b5e2b446 · 2019-09-14T03:48:07.000Z
diff --git a/exercises/10-Find_avg/README.md b/exercises/10-Find_avg/README.md
@@ -1,15 +1,16 @@
-# `28` Find average
+# `10` Find average
 
-Another way to loop a list with the for loop will be using the IN statement like this:
-
-```py
-for  index in my_list:
-    print(myArray[index])
-```
 
 
 # 📝Instructions
-Calculate the average value of all the items in the array and print it on the console.
+1. Calculate the average value of all the items in the list and print it on the console.
+2.
 
 # 💡HINT:
-To print the average, you have to add all the values and divide the result by the total length of the array.
+To print the average, you have to add all the values and divide the result
+by the total length of the list.
+
+```py
+The result have to be like:
+27278.8125
+```
diff --git a/exercises/10-Find_avg/app.py b/exercises/10-Find_avg/app.py
@@ -3,9 +3,8 @@
 #Your code here:
 
 
-total = 0
-
+# total = 0
 for val in my_list:
-    total += val
-avg = total / len(my_list)
+#     total += val
+# avg = total / len(my_list)
 print(avg)
diff --git a/exercises/10-Find_avg/test.py b/exercises/10-Find_avg/test.py
@@ -0,0 +1,20 @@
+import io
+import os
+import sys
+sys.stdout = buffer = io.StringIO()
+
+import app
+import pytest
+
+
+@pytest.mark.it("Print the minimum value from the list")
+def test_min():
+    captured = buffer.getvalue()
+    assert "27278.8125\n" in captured
+
+@pytest.mark.it("Use the for loop and len function")
+def test_if_loo():
+    f = open(os.path.dirname(os.path.abspath(__file__))+'/app.py')
+    content = f.read()
+    assert content.find("for") > 0
+    assert content.find("len") > 0
diff --git a/exercises/10.1-And_One_and_a_Two_and_a_Three/README.md b/exercises/10.1-And_One_and_a_Two_and_a_Three/README.md
@@ -1,15 +1,24 @@
 # `10.1` And one and two and three
+
+Dictionaries (or dict in Python) are a way of storing elements just like you
+would in a Python list. But, rather than accessing elements using its index,
+you assign a fixed key to it and access the element using the key. What you now
+deal with is a "key-value" pair, which is sometimes a more appropriate data structure
+for many problem instead of a simple list.
+
+
 # 📝Instruction
 1. Given a contact object, please `loop all its properties and values` and print them on the console.
 2. You will have to loop its properties to be able to print them
 
 ```py
-Expected console output:
+Example console output:
 fullname : John Doe
 phone : 123-123-2134
 email : test@nowhere.com
 ```
 
 💡Hints
-MDN for in loop reference
-<!-- https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Loops_and_iteration#for...in_statement -->
+-contact.keys()  #['fullname', 'phone', 'email']
+-contact.values()  #['Jane Doe', '321-321-4321', 'test@test.com']
+-contact.items()  #[('fullname', 'Jane Doe'), ('phone', '321-321-4321'), ('email', 'test@test.com')]
diff --git a/exercises/10.1-And_One_and_a_Two_and_a_Three/app.py b/exercises/10.1-And_One_and_a_Two_and_a_Three/app.py
@@ -4,22 +4,6 @@
     "email": "test@test.com"
 }
 #Your code here:
-
-# declare and aux variable and assign the value of the key
-k = contact.keys()
-
-
-# loop the entire dict and concactenate the items in one output
 for k, v in contact.items():
-    print("{0}: {1}".format(k, v))
-
-
-#another form:
-x = contact.keys()
-
-for x, e in contact.items():
-    print(x, ":", e)
+    print(k, ":", v)
 
-#loop without declaration:
-for key, value in contact.items():
-    print(key, ":", value)
diff --git a/exercises/10.1-And_One_and_a_Two_and_a_Three/test.py b/exercises/10.1-And_One_and_a_Two_and_a_Three/test.py
@@ -0,0 +1,21 @@
+import io
+import os
+import sys
+sys.stdout = buffer = io.StringIO()
+
+import app
+import pytest
+
+
+@pytest.mark.it("Print the items in the console")
+def test_dict():
+    captured = buffer.getvalue()
+    assert "fullname : Jane Doe\nphone : 321-321-4321\nemail : test@test.com\n" in captured
+
+@pytest.mark.it("Loop the all  values")
+def test_if_loo():
+    f = open(os.path.dirname(os.path.abspath(__file__))+'/app.py')
+    content = f.read()
+    assert content.find("for") > 0
+
+
diff --git a/exercises/11-Nested_list/README.md b/exercises/11-Nested_list/README.md
@@ -1,19 +1,24 @@
-Instructions from your teacher:
-# `29` Nested list
+
+# `11` Nested list
+
 It is possible to find an list comprised of other lists (it is called a two-dimension list or matrix).
 
 In this example, we have a list of coordinates that you can access by doing the following:
 
 //longitude = []
 // for loop in coordinate longitude
-longitude = coordinatesArray[0][1];
+longitude = coordinatesList[0][1];
 
 
-Instructions:
-Loop through the array printing only the longitudes.
-
+#📝Instructions:
+Loop through the list printing only the longitudes.
+```py
 The result should be something like this:
 -112.633853
 -63.987
 -81.901693
 -71.653268
+```
+
+💡Hint:
+Remember the index of the position 1 is list[0]
diff --git a/exercises/11-Nested_list/app.py b/exercises/11-Nested_list/app.py
@@ -1,12 +1,7 @@
 
-coordinatesArray = [[33.747252,-112.633853],[-33.867886, -63.987],[41.303921, -81.901693],[-33.350534, -71.653268]]
+coordinatesList = [[33.747252,-112.633853],[-33.867886, -63.987],[41.303921, -81.901693],[-33.350534, -71.653268]]
 
 # Your code go here:
-"""from here the student have to decleare the function"""
-"""declare the empty variable"""
-# longitude = []
 
-# for grades in coordinatesArray:
-#     longitude.append(grades[1])
-#     grades += grades
-# print(longitude)
+for grades in coordinatesList:
+    print(grades[1])
diff --git a/exercises/11-Nested_list/test.py b/exercises/11-Nested_list/test.py
@@ -1,4 +1,21 @@
 import io
+import os
 import sys
 sys.stdout = buffer = io.StringIO()
 
+import app
+import pytest
+
+
+@pytest.mark.it("Print the longitudes")
+def test_dict():
+    captured = buffer.getvalue()
+    assert "-112.633853\n-63.987\n-81.901693\n-71.653268\n" in captured
+
+@pytest.mark.it("Loop the all values using for loop")
+def test_if_loo():
+    f = open(os.path.dirname(os.path.abspath(__file__))+'/app.py')
+    content = f.read()
+    assert content.find("for") > 0
+
+
diff --git a/exercises/12-Map_and_list/app.py b/exercises/12-Map_and_list/app.py
@@ -1,12 +1,9 @@
 Celsius_values = [-2,34,56,-10]
 
-fahrenheit_values = list(map(lambda x : x * 5 / 9 + 32, Celsius_values))
-print(fahrenheit_values)
-
-
 
 
 def fahrenheitValues(x):
-    return x * 5/9 + 32
+#the magic go here:
+    # return x * 5/9 + 32
 result = list(map(fahrenheit_values, Celsius_values))
 print(result)
