Edited solutions to pass after merge conflict

PC-coding · PC-coding · commit 769f697ec703 · 2020-08-09T12:52:28.000-04:00
diff --git a/introduction_and_environment/data_types_and_control_flow/1_list_max/solution/solution.py b/introduction_and_environment/data_types_and_control_flow/1_list_max/solution/solution.py
@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
-# L = [152, 463, 1112, 1337, -10]
-# LIST_MAX = sorted(L)[-1]
-
-# print(LIST_MAX(L))
-
 L = [152, 463, 1112, 1337, -10]
 def LIST_MAX1(L):
     current_max = L[0]
@@ -19,47 +9,4 @@ def LIST_MAX1(L):
         current_max = L[3]
     if L[4] > current_max:
         current_max = L[4]
-    return current_max
-<<<<<<< HEAD
-LIST_MAX = LIST_MAX1(L)
-=======
-L = [152, 463, 1112, 1337, -10]
-# def LIST_MAX(L):
-#     if L == []:
-#         LIST_MAX1 = None
-#     else:
-#         LIST_MAX1 = sorted(L)[-1]
-#     return LIST_MAX1
-
-# print(LIST_MAX(L))
-LIST_MAX = sorted(L)[-1]
-# print(LIST_MAX)
->>>>>>> d536594... Pushing exercises
-=======
-# L = [152, 463, 1112, 1337, -10]
-# LIST_MAX = sorted(L)[-1]
-
-# print(LIST_MAX(L))
-
-L = [152, 463, 1112, 1337, -10]
-def LIST_MAX1(L):
-    current_max = L[0]
-    if L[1] > current_max:
-        current_max = L[1]
-    if L[2] > current_max:
-        current_max = L[2]
-    if L[3] > current_max:
-        current_max = L[3]
-    if L[4] > current_max:
-        current_max = L[4]
-    return current_max
-<<<<<<< HEAD
-LIST_MAX = LIST_MAX1(L)
-
->>>>>>> f07cce6... Completed
-=======
-LIST_MAX = LIST_MAX1(L)
->>>>>>> 6cffc71... Completed Exercises
-=======
-LIST_MAX = LIST_MAX1(L)
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
+    return current_max
diff --git a/introduction_and_environment/data_types_and_control_flow/2_farm_area/Solution/solution.py b/introduction_and_environment/data_types_and_control_flow/2_farm_area/Solution/solution.py
@@ -1,26 +1,6 @@
-# Code your solution here
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
 # length = len(input())
 # breadth = len(input())
 length = 6
 breadth = 4
-<<<<<<< HEAD
-=======
-length = 6
-breadth = 4
-
->>>>>>> 39354d0... Completed Exercises
-=======
-# length = len(input())
-# breadth = len(input())
-length = 6
-breadth = 4
->>>>>>> f07cce6... Completed
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
 data = length * breadth
-print(data)
+print(data)
diff --git a/introduction_and_environment/data_types_and_control_flow/3_grade/Solution/solution.py b/introduction_and_environment/data_types_and_control_flow/3_grade/Solution/solution.py
@@ -1,11 +1,6 @@
 # Code your solution here
 def grade(mark):
     if mark >= 90:
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
         return 'A+ GRADE'
     elif mark >= 70:
         return 'B GRADE'
@@ -17,33 +12,4 @@ def grade(mark):
         return 'FAIL'
 # score = int(input("Enter your grade here:"))
 mark = 80
-print(grade(mark))
-<<<<<<< HEAD
-=======
-        # return 'A+ GRADE'
-        print('A+ GRADE')
-=======
-        return 'A+ GRADE'
->>>>>>> 9784d40... Completed
-    elif mark >= 70:
-        return 'B GRADE'
-    elif mark >= 50:
-        return 'C GRADE'
-    elif mark >= 35:
-        return 'D GRADE'
-    else:
-<<<<<<< HEAD
-        # return 'FAIL'
-        print('FAIL')
-score = int(input("Enter your grade here:"))
-print(grade(score))
->>>>>>> d536594... Pushing exercises
-=======
-        return 'FAIL'
-# score = int(input("Enter your grade here:"))
-mark = 80
-print(grade(mark))
->>>>>>> 9784d40... Completed
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
-# grade(score)
+print(grade(mark))
diff --git a/introduction_and_environment/data_types_and_control_flow/3_month_days/Solution/solution.py b/introduction_and_environment/data_types_and_control_flow/3_month_days/Solution/solution.py
@@ -1,5 +1,6 @@
 # Code your solution here
-month = input('Enter any month:')
+# month = input('Enter any month:')
+month = 'august'
 month_dict = {'january':'31', 'february':'28, 29', 'march':'31', 'april':'30', 'may':'31', 'june':'30', 'july':'31', 'august':'31','september':'30', 'october':'31', 'november':'30', 'december':'31'}
 def data(month):
     if month in month_dict.keys():
diff --git a/introduction_and_environment/data_types_and_control_flow/3_palindrome/Solution/solution.py b/introduction_and_environment/data_types_and_control_flow/3_palindrome/Solution/solution.py
@@ -1,6 +1,6 @@
 # Code your solution here
-line = input('Enter any string value:')
-
+# line = input('Enter any string value:')
+line = 'malayalam'
 if line == line[::-1]:
     is_palindrome = True
 else:
diff --git a/introduction_and_environment/data_types_and_control_flow/3_shape_check/Solution/solution.py b/introduction_and_environment/data_types_and_control_flow/3_shape_check/Solution/solution.py
@@ -1,5 +1,6 @@
 # Code your solution here
-figure = input('Enter any geometric shape value:')
+# figure = input('Enter any geometric shape value:')
+figure = '5'
 my_dict = {'3':'Triangle', '4':'Quadrilateral', '5':'Pentagon', '6':'Hexagon', '7':'Heptagon', '8':'Octagon', '9':'Nonagon'}
 
 def data(figure):
diff --git a/introduction_and_environment/data_types_and_control_flow/3_string_case/Solution/solution.py b/introduction_and_environment/data_types_and_control_flow/3_string_case/Solution/solution.py
@@ -1,17 +1,6 @@
 # Code your solution here
 string_val = str(input())
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 
-=======
->>>>>>> d536594... Pushing exercises
-=======
-
->>>>>>> 9784d40... Completed
-=======
-
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
 upper_data = string_val.upper()
 lower_data = string_val.lower()
 
diff --git a/introduction_and_environment/introduction_to_programming/2_ASCII/Solutions/solution.py b/introduction_and_environment/introduction_to_programming/2_ASCII/Solutions/solution.py
@@ -1,16 +1,2 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 # print('Hexadecimal')
-print('Boolean')
-=======
-print('Hexadecimal')
->>>>>>> 3569546... Exercises completed
-=======
-# print('Hexadecimal')
-print('Boolean')
->>>>>>> 9784d40... Completed
-=======
-# print('Hexadecimal')
-print('Boolean')
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
+print('Boolean')
diff --git a/introduction_and_environment/introduction_to_programming/2_operators/Solutions/solution.py b/introduction_and_environment/introduction_to_programming/2_operators/Solutions/solution.py
@@ -1,16 +1,2 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 # print('Boolean')
-print('Hexadecimal')
-=======
-print('Boolean')
->>>>>>> 3569546... Exercises completed
-=======
-# print('Boolean')
-print('Hexadecimal')
->>>>>>> 9784d40... Completed
-=======
-# print('Boolean')
-print('Hexadecimal')
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
+print('Hexadecimal')
diff --git a/introduction_and_environment/introduction_to_programming/3_bitwise_operators_1/Solutions/solution.py b/introduction_and_environment/introduction_to_programming/3_bitwise_operators_1/Solutions/solution.py
@@ -1,33 +1,9 @@
 x = 0
 y = 1
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
-
-Answer_and = x & y 
-Answer_or = x | y 
-Answer_not = ~ x
-<<<<<<< HEAD
-=======
-x & y = 0
-x | y = 1
-~ x, ~ y = 1, 0
-
-Answer_and = 0 
-Answer_or = 1
-Answer_not = 1, 0
->>>>>>> 3569546... Exercises completed
-=======
-
 Answer_and = x & y 
 Answer_or = x | y 
 Answer_not = ~ x
->>>>>>> 39354d0... Completed Exercises
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
 
 print(Answer_and)
 print(Answer_or)
diff --git a/introduction_and_environment/introduction_to_programming/3_logical_operators_2/Solutions/solution.py b/introduction_and_environment/introduction_to_programming/3_logical_operators_2/Solutions/solution.py
@@ -1,28 +1,5 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
 x = True
 y = False
 
 Answer = bool(x or y) 
-
-<<<<<<< HEAD
-print(Answer)
-=======
-x = 1
-y = 2
-
->>>>>>> 39354d0... Completed Exercises
-=======
-x = True
-y = False
-
-Answer = bool(x or y) 
-
-print(Answer)
->>>>>>> 9784d40... Completed
-=======
-print(Answer)
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
+print(Answer)
diff --git a/introduction_and_environment/unix_and_bash/2_bash_operators/solution/solution.py b/introduction_and_environment/unix_and_bash/2_bash_operators/solution/solution.py
@@ -1,26 +1,7 @@
 
 # Assign the correct strings below
 ONE = 'mkdir testdir && cd testdir'
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3569546... Exercises completed
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
 TWO = 'cat textfile.txt | grep and'
 THREE = 'ls >> contents.txt'
 FOUR = 'cd current || mkdir current'
-FIVE = 'pwd > currentpath.txt'
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-TWO = 'grep and textfile.txt'
-THREE = 'grep -r >> contents.txt'
-FOUR = 'cd current > current'
-FIVE = 'ls > currentpath.txt'
->>>>>>> 3b8cef1... Exercises completed
-=======
->>>>>>> 3569546... Exercises completed
-=======
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
+FIVE = 'pwd > currentpath.txt'
diff --git a/introduction_to_python/functions/1_range/Solution/solution.py b/introduction_to_python/functions/1_range/Solution/solution.py
@@ -1,26 +1,9 @@
+number = 99
 def range_100(number):
-    if number <= 100:
-        return 'GREATNESS'
-    else:
-<<<<<<< HEAD
-<<<<<<< HEAD
-        return 'OOPS'
-=======
-# Code your solution here
-
 # number = int(input('Enter any integer value:'))
-number = 99
-def result(number):
     if number <= 100:
         return 'GREATNESS'
     else:
         return 'OOPS'
 
-print(result(number))
->>>>>>> 6cffc71... Completed Exercises
-=======
-        return 'OOPS'
->>>>>>> 3f12b16... Updated and completed
-=======
-        return 'OOPS'
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
+print(range_100(number))
diff --git a/introduction_to_python/functions/1_return_hello/Solution/solution.py b/introduction_to_python/functions/1_return_hello/Solution/solution.py
@@ -1,23 +1,5 @@
-def hello(name):
-<<<<<<< HEAD
-<<<<<<< HEAD
-    val1 = 'Hello' + name
-    return val1
-=======
-# Code your solution here
 # name = input('Enter your name: ')
 name = 'Newton'
-def result(name):
-    val1 = 'Hello' + name
-    return val1
-
-print(result(name))
->>>>>>> 6cffc71... Completed Exercises
-=======
-    val1 = 'Hello ' + name
-    return val1
->>>>>>> 3f12b16... Updated and completed
-=======
-    val1 = 'Hello ' + name
-    return val1
->>>>>>> 95a635a4ecbbedb34125c1f8cacdc445bd0dbfd0
+def hello(name):
+    val1 = 'Hello' +' '+ name
+    return val1
diff --git a/introduction_to_python/functions/2_max_value/Solution/solution.py b/introduction_to_python/functions/2_max_value/Solution/solution.py
diff --git a/introduction_to_python/functions/2_shut_down/Solution/solution.py b/introduction_to_python/functions/2_shut_down/Solution/solution.py
diff --git a/introduction_to_python/functions/2_variable_argument/Solution/solution.py b/introduction_to_python/functions/2_variable_argument/Solution/solution.py
diff --git a/introduction_to_python/functions/3_count_even/Solution/solution.py b/introduction_to_python/functions/3_count_even/Solution/solution.py
diff --git a/introduction_to_python/functions/3_factorial/Solution/solution.py b/introduction_to_python/functions/3_factorial/Solution/solution.py
diff --git a/introduction_to_python/functions/3_total/Solution/solution.py b/introduction_to_python/functions/3_total/Solution/solution.py
