diff --git a/__pycache__/exercise.cpython-36.pyc b/__pycache__/exercise.cpython-36.pyc new file mode 100644 index 0000000..f6bde2b Binary files /dev/null and b/__pycache__/exercise.cpython-36.pyc differ diff --git a/exercise.py b/exercise.py index 0ae90ce..e4bfbd8 100644 --- a/exercise.py +++ b/exercise.py @@ -1,13 +1,15 @@ # problem 1 # ------------------------------------------------------------------- # people = ['Bob Smith', 'Ken Jones', 'Alex Bradino'] - +order = "ascending" def sort_by_last_name(people, order): # return full names sorted by last name in either ascending or descending order # add doctests make sure it passes - pass - + #a = people.split(' ') + ordered_list = sorted(people) #This sorts by first name, not last + return ordered_list +#sort_by_last_name(people, order) # problem 2 # ------------------------------------------------------------------- # @@ -18,7 +20,14 @@ def sort_by_last_name(people, order): def create_dictionary_from_lists(names, ages): # {'James':4, 'Susan':9, 'Maggie':12} # add doctests make sure it passes - pass + """ + >>> create_dictionary_from_lists(['James', 'Susan', 'Maggie'], [4, 9, 12]) + {'James': 4, 'Susan': 9, 'Maggie': 12} + """ + dictionary = dict(zip(names, ages)) + return dictionary + +#create_dictionary_from_lists(names, ages) # problem 3 @@ -29,4 +38,13 @@ def create_dictionary_from_lists(names, ages): def square_even_values_and_sum_under_10(numbers): # 6^2 + 8^2] # add doctests make sure it passes - pass + """ + >>> square_even_values_and_sum_under_10([5, 6, 7, 8, 9, 10, 11, 12]) + [36, 64] + """ + new_list = list(filter(lambda n: (n < 10), numbers)) + newer_list = list(filter(lambda n: (n % 2 == 0), new_list)) + newest_list = list(map(lambda n: n**2, newer_list)) + return newest_list + +#square_even_values_and_sum_under_10(numbers)