Merge pull request 4GeeksAcademy#113 from josemoracard/jose4-06-forEach_loop

alesanchezr · web-flow · commit 99795bdcad3c · 2023-12-06T21:28:02.000+01:00
exercises 06-for-each-loop to 08.1-Merge_list
diff --git a/exercises/06-forEach_loop/README.es.md b/exercises/06-forEach_loop/README.es.md
@@ -1,13 +1,11 @@
-# `06` `ForEach` loop
+# `06` Loop and print by condition
 
-Es posible recorrer una lista usando un bucle de la función for. Tú tienes que especificar qué hacer en cada iteración del bucle.
+Es posible recorrer una lista usando un bucle `for` especificando además qué hacer en cada iteración del bucle.
 
 ## 📝 Instrucciones:
 
-Justo ahora, el código está imprimiendo todos los elementos en la lista.
-
- 1. Por favor, cambia el código para imprimir solo los números **divisibles entre 14**.
+1. Por favor, modifica el código para imprimir solo los números **divisibles entre 14**.
 
 ## 💡 Pista:
 
-+ Un número X es divisible entre 2 si: `(X % 2 === 0)`
++ Un número x es divisible entre 2 si: `(x % 2 == 0)`
diff --git a/exercises/06-forEach_loop/README.md b/exercises/06-forEach_loop/README.md
@@ -1,14 +1,11 @@
-# `06` ForEach loop
+# `06` Loop and print by condition
 
-It is possible to traverse a list using a `for` loop. You have to specify what to do on each iteration of the loop.
+It is possible to traverse a list using a `for` loop, also specifying what to do on each iteration of the loop.
 
-## 📝Instructions:
+## 📝 Instructions:
 
-Right now, the code is printing all the items in the list.
+1. Please modify the code to print only the numbers **divisible by 14**.
 
- 1. Please change the function code to print only
- the numbers **divisible by 14**.
+## 💡 Hint:
 
-## 💡 Pista:
-
-+ A number x is divisible by 2 if: `(x % 2 === 0)`
++ A number x is divisible by 2 if: `(x % 2 == 0)`
diff --git a/exercises/06-forEach_loop/app.py b/exercises/06-forEach_loop/app.py
@@ -1,8 +1,6 @@
 my_list = [3344,34334,454543,342534,4563456,3445,23455,234,262,2335,43323,4356,345,4545,452,345,434,36,345,4334,5454,345,4352,23,365,345,47,63,425,6578759,768,834,754,35,32,445,453456,56,7536867,3884526,4234,35353245,53244523,566785,7547,743,4324,523472634,26665,63432,54645,32,453625,7568,5669576,754,64356,542644,35,243,371,3251,351223,13231243,734,856,56,53,234342,56,545343]
 
 
-for numb in my_list:
-    #the magic go here:
-   
-        print(numb)
-    
+for i in my_list:
+    # The magic happens here
+    
diff --git a/exercises/06-forEach_loop/solution.hide.py b/exercises/06-forEach_loop/solution.hide.py
@@ -0,0 +1,7 @@
+my_list = [3344,34334,454543,342534,4563456,3445,23455,234,262,2335,43323,4356,345,4545,452,345,434,36,345,4334,5454,345,4352,23,365,345,47,63,425,6578759,768,834,754,35,32,445,453456,56,7536867,3884526,4234,35353245,53244523,566785,7547,743,4324,523472634,26665,63432,54645,32,453625,7568,5669576,754,64356,542644,35,243,371,3251,351223,13231243,734,856,56,53,234342,56,545343]
+
+
+for i in my_list:
+    # The magic happens here
+    if (i % 14 == 0):
+        print(i)
diff --git a/exercises/06-forEach_loop/test.py b/exercises/06-forEach_loop/test.py
@@ -14,9 +14,9 @@ def test_for_loop():
         regex = re.compile(r"for(\s)")
         assert bool(regex.search(content)) == True
 
-@pytest.mark.it("Use if statement")
+@pytest.mark.it("Use an if statement")
 def test_if():
     with open(path, 'r') as content_file:
         content = content_file.read()
         regex = re.compile(r"if(\s)")
-        assert bool(regex.search(content)) == True
+        assert bool(regex.search(content)) == True
diff --git a/exercises/06.1-Everything_is_awesome/README.es.md b/exercises/06.1-Everything_is_awesome/README.es.md
@@ -1,18 +1,19 @@
-# `06.1` Everything is awesome
-## Instrucciones:
+# `06.1` Everything is Awesome
 
-1. Compara el elemento. Si es 1 mete el número en la lista `new_list`.
+## 📝 Instrucciones:
 
-2. Compara el elemento. Si es `0` mete "Yahoo" en la lista `new_list`, en lugar del número.
+1. Compara el elemento. Si es `1`, añade el número en la lista `new_list`.
 
-## Resultado esperado:
+2. Compara el elemento. Si es `0`, añade `Yahoo` en la lista `new_list`, en lugar del número.
+
+## 💻 Resultado esperado:
 
 ```py
 Ejemplo de salida para [0,0,1,1,0]:
 
-Yahoo,
-Yahoo,
+'Yahoo',
+'Yahoo',
 1,
 1,
-Yahoo
-```
+'Yahoo'
+```
diff --git a/exercises/06.1-Everything_is_awesome/README.md b/exercises/06.1-Everything_is_awesome/README.md
@@ -1,19 +1,19 @@
 # `06.1` Everything is Awesome
 
-## Instructions:
+## 📝 Instructions:
 
-1. Compare the item if it is 1 push the number to the list `new_list`.
+1. Compare the item; if it is `1`, push the number to the list `new_list`.
 
-2. Compare the item if it is 0 push `Yahoo` to the list `new_list` (instead of the number).
+2. Compare the item; if it is `0`, push `Yahoo` to the list `new_list` (instead of the number).
 
-## Expected Result:
+## 💻 Expected Result:
 
 ```py
 Example output for [0,0,1,1,0]:
 
-Yahoo,
-Yahoo,
+'Yahoo',
+'Yahoo',
 1,
 1,
-Yahoo
-```
+'Yahoo'
+```
diff --git a/exercises/06.1-Everything_is_awesome/app.py b/exercises/06.1-Everything_is_awesome/app.py
@@ -1,11 +1,11 @@
-my_list = [ 1, 0, 0, 0, 1, 0, 0, 0, 1, 1 ]
+my_list = [1, 0, 0, 0, 1, 0, 0, 0, 1, 1]
 
 def my_function(numbers):
     new_list = []
-    for numb in numbers:
-    #The magic go here:
+    for i in numbers:
+        # The magic happens here
+        
         
     return new_list
+    
 print(my_function(my_list))
-
-
diff --git a/exercises/06.1-Everything_is_awesome/solution.hide.py b/exercises/06.1-Everything_is_awesome/solution.hide.py
@@ -0,0 +1,14 @@
+my_list = [1, 0, 0, 0, 1, 0, 0, 0, 1, 1]
+
+def my_function(numbers):
+    new_list = []
+    for i in numbers:
+        # The magic happens here
+        if (i == 0):
+            new_list.append("Yahoo")
+        elif(i == 1):
+            new_list.append(1)
+            
+    return new_list
+    
+print(my_function(my_list))
diff --git a/exercises/07-Do_while/README.es.md b/exercises/07-Do_while/README.es.md
@@ -1,8 +1,6 @@
-# `07` Do while
+# `07` Do While
 
-Hacer, hacer, hacer.
-
-La función `while()` es otro ejemplo de bucle en python es menos común usarla, pero es un bucle:
+La función `while()` es otro ejemplo de bucle en Python, es menos común usarla, pero es un bucle:
 
 ```py
 x = 1
@@ -13,15 +11,15 @@ while x < 6:
 
 ## 📝 Instrucciones:
 
-1. Imprime cada número de iteración en la cónsola desde el `20` a `1`, pero **concatena un signo de exclamación** a la salida si el número es un múltiplo  de `5`.
+1. Imprime cada iteración en la consola de los números del `20` al `1`, pero **concatena un signo de exclamación** si el número es múltiplo de 5.
 
-2. al final imrpime `LIFTOFF`.
+2. Al final imprime `LIFTOFF`.
 
 ## 💡 Pista:
 
 + https://www.w3schools.com/python/python_while_loops.asp
 
-## Resultado esperado:
+## 💻 Resultado esperado:
 
 ```py
 Ejemplo de salida en la consola:
diff --git a/exercises/07-Do_while/README.md b/exercises/07-Do_while/README.md
@@ -1,7 +1,6 @@
-# `07` D0 While
+# `07` Do While
 
-DO DO DO
-The `while()` function is another loop example in python is less commonly used but it is a loop.
+DO DO DO. The `while()` function is another loop example in Python and is less commonly used, but it is still a loop.
 
 ```py
 x = 1
@@ -12,15 +11,15 @@ while x < 6:
 
 ## 📝 Instructions:
 
-1. Print every iteration number on the console from `20` to `1`, but **concatenate an exclamation point** to the output if the number is a multiple of `5`.
+1. Print every iteration number on the console from `20` to `1`, but **concatenate an exclamation mark** to the output if the number is a multiple of 5.
 
-2. At the end print() `LIFTOFF`.
+2. At the end print `LIFTOFF`.
 
 ## 💡 Hint:
 
 + https://www.w3schools.com/python/python_while_loops.asp
 
-## Expected result:
+## 💻 Expected result:
 
 ```py
 Example Output on the console:
diff --git a/exercises/07-Do_while/app.py b/exercises/07-Do_while/app.py
@@ -1,2 +1 @@
-
-#Your code go here:
+# Your code here
diff --git a/exercises/07-Do_while/solution.hide.py b/exercises/07-Do_while/solution.hide.py
@@ -0,0 +1,12 @@
+# Your code here
+
+number = 20
+
+while number >= 1:
+    if number % 5 == 0:
+        print(str(number) + "!")
+    else:
+        print(number)
+    number -= 1
+
+print("LIFTOFF")
diff --git a/exercises/07-Do_while/test.py b/exercises/07-Do_while/test.py
@@ -16,7 +16,7 @@ def test_for_loop():
         regex = re.compile(r"while(\s)\S*")
         assert bool(regex.search(content)) == True
 
-@pytest.mark.it("Use if statement")
+@pytest.mark.it("Use an if statement")
 def test_if():
     with open(path, 'r') as content_file:
         content = content_file.read()
diff --git a/exercises/08-Delete_element/README.es.md b/exercises/08-Delete_element/README.es.md
@@ -1,17 +1,17 @@
 # `08` Delete element
 
-La unica forma de borrar a `Daniella` de la lista (sin trampas)
-será crear una nueva lista con todas las demás personas, excepto Daniella.
+La única forma de borrar a `Daniella` de la lista (sin trampas) sería crear una nueva lista con todas las demás personas, excepto `Daniella`.
 
 ## 📝 Instrucciones:
 
-1. Por favor, crea una función `deletePerson` que elimina a una persona dada de una lista y devuelve una nueva lista sin esa persona.
+1. Por favor, crea una función `delete_person` que elimine a una persona dada de una lista y devuelva una nueva lista sin esa persona.
 
-## Resultado esperado:
+## 💻 Resultado esperado:
 
  ```py
- Resultado:
- ['juan', 'ana', 'michelle', 'stefany', 'lucy', 'barak']
+Resultado:
+
+['juan', 'ana', 'michelle', 'stefany', 'lucy', 'barak']
 ['ana', 'michelle', 'daniella', 'stefany', 'lucy', 'barak']
 ['juan', 'ana', 'michelle', 'daniella', 'stefany', 'lucy', 'barak']
-```
+```
diff --git a/exercises/08-Delete_element/README.md b/exercises/08-Delete_element/README.md
@@ -1,16 +1,17 @@
 # `08` Delete element
 
-The only way to delete `Daniella` from the list (without cheating) will be to create a new list with all the other people but `Daniella`.
+The only way to delete `Daniella` from the list (without cheating) would be to create a new list with all the other people but `Daniella`.
 
 ## 📝 Instructions:
 
-1. Please create a `deletePerson` function that deletes any given person from the list and returns a new list without that person.
+1. Please create a `delete_person` function that deletes any given person from the list and returns a new list without that person.
 
-## Expected result:
+## 💻 Expected result:
 
  ```py
- Result:
- ['juan', 'ana', 'michelle', 'stefany', 'lucy', 'barak']
+Result:
+
+['juan', 'ana', 'michelle', 'stefany', 'lucy', 'barak']
 ['ana', 'michelle', 'daniella', 'stefany', 'lucy', 'barak']
 ['juan', 'ana', 'michelle', 'daniella', 'stefany', 'lucy', 'barak']
-```
+```
diff --git a/exercises/08-Delete_element/app.py b/exercises/08-Delete_element/app.py
@@ -1,9 +1,11 @@
 people = ['juan','ana','michelle','daniella','stefany','lucy','barak']
 
-#Your code go here:
-def deletePerson(person_name):
-    #Your code go here:
+def delete_person(person_name):
+    # Your code here
     
-print(deletePerson("daniella"))
-print(deletePerson("juan"))
-print(deletePerson("emilio"))
+
+    
+# Don't delete anything below
+print(delete_person("daniella"))
+print(delete_person("juan"))
+print(delete_person("emilio"))
diff --git a/exercises/08-Delete_element/solution.hide.py b/exercises/08-Delete_element/solution.hide.py
@@ -0,0 +1,15 @@
+people = ['juan','ana','michelle','daniella','stefany','lucy','barak']
+
+def delete_person(person_name):
+    # Your code here
+    updated_people = list(people)
+
+    if person_name in updated_people:
+        updated_people.remove(person_name)
+    
+    return updated_people
+    
+# Don't delete anything below
+print(delete_person("daniella"))
+print(delete_person("juan"))
+print(delete_person("emilio"))
diff --git a/exercises/08-Delete_element/test.py b/exercises/08-Delete_element/test.py
@@ -14,9 +14,9 @@ def test_for_loop():
         regex = re.compile(r"for(\s)")
         assert bool(regex.search(content)) == True
 
-@pytest.mark.it("Use if statement")
+@pytest.mark.it("Use an if statement")
 def test_if():
     with open(path, 'r') as content_file:
         content = content_file.read()
         regex = re.compile(r"if(\s)")
-        assert bool(regex.search(content)) == True
+        assert bool(regex.search(content)) == True
diff --git a/exercises/08.1-Merge_list/README.es.md b/exercises/08.1-Merge_list/README.es.md
@@ -1,27 +1,27 @@
-# `08.1` Merge list
-
-Dado que vivimos en un nuevo mundo, no deberían haber colores ni etiquetas ¿verdad?
+# `08.1` Merge List
 
 ## 📝 Instrucciones:
 
-Escribe una función que una dos listas y devuelva una nueva lista (`merge_list`) uniendo todos los valores de las dos listas.
+Escribe una función `merge_list` que una dos listas y devuelva una nueva lista uniendo todos los valores de las dos listas.
 
  1. Declara una lista vacía.
 
  2. Itera las dos listas.
 
- 3. Concatena los valores a la lista nueva (`merge_list`).
+ 3. Inserta los valores a la lista nueva.
+
+ 4. Imprime la nueva variable con las dos listas.
+
+## 💡 Pistas:
 
- 4. Imprime la variable con las dos listas.
++ Tendrás que iterar cada lista e insertar sus elementos en una nueva lista.
 
-## 💡 Pista:
++ Hay más formas para combinar listas en Python. Este es un buen momento para buscar en Internet "cómo combinar listas en python".
 
-- Tendrás que iterar cada lista e insertar sus elementos en una nueva lista.
-## Resultado esperado:
+## 💻 Resultado esperado:
 
 ```py
- Salida esperada:
- ['Lebron', 'Aaliyah', 'Diamond', 'Dominique', 'Aliyah', 'Jazmin', 'Darnell', 'Lucas', 'Jake', 'Scott', 'Amy', 'Molly', 'Hannah', 'Lucas']
+['Lebron', 'Aaliyah', 'Diamond', 'Dominique', 'Aliyah', 'Jazmin', 'Darnell', 'Lucas', 'Jake', 'Scott', 'Amy', 'Molly', 'Hannah', 'Lucas']
 ```
 
 
diff --git a/exercises/08.1-Merge_list/README.md b/exercises/08.1-Merge_list/README.md
diff --git a/exercises/08.1-Merge_list/app.py b/exercises/08.1-Merge_list/app.py
diff --git a/exercises/08.1-Merge_list/solution.hide.py b/exercises/08.1-Merge_list/solution.hide.py
