Merge branch 'Asabeneh:master' into master

Author: gingerhot

01_Day_Introduction/helloworld.py

@@ -3,9 +3,9 @@
 # Introduction
 # Day 1 - 30DaysOfPython Challenge
 
-print(2 + 3)   # addition(+)
-print(3 - 1)   # subtraction(-)
-print(2 * 3)   # multiplication(*)
+print(3 + 2)   # addition(+)
+print(3 - 2)   # subtraction(-)
+print(3 * 2)   # multiplication(*)
 print(3 / 2)   # division(/)
 print(3 ** 2)  # exponential(**)
 print(3 % 2)   # modulus(%)
@@ -21,3 +21,5 @@
 print(type({'name':'Asabeneh'})) # Dictionary
 print(type({9.8, 3.14, 2.7}))    # Set
 print(type((9.8, 3.14, 2.7)))    # Tuple
+print(type(3 == 3))              # Bool
+print(type(3 >= 3))              # Bool

02_Day_Variables_builtin_functions/02_variables_builtin_functions.md

@@ -63,7 +63,7 @@ Python Variable Name Rules
 - A variable name can only contain alpha-numeric characters and underscores (A-z, 0-9, and \_ )
 - Variable names are case-sensitive (firstname, Firstname, FirstName and FIRSTNAME) are different variables)
 
-Let us se valid variable names
+Here are some example of valid variable names:
 
 ```shell
 firstname
@@ -180,7 +180,7 @@ There are several data types in Python. To identify the data type we use the _ty
 ## Checking Data types and Casting
 
 - Check Data types: To check the data type of certain data/variable we use the _type_
-  **Example:**
+  **Examples:**
 
 ```py
 # Different python data types
@@ -193,22 +193,22 @@ city= 'Helsinki'            # str
 age = 250                   # int, it is not my real age, don't worry about it
 
 # Printing out types
-print(type('Asabeneh'))     # str
-print(type(first_name))     # str
-print(type(10))             # int
-print(type(3.14))           # float
-print(type(1 + 1j))         # complex
-print(type(True))           # bool
-print(type([1, 2, 3, 4]))     # list
-print(type({'name':'Asabeneh','age':250, 'is_married':250}))    # dict
-print(type((1,2)))                                              # tuple
-print(type(zip([1,2],[3,4])))                                   # set
+print(type('Asabeneh'))          # str
+print(type(first_name))          # str
+print(type(10))                  # int
+print(type(3.14))                # float
+print(type(1 + 1j))              # complex
+print(type(True))                # bool
+print(type([1, 2, 3, 4]))        # list
+print(type({'name':'Asabeneh'})) # dict
+print(type((1,2)))               # tuple
+print(type(zip([1,2],[3,4])))    # zip
 ```
 
 - Casting: Converting one data type to another data type. We use _int()_, _float()_, _str()_, _list_, _set_
   When we do arithmetic operations string numbers should be first converted to int or float otherwise it will return an error. If we concatenate a number with a string, the number should be first converted to a string. We will talk about concatenation in String section.
 
-  **Example:**
+  **Examples:**
 
 ```py
 # int to float
@@ -229,8 +229,10 @@ print(num_str)                  # '10'
 
 # str to int or float
 num_str = '10.6'
-print('num_int', int(num_str))      # 10
+num_float = float(num_str)
 print('num_float', float(num_str))  # 10.6
+num_int = int(num_float)
+print('num_int', int(num_int))      # 10
 
 # str to list
 first_name = 'Asabeneh'
@@ -281,13 +283,13 @@ Number data types in Python:
 1. Using the _len()_ built-in function, find the length of your first name
 1. Compare the length of your first name and your last name
 1. Declare 5 as num_one and 4 as num_two
-    1. Add num_one and num_two and assign the value to a variable total
-    2. Subtract num_two from num_one and assign the value to a variable diff
-    3. Multiply num_two and num_one and assign the value to a variable product
-    4. Divide num_one by num_two and assign the value to a variable division
-    5. Use modulus division to find num_two divided by num_one and assign the value to a variable remainder
-    6. Calculate num_one to the power of num_two and assign the value to a variable exp
-    7. Find floor division of num_one by num_two and assign the value to a variable floor_division
+1. Add num_one and num_two and assign the value to a variable total
+1. Subtract num_two from num_one and assign the value to a variable diff
+1. Multiply num_two and num_one and assign the value to a variable product
+1. Divide num_one by num_two and assign the value to a variable division
+1. Use modulus division to find num_two divided by num_one and assign the value to a variable remainder
+1. Calculate num_one to the power of num_two and assign the value to a variable exp
+1. Find floor division of num_one by num_two and assign the value to a variable floor_division
 1. The radius of a circle is 30 meters.
     1. Calculate the area of a circle and assign the value to a variable name of _area_of_circle_
     2. Calculate the circumference of a circle and assign the value to a variable name of _circum_of_circle_

04_Day_Strings/04_strings.md

@@ -102,10 +102,10 @@ Now, let us see the use of the above escape sequences with examples.
 ```py
 print('I hope everyone is enjoying the Python Challenge.\nAre you ?') # line break
 print('Days\tTopics\tExercises') # adding tab space or 4 spaces 
-print('Day 1\t3\t5')
-print('Day 2\t3\t5')
-print('Day 3\t3\t5')
-print('Day 4\t3\t5')
+print('Day 1\t5\t5')
+print('Day 2\t6\t20')
+print('Day 3\t5\t23')
+print('Day 4\t1\t35')
 print('This is a backslash  symbol (\\)') # To write a backslash
 print('In every programming language it starts with \"Hello, World!\"') # to write a double quote inside a single quote
 
@@ -328,16 +328,16 @@ print(challenge.expandtabs(10)) # 'thirty    days      of        python'
 
 ```py
 challenge = 'thirty days of python'
-print(challenge.find('y'))  # 16
-print(challenge.find('th')) # 17
+print(challenge.find('y'))  # 5
+print(challenge.find('th')) # 0
 ```
 
 - rfind(): Returns the index of the last occurrence of a substring, if not found returns -1
 
 ```py
 challenge = 'thirty days of python'
-print(challenge.rfind('y'))  # 5
-print(challenge.rfind('th')) # 1
+print(challenge.rfind('y'))  # 16
+print(challenge.rfind('th')) # 17
 ```
 
 - format(): formats string into a nicer output  
@@ -373,8 +373,9 @@ print(challenge.index(sub_string, 9)) # error
 ```py
 challenge = 'thirty days of python'
 sub_string = 'da'
-print(challenge.rindex(sub_string))  # 8
+print(challenge.rindex(sub_string))  # 7
 print(challenge.rindex(sub_string, 9)) # error
+print(challenge.rindex('on', 8)) # 19
 ```
 
 - isalnum(): Checks alphanumeric character

05_Day_Lists/05_lists.md

@@ -163,7 +163,7 @@ print(second_last)      # mango
 ### Unpacking List Items
 
 ```py
-lst = ['item','item2','item3', 'item4', 'item5']
+lst = ['item1','item2','item3', 'item4', 'item5']
 first_item, second_item, third_item, *rest = lst
 print(first_item)     # item1
 print(second_item)    # item2
@@ -175,7 +175,7 @@ print(rest)           # ['item4', 'item5']
 ```py
 # First Example
 fruits = ['banana', 'orange', 'mango', 'lemon','lime','apple']
-first_fruit, second_fruit, third_fruit, *rest = lst
+first_fruit, second_fruit, third_fruit, *rest = fruits 
 print(first_fruit)     # banana
 print(second_fruit)    # orange
 print(third_fruit)     # mango
@@ -364,7 +364,7 @@ print(fruits)       # []
 
 ### Copying a List
 
-It is possible to copy a list by reassigning it to a new variable in the following way: list2 = list1. Now, list2 is a reference of list1, any changes we make in list2 will also modify the original, list2. But there are lots of case in which we do not like to modify the original instead we like to have a different copy. One of way of avoiding the problem above is using _copy()_.
+It is possible to copy a list by reassigning it to a new variable in the following way: list2 = list1. Now, list2 is a reference of list1, any changes we make in list2 will also modify the original, list1. But there are lots of case in which we do not like to modify the original instead we like to have a different copy. One of way of avoiding the problem above is using _copy()_.
 
 ```py
 # syntax
@@ -562,7 +562,7 @@ To sort lists we can use _sort()_ method or _sorted()_ built-in functions. The _
     back_end = ['Node','Express', 'MongoDB']
     ```
 
-27. After joining the lists in question 26. Copy the joined list and assign it to a variable full_stack. Then insert Python and SQL after Redux.
+27. After joining the lists in question 26. Copy the joined list and assign it to a variable full_stack, then insert Python and SQL after Redux.
 
 ### Exercises: Level 2
 

07_Day_Sets/07_sets.md

@@ -48,14 +48,12 @@ Set is a collection of items. Let me take you back to your elementary or high sc
 
 ### Creating a Set
 
-We use curly brackets, {} to create a set or the *set()* built-in function.
+We use the _set()_ built-in function.
 
 - Creating an empty set
 
 ```py
 # syntax
-st = {}
-# or
 st = set()
 ```
 
@@ -80,7 +78,7 @@ We use **len()** method to find the length of a set.
 ```py
 # syntax
 st = {'item1', 'item2', 'item3', 'item4'}
-len(set)
+len(st)
 ```
 
 **Example:**
@@ -131,7 +129,7 @@ fruits.add('lime')
 ```
 
 - Add multiple items using _update()_
-  The *update()* allows to add multiple items to a set. The *update()* takes a list argument.
+  The _update()_ allows to add multiple items to a set. The _update()_ takes a list argument.
 
 ```py
 # syntax
@@ -174,7 +172,6 @@ fruits = {'banana', 'orange', 'mango', 'lemon'}
 removed_item = fruits.pop() 
 ```
 
-
 ### Clearing Items in a Set
 
 If we want to clear or empty the set we use _clear_ method.
@@ -346,7 +343,7 @@ dragon.difference(python)     # {'d', 'r', 'a', 'g'}
 
 ### Finding Symmetric Difference Between Two Sets
 
-It returns the the symmetric difference between two sets. It means that it returns a set that contains all items from both sets, except items that are present in both sets, mathematically: (A\B) ∪ (B\A)
+It returns the symmetric difference between two sets. It means that it returns a set that contains all items from both sets, except items that are present in both sets, mathematically: (A\B) ∪ (B\A)
 
 ```py
 # syntax
@@ -383,7 +380,7 @@ st2.isdisjoint(st1) # False
 
 ```py
 even_numbers = {0, 2, 4 ,6, 8}
-even_numbers = {1, 3, 5, 7, 9}
+odd_numbers = {1, 3, 5, 7, 9}
 even_numbers.isdisjoint(odd_numbers) # True, because no common item
 
 python = {'p', 'y', 't', 'h', 'o','n'}
@@ -427,7 +424,6 @@ age = [22, 19, 24, 25, 26, 24, 25, 24]
 1. Explain the difference between the following data types: string, list, tuple and set
 2. _I am a teacher and I love to inspire and teach people._ How many unique words have been used in the sentence? Use the split methods and set to get the unique words.
 
-
 🎉 CONGRATULATIONS ! 🎉
 
 [<< Day 6](../06_Day_Tuples/06_tuples.md) | [Day 8 >>](../08_Day_Dictionaries/08_dictionaries.md)

08_Day_Dictionaries/08_dictionaries.md

@@ -89,7 +89,7 @@ person = {
     'last_name':'Yetayeh',
     'age':250,
     'country':'Finland',
-    'is_marred':True,
+    'is_married':True,
     'skills':['JavaScript', 'React', 'Node', 'MongoDB', 'Python'],
     'address':{
         'street':'Space street',