Merge branch 'master' into python-loops-grammatical-error

Author: Asabeneh

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: [Asabeneh]
+thanks_dev: 
+custom: []

.gitignore

@@ -17,4 +17,5 @@ flask_project/ven/lib
 numpy.ipynb
 .ipynb_checkpoints
 .vscode/
+*~
 test.py

01_Day_Introduction/helloworld.py

@@ -1,9 +1,14 @@
 # Introduction
 # Day 1 - 30DaysOfPython Challenge
 
+print("Hello World!")   # print hello world
+
 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(%)
@@ -19,3 +24,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

@@ -33,7 +33,7 @@
 
 ## Built in functions
 
-In Python we have lots of built-in functions. Built-in functions are globally available for your use that mean you can make use of the built-in functions without importing or configuring. Some of the most commonly used Python built-in functions are the following: _print()_, _len()_, _type()_, _int()_, _float()_, _str()_, _input()_, _list()_, _dict()_, _min()_, _max()_, _sum()_, _sorted()_, _open()_, _file()_, _help()_, and _dir()_. In the following table you will see an exhaustive list of Python built-in functions taken from [python documentation](https://docs.python.org/3.9/library/functions.html).
+In Python we have lots of built-in functions. Built-in functions are globally available for your use that mean you can make use of the built-in functions without importing or configuring. Some of the most commonly used Python built-in functions are the following: _print()_, _len()_, _type()_, _int()_, _float()_, _str()_, _input()_, _list()_, _dict()_, _min()_, _max()_, _sum()_, _sorted()_, _open()_, _file()_, _help()_, and _dir()_. In the following table you will see an exhaustive list of Python built-in functions taken from [python documentation](https://docs.python.org/3/library/functions.html).
 
 ![Built-in Functions](../images/builtin-functions.png)
 
@@ -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,12 @@ print(num_str)                  # '10'
 
 # str to int or float
 num_str = '10.6'
+num_float = float(num_str)  # Convert the string to a float first
+num_int = int(num_float)    # Then convert the float to an integer
 print('num_int', int(num_str))      # 10
 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'
@@ -278,22 +282,22 @@ Number data types in Python:
 ### Exercises: Level 2
 
 1. Check the data type of all your variables using type() built-in function
-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. The radius of a circle is 30 meters.
+2. Using the _len()_ built-in function, find the length of your first name
+3. Compare the length of your first name and your last name
+4. Declare 5 as num_one and 4 as num_two
+5. Add num_one and num_two and assign the value to a variable total
+6. Subtract num_two from num_one and assign the value to a variable diff
+7. Multiply num_two and num_one and assign the value to a variable product
+8. Divide num_one by num_two and assign the value to a variable division
+9. Use modulus division to find num_two divided by num_one and assign the value to a variable remainder
+10. Calculate num_one to the power of num_two and assign the value to a variable exp
+11. Find floor division of num_one by num_two and assign the value to a variable floor_division
+12. 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_
     3. Take radius as user input and calculate the area.
-1. Use the built-in input function to get first name, last name, country and age from a user and store the value to their corresponding variable names
-1. Run help('keywords') in Python shell or in your file to check for the Python reserved words or keywords
+13. Use the built-in input function to get first name, last name, country and age from a user and store the value to their corresponding variable names
+14. Run help('keywords') in Python shell or in your file to check for the Python reserved words or keywords
 
 🎉 CONGRATULATIONS ! 🎉
 

02_Day_Variables_builtin_functions/variables.py

@@ -37,4 +37,5 @@
 print('Last name: ', last_name)
 print('Country: ', country)
 print('Age: ', age)
-print('Married: ', is_married)
+print('Married: ', is_married)
+

03_Day_Operators/03_operators.md

@@ -75,7 +75,7 @@ print('Division: ', 7 / 2)        # 3.5
 print('Division without the remainder: ', 7 // 2)   # 3,  gives without the floating number or without the remaining
 print ('Division without the remainder: ',7 // 3)   # 2
 print('Modulus: ', 3 % 2)         # 1, Gives the remainder
-print('Exponentiation: ', 2 ** 3) # 9 it means 2 * 2 * 2
+print('Exponentiation: ', 2 ** 3) # 8 it means 2 * 2 * 2
 ```
 
 **Example:Floats**
@@ -121,7 +121,7 @@ print('a * b = ', product)
 print('a / b = ', division)
 print('a % b = ', remainder)
 print('a // b = ', floor_division)
-print('a ** b = ', exponentiation)
+print('a ** b = ', exponential)
 ```
 
 **Example:**
@@ -148,7 +148,7 @@ print('division: ', div)
 print('remainder: ', remainder)
 ```
 
-Let us start start connecting the dots and start making use of what we already know to calculate (area, volume,density,  weight, perimeter, distance, force).
+Let us start connecting the dots and start making use of what we already know to calculate (area, volume,density,  weight, perimeter, distance, force).
 
 **Example:**
 
@@ -174,6 +174,7 @@ print(weight, 'N')                         # Adding unit to the weight
 mass = 75 # in Kg
 volume = 0.075 # in cubic meter
 density = mass / volume # 1000 Kg/m^3
+print(density, 'Kg/m^3') # Adding unit to the density
 
 ```
 
@@ -213,13 +214,13 @@ In addition to the above comparison operator Python uses:
 - _is_: Returns true if both variables are the same object(x is y)
 - _is not_: Returns true if both variables are not the same object(x is not y)
 - _in_: Returns True if the queried list contains a certain item(x in y)
-- _not in_: Returns True if the queried list doesn't have a certain item(x in y)
+- _not in_: Returns True if the queried list doesn't have a certain item(x not in y)
 
 ```py
 print('1 is 1', 1 is 1)                   # True - because the data values are the same
 print('1 is not 2', 1 is not 2)           # True - because 1 is not 2
 print('A in Asabeneh', 'A' in 'Asabeneh') # True - A found in the string
-print('B in Asabeneh', 'B' in 'Asabeneh') # False - there is no uppercase B
+print('B not in Asabeneh', 'B' in 'Asabeneh') # False - there is no uppercase B
 print('coding' in 'coding for all') # True - because coding for all has the word coding
 print('a in an:', 'a' in 'an')      # True
 print('4 is 2 ** 2:', 4 is 2 ** 2)   # True
@@ -287,7 +288,7 @@ The perimeter of the triangle is 12
 18. Check if the floor division of 7 by 3 is equal to the int converted value of 2.7.
 19. Check if type of '10' is equal to type of 10
 20. Check if int('9.8') is equal to 10
-21. Writ a script that prompts the user to enter hours and rate per hour. Calculate pay of the person?
+21. Write a script that prompts the user to enter hours and rate per hour. Calculate pay of the person?
 
 ```py
 Enter hours: 40

03_Day_Operators/day-3.py

@@ -10,7 +10,7 @@
 print('Division without the remainder: ', 7 // 2)   # gives without the floating number or without the remaining
 print('Modulus: ', 3 % 2)                           # Gives the remainder
 print ('Division without the remainder: ', 7 // 3)
-print('Exponential: ', 3 ** 2)                     # it means 3 * 3
+print('Exponential: ', 2 ** 3)                     # 8 it means 2 * 2 * 2
 
 # Floating numbers
 print('Floating Number,PI', 3.14)

04_Day_Strings/04_strings.md

@@ -92,7 +92,7 @@ print(len(full_name)) # 16
 In Python and other programming languages \ followed by a character is an escape sequence. Let us see the most common escape characters:
 
 - \n: new line
-- \t: Tab means(8 spaces)
+- \t: Tab means(8 spaces) 
 - \\\\: Back slash
 - \\': Single quote (')
 - \\": Double quote (")
@@ -101,18 +101,18 @@ 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('Days\tTopics\tExercises') # adding tab space or 4 spaces
+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
 
 # output
 I hope every one is enjoying the Python Challenge.
 Are you ?
-Days	Topics	Exercises
+Days  Topics  Exercises
 Day 1	5	    5
 Day 2	6	    20
 Day 3	5	    23
@@ -154,7 +154,7 @@ print(formated_string) # "The following are python libraries:['Django', 'Flask',
 
 #### New Style String Formatting (str.format)
 
-This formatting is introduced in Python version 3.
+This format was introduced in Python version 3.
 
 ```py
 
@@ -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  
@@ -349,7 +349,7 @@ last_name = 'Yetayeh'
 age = 250
 job = 'teacher'
 country = 'Finland'
-sentence = 'I am {} {}. I am a {}. I am {} years old. I live in {}.'.format(first_name, last_name, age, job, country)
+sentence = 'I am {} {}. I am a {}. I am {} years old. I live in {}.'.format(first_name, last_name, job, age, country)
 print(sentence) # I am Asabeneh Yetayeh. I am 250 years old. I am a teacher. I live in Finland.
 
 radius = 10
@@ -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
@@ -412,7 +413,7 @@ print(challenge.isdecimal())  # False
 challenge = '123'
 print(challenge.isdecimal())  # True
 challenge = '\u00B2'
-print(challenge.isdigit())   # False
+print(challenge.isdigit())   # True 
 challenge = '12 3'
 print(challenge.isdecimal())  # False, space not allowed
 ```
@@ -544,7 +545,7 @@ print(challenge.startswith('thirty')) # False
 9. Cut(slice) out the first word of _Coding For All_ string.
 10. Check if _Coding For All_ string contains a word Coding using the method index, find or other methods.
 11. Replace the word coding in the string 'Coding For All' to Python.
-12. Change Python for Everyone to Python for All using the replace method or other methods.
+12. Change "Python for Everyone" to "Python for All" using the replace method or other methods. 
 13. Split the string 'Coding For All' using space as the separator (split()) .
 14. "Facebook, Google, Microsoft, Apple, IBM, Oracle, Amazon" split the string at the comma.
 15. What is the character at index 0 in the string _Coding For All_.
@@ -560,7 +561,7 @@ print(challenge.startswith('thirty')) # False
 25. Slice out the phrase 'because because because' in the following sentence: 'You cannot end a sentence with because because because is a conjunction'
 26. Find the position of the first occurrence of the word 'because' in the following sentence: 'You cannot end a sentence with because because because is a conjunction'
 27. Slice out the phrase 'because because because' in the following sentence: 'You cannot end a sentence with because because because is a conjunction'
-28. Does '\'Coding For All' start with a substring _Coding_?
+28. Does 'Coding For All' start with a substring _Coding_?
 29. Does 'Coding For All' end with a substring _coding_?
 30. '   Coding For All      '  , remove the left and right trailing spaces in the given string.
 31. Which one of the following variables return True when we use the method isidentifier():

04_Day_Strings/day_4.py

@@ -30,7 +30,7 @@
 print(len(first_name))  # 8
 print(len(last_name))   # 7
 print(len(first_name) > len(last_name)) # True
-print(len(full_name)) # 15
+print(len(full_name)) # 16 
 
 #### Unpacking characters 
 language = 'Python'
@@ -153,7 +153,7 @@
 # isalpha(): Checks if all characters are alphabets
 
 challenge = 'thirty days of python'
-print(challenge.isalpha()) # True
+print(challenge.isalpha()) # False
 num = '123'
 print(num.isalpha())      # False
 
@@ -168,7 +168,7 @@
 challenge = 'Thirty'
 print(challenge.isdigit()) # False
 challenge = '30'
-print(challenge.digit())   # True
+print(challenge.isdigit())   # True 
 
 # isdecimal():Checks decimal characters
 
@@ -210,13 +210,13 @@
 # join(): Returns a concatenated string
 
 web_tech = ['HTML', 'CSS', 'JavaScript', 'React']
-result = '#, '.join(web_tech)
-print(result) # 'HTML# CSS# JavaScript# React'
+result = '# '.join(web_tech) 
+print(result) # 'HTML# CSS# JavaScript# React' 
 
 # strip(): Removes both leading and trailing characters
 
 challenge = ' thirty days of python '
-print(challenge.strip('y')) # 5
+print(challenge.strip()) # 'thirty days of python'
 
 # replace(): Replaces substring inside