fixed company.py, for_dict_challenges.py +last task

Author: Alexey Chernykh

company.py

@@ -69,50 +69,51 @@
     department_salary = []
     for employer in department['employers']:
         department_salary.append(employer['salary_rub'])
-    print(f'Отдел {department["title"]} - минимальная зарплата {sorted(department_salary)[0]}')
+    print(f'Отдел {department["title"]} - минимальная зарплата {min(department_salary)}')
 
 for department in departments:  # task 8
     department_salary = []
     avg_salary = 0
     for employer in department['employers']:
         department_salary.append(employer['salary_rub'])
     avg_salary = sum(department_salary) / len(department_salary)
-    min_salary = sorted(department_salary)[0]
-    max_salary = sorted(department_salary)[-1]
+    min_salary = min(department_salary)
+    max_salary = max(department_salary)
     print(f'Отдел {department["title"]}: минимальная зарплата {min_salary}')
     print(f'Отдел {department["title"]}: максимальная зарплата {max_salary}')
     print(f'Отдел {department["title"]}: cредняя зарплата {int(avg_salary)}')
 
 avg_salary = 0  # task 9
-department_salary = []
+salary = []
 for department in departments:
     for employer in department['employers']:
-        department_salary.append(employer['salary_rub'])
-avg_salary = sum(department_salary) / len(department_salary)
+        salary.append(employer['salary_rub'])
+avg_salary = sum(salary) / len(salary)
 print(f'Средняя зарплата компании {avg_salary}')
 
-salary_over_90 = [] # task 10
+salary_cap = [] # task 10
 for department in departments:
     for employer in department['employers']:
         if employer['salary_rub'] > 90000:
-            salary_over_90.append(employer["position"])
-print(f'{", ".join(salary_over_90)} получают больше 90К')
+            salary_cap.append(employer["position"])
+print(f'{", ".join(salary_cap)} получают больше 90К')
 
-for department in departments:   # task 11
-    girls = ['Michelle', 'Nicole', 'Christina', 'Caitlin', ]
+girls = ['Michelle', 'Nicole', 'Christina', 'Caitlin', ]  # task 11
+for department in departments:
     girl_salary = []
     for employer in department['employers']:
         if employer['first_name'] in girls:
             girl_salary.append(employer['salary_rub'])
-            avg_girls_salary = sum(girl_salary) / len(girl_salary)
+    avg_girls_salary = sum(girl_salary) / len(girl_salary)
     print(f'Средняя зарплата девушек по {department["title"]} составляет: {int(avg_girls_salary)}')
 
 end_vowel_letter_in_last_name = []
 for department in departments:   # task 12
     for employer in department['employers']:
         if employer['last_name'][-1] in 'aeiouy':
             end_vowel_letter_in_last_name.append(employer["first_name"])
-print(f'Фамилии сотрудников {", ".join(end_vowel_letter_in_last_name)} оканчиваются на гласную букву')
+            end_vowel_letter_in_last_name_set = set(end_vowel_letter_in_last_name)
+print(f'Фамилии сотрудников {", ".join(end_vowel_letter_in_last_name_set)} оканчиваются на гласную букву')
 
 
 

for_dict_challenges.py

@@ -36,7 +36,7 @@ def max_name(students):
 
     names_counter = dict()
     for name in name_of_students:
-        if name in names_counter:
+        if names_counter.get(name):
             names_counter[name] += 1
         else:
             names_counter[name] = 1
@@ -52,8 +52,8 @@ def max_name(students):
             max_names.append(name)
     return f'Самое частое имя среди учеников: {"".join(max_names)}'
 
-
 print(max_name(students))
+
 # Задание 3
 # Есть список учеников в нескольких классах, нужно вывести самое частое имя в каждом классе.
 # Пример вывода:
@@ -76,14 +76,13 @@ def max_name(students):
         {'first_name': 'Саша'},
     ],
 ]
-print(max_name(school_students[0]))
-print(max_name(school_students[1]))
-print(max_name(school_students[2]))
+for name in range(len(school_students)):
+    print(max_name(school_students[name]))
 
 # Задание 4
 # Для каждого класса нужно вывести количество девочек и мальчиков в нём.
 # Пример вывода:
-# Класс 2a: девочки 2, мальчики 0 
+# Класс 2a: девочки 2, мальчики 0
 # Класс 2б: девочки 0, мальчики 2
 
 school = [
@@ -99,19 +98,15 @@ def max_name(students):
     'Даша': False,
 }
 
-male_gender = 0
-female_gender = 0
-
-for class_i in range(len(school)):
-    lst_of_class = [class_x for class_x in school[class_i]['students']]
-    for i in range(len(lst_of_class)):
-        if is_male.get(lst_of_class[i]['first_name']) == 1:
+for students in school:
+    male_gender = 0
+    female_gender = 0
+    for name in students['students']:
+        if is_male.get(name['first_name']):
             male_gender += 1
         else:
             female_gender += 1
-    print(f'Класс {school[class_i]["class"]}: девочки {female_gender}, мальчики {male_gender}')
-    male_gender = 0
-    female_gender = 0
+    print(f'Класс {students["class"]}: девочки {female_gender}, мальчики {male_gender}')
 
 
 # Задание 5
@@ -130,5 +125,15 @@ def max_name(students):
     'Олег': True,
     'Миша': True,
 }
-# ???
 
+for students in school:
+    male_gender = 0
+    female_gender = 0
+    for name in students['students']:
+        if is_male.get(name['first_name']):
+            male_gender += 1
+        else:
+            female_gender += 1
+        boys_predominate = 'Больше всего мальчиков в классе '
+        girls_predominate = 'Больше всего девочек в классе '
+    print(f'{boys_predominate}{students["class"]}') if male_gender > female_gender else print(f'{girls_predominate}{students["class"]}')