Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
a846e34
Add homework1.py
Elvirience Oct 10, 2021
f500be7
made some changes
Elvirience Oct 10, 2021
041fe50
full complect
Elvirience Oct 10, 2021
5f5676f
new homework
Elvirience Oct 23, 2021
85714cb
Delete .gitignore
Elvirience Oct 23, 2021
92c43d0
Delete GU_BigData_1795.iml
Elvirience Oct 23, 2021
db745c2
Delete misc.xml
Elvirience Oct 23, 2021
dca6fdd
Delete vcs.xml
Elvirience Oct 23, 2021
714e1fe
Delete homework1.py
Elvirience Oct 23, 2021
3cbe562
Delete modules.xml
Elvirience Oct 23, 2021
2df76dc
Delete profiles_settings.xml
Elvirience Oct 23, 2021
722346d
update
Elvirience Oct 23, 2021
4d6d50c
update
Elvirience Oct 23, 2021
0a469ee
updates
Elvirience Oct 24, 2021
febc091
black
Elvirience Oct 24, 2021
ec8f1a8
last update
Elvirience Oct 24, 2021
04d5d95
waiting more...
Elvirience Oct 28, 2021
d0b3b96
Delete homework1.py
Elvirience Oct 28, 2021
023156f
Delete workspace.xml
Elvirience Oct 28, 2021
f936612
Delete modules.xml
Elvirience Oct 28, 2021
dd52ce4
Delete misc.xml
Elvirience Oct 28, 2021
261fd2f
Delete homework1.iml
Elvirience Oct 28, 2021
a5edea1
Delete workspace.xml
Elvirience Oct 28, 2021
b4226bb
Delete modules.xml
Elvirience Oct 28, 2021
0cc2cf7
Delete BigData.iml
Elvirience Oct 28, 2021
874fc08
Delete misc.xml
Elvirience Oct 28, 2021
fa25d66
Delete profiles_settings.xml
Elvirience Oct 28, 2021
37555d0
Delete profiles_settings.xml
Elvirience Oct 28, 2021
5176524
Delete modules.xml
Elvirience Oct 28, 2021
a628bec
Delete homework2.py
Elvirience Oct 28, 2021
67cbd83
Delete misc.xml
Elvirience Oct 28, 2021
66e67aa
Delete homework3.py
Elvirience Oct 28, 2021
c287bdc
Delete modules.xml
Elvirience Oct 28, 2021
33d034c
Delete workspace.xml
Elvirience Oct 28, 2021
a7d8772
Delete vcs.xml
Elvirience Oct 28, 2021
49ca3a8
Delete modules.xml
Elvirience Oct 28, 2021
9f50eb7
Delete homework4.py
Elvirience Oct 28, 2021
564802c
Delete misc.xml
Elvirience Oct 28, 2021
2fc08a8
Delete .gitignore
Elvirience Oct 28, 2021
6baccb5
Delete homework2.iml
Elvirience Oct 28, 2021
32704a8
Delete .gitignore
Elvirience Oct 28, 2021
9c60ad5
Delete BigData.iml
Elvirience Oct 28, 2021
0934a6e
Delete profiles_settings.xml
Elvirience Oct 28, 2021
4bdedb2
Delete BigData.iml
Elvirience Oct 28, 2021
02fb2f5
Delete profiles_settings.xml
Elvirience Oct 28, 2021
a4bdd73
Delete misc.xml
Elvirience Oct 28, 2021
e3d57df
Delete homework4.py
Elvirience Oct 28, 2021
e87533f
Delete .gitignore
Elvirience Oct 28, 2021
a018495
update
Elvirience Oct 29, 2021
b7bc23c
news
Elvirience Oct 29, 2021
88767b1
Update homework5.py
Elvirience Oct 29, 2021
2f14c9a
Update homework5.py
Elvirience Oct 29, 2021
db9c8ee
Update homework5.py
Elvirience Oct 29, 2021
730c11e
Update homework5.py
Elvirience Oct 29, 2021
741acd9
Update homework5.py
Elvirience Oct 29, 2021
0ab0232
Update homework5.py
Elvirience Oct 29, 2021
11e2689
Update homework5.py
Elvirience Oct 29, 2021
8f820c4
Update homework5.py
Elvirience Oct 29, 2021
0527bfc
Update homework5.py
Elvirience Oct 29, 2021
4bbfe17
Update homework5.py
Elvirience Oct 29, 2021
9aad30b
Update homework5.py
Elvirience Oct 29, 2021
e231949
Update homework5.py
Elvirience Oct 29, 2021
04697f1
new file
Elvirience Oct 29, 2021
3cc5b3e
Update homework5.py
Elvirience Oct 29, 2021
3adc021
Update homework5.py
Elvirience Oct 29, 2021
3863a50
update
Elvirience Oct 29, 2021
e014743
what if
Elvirience Oct 29, 2021
d1afc82
what if
Elvirience Oct 29, 2021
57cc339
Delete workspace.xml
Elvirience Oct 29, 2021
72d1827
Update homework5.py
Elvirience Oct 29, 2021
e26e3d6
Update homework5.py
Elvirience Oct 29, 2021
fcbfc39
Update homework5.py
Elvirience Oct 29, 2021
a871926
Update homework5.py
Elvirience Oct 29, 2021
074e331
Update homework5.py
Elvirience Oct 29, 2021
8e9ef1d
Update homework5.py
Elvirience Oct 31, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md

This file was deleted.

3 changes: 3 additions & 0 deletions lesson5/ex2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
do did done
1 2 3
Привет
17 changes: 17 additions & 0 deletions lesson5/ex3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Несветова 150000
Адамов 98687
Денисов 231185
Рюрикович 127080
Робертс 1000000
Монтана 398400
Тодд 580900
О'Клай 497568
Королев 352698
Руккулус 19500
Катрин 18668
Агеев 3140329
Басов 2000288
Макушин 1400356
Годес 190543
Бирюков 32999
Пискарев 400650
4 changes: 4 additions & 0 deletions lesson5/ex4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
One - 1
Two - 2
Three - 3
Four - 4
1 change: 1 addition & 0 deletions lesson5/ex5.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5 0 1 2 3 7 9 5 6 81 4 56 1
10 changes: 10 additions & 0 deletions lesson5/ex6.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Матанализ: 16(л) 8(пр) -
Физика: 16(л) 8(пр) 5(лаб)
Теринф: 8(л) 8(пр) 2(лаб)
Английский: - 24(пр) -
Тервер: 16(л) 16(пр) -
Дифуры: 16(л) 16(пр) -
Дискретка: 16(л) 16(пр) -
ОПД: - 8(пр) 1(лаб)
Физра: - - 8(лаб)
ТФКП: 16(лек) - -
7 changes: 7 additions & 0 deletions lesson5/ex7.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
MosAuto OOO 7545745 3344667
SeriousBank OAO 4356043809 5495405
GeneralStatistics OOO 7547547 434244
WildestNanos OAO 5435954 454598
NoNamers ZAO 4507497975 0
Moshpitttt OAO 94594 394293
Elvirience OAO 3464943080 48545008
174 changes: 174 additions & 0 deletions lesson5/homework5.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
"""
Агеев Георгий BigData 1795
"""
"""
Не успевал сдать нормальную работу вовремя, поэтому коммитил изменения
Буду очень признателен, если у вас есть возможность оценить последнюю версию, а не первую
"""


import json


def num1():
fin = open('ex1.txt', 'w', encoding='UTF-8')
data = input('Введите данные для записи в файл или пустую строку: ')
while data != '':
fin.write(data + '\n')
data = input('Введите данные для записи в файл или пустую строку: ')
fin.close()


def num2(lines=0, words=0):
fout = open('ex2.txt', encoding='UTF-8')
for i in fout.readlines():
print(f"Число слов в строке {lines + 1}: {len(i.split())}")
lines += 1
print(f'Число строк: {lines}')
fout.close()


def num3(i=0, count=0):
with open('ex3.txt', encoding='UTF-8') as fout:
for line in fout:
surname, salary = line.split()
i += int(salary)
if int(salary) < 20000:
print(surname)
count += 1
print(f'Средняя величина дохода: {int(i / count)}')


def num4(i=0):
fout = open('ex4.txt', encoding='UTF-8')
fin = open('ex4_in.txt', 'w', encoding='UTF-8')
my_list = ['Один', 'Два', 'Три', 'Четыре']
for line in fout:
line = line.split(' - ')
line[0] = my_list[i]
fin.write(' - '.join(line))
i += 1
fout.close()
fin.close()


def num5(i=0, sum=0):
with open('ex5.txt', 'w+', encoding='UTF - 8') as fin:
fin.write('5 0 1 2 3 7 9 5 6 81 4 56 1')
fin.seek(0)
for i in fin.readline().split():
sum += int(i)
print(sum)


"""
Сначал успел сделать только топорный вариант в рамках заполнения файла, как в примере.
В 6.2 позже описал более универсальное решение
"""


def num6(result_dict={}):
with open('ex6.txt', encoding='UTF - 8') as fout:
for line in fout:
line = line.split()
sum = 0
"""
Разбил строку на слова без пробелов
"""
for i in line:
"""
Каждое слово делю на две части по "("
Для названия предмета, которое всегда стоит первым элементом в списке,
а так же для случаев, когда стоит прочерк, описываю try - except:
"""
try:
i = i.split('(')
sum += int(i[0])
except ValueError:
pass
"""
line[0] - первый элемент каждой строки в файле - название предмета
После названия предмета следует ":", поэтому делаю срез строки
"""
unit_dict = {line[0][:-1]: {sum}}
result_dict.update(unit_dict)
print(result_dict)


def num6_2(result_dict={}):
with open('ex6.txt', encoding='UTF - 8') as fout:
for line in fout:
line = line.split()
"""
Для каждой строки обнуляю общее число занятий по предмету
"""
sum = 0
for element in line:
"""
Ищу символы в элементах списка строк, которые на самом деле являются числами
Перед проверкой каждого элемента списка строка пустая
"""
string = ''
for symbol in element:
try:
int(symbol)
string += symbol
except ValueError:
pass
"""
Обработка исключений на случай,
если стоит прочерк (чтобы не int(string), где string = '')
В остальных случаях прибавляю найденное число занятий
"""
try:
sum += int(string)
except ValueError:
pass
unit_dict = {line[0][:-1]: {sum}}
result_dict.update(unit_dict)
print(result_dict)


def num7(all_profit=0, count=0, firm_dict={}):
with open('ex7.txt', encoding='UTF - 8') as fout:
for line in fout:
line = line.split()
profit = int(line[2]) - int(line[3])
if profit > 0:
all_profit += profit
else:
pass
count += 1
unit_dict = {line[0]: profit}
firm_dict.update(unit_dict)
my_list = [firm_dict, {'Average profit': all_profit / count}]
print(my_list)
"""
json
"""
with open('ex7.json', 'w', encoding='UTF - 8') as fin:
fin.write(json.dumps(my_list))


"""
main():
"""
q = ' '
while q != '':
q = input('Введите номер задания или нажмите ENTER: ')
if q == '1':
num1()
elif q == '2':
num2()
elif q == '3':
num3()
elif q == '4':
num4()
elif q == '5':
num5()
elif q == '6':
num6()
elif q == '6.2':
num6_2()
elif q == '7':
num7()