Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Exam/Exam merz
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
a = [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]
Copy link
Copy Markdown
Contributor Author

@jskonst jskonst May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Расширение для файла, тесты - ну и хорошо бы обернуть в функцию

b = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
result = list(set(a) & set(b))
print(result)
3 changes: 2 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ name = "pypi"
[dev-packages]
mypy = "*"
flake8 = "*"
pylint = "*"

[requires]
python_version = "3.9"
python_version = "3.10"
173 changes: 171 additions & 2 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tprogramming_2022_zaochn

Мерзляков Алексей
### Установка виртуального окружения

```shell
Expand Down
27 changes: 27 additions & 0 deletions lab/summ_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import unittest
import task

class TestSumm(unittest.TestCase):

def test_positive(self):
res = task.summ(2, 3)
self.assertEqual(5, res)

def test_negative(self):
res = task.summ(-2, -3)
self.assertEqual(-5, res)

def test_first_negative(self):
res = task.summ(-2, 3)
self.assertEqual(1, res)

def test_second_negative(self):
res = task.summ(2, -3)
self.assertEqual(-1, res)

def test_zero(self):
res = task.summ(0, 0)
self.assertEqual(0, res)

if __name__ == '__main__':
unittest.main()
34 changes: 34 additions & 0 deletions lab/task.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import math

def summ(a:float, b:float) -> float:
return a + b

# def calc(a:float, b: float, x: float) -> float:
def calc(a, b, x):
chisl = (math.sin(a + b*x))**3.5
znamen = 1 + math.cos(abs(math.log(a + b*x, 2)))
y = chisl / znamen
return y

def task_a(a, b, xn, xk, dx):
x = xn
x_arr = []
y = []
while x <= xk:
y.append(calc(a, b, x))
x_arr.append(x)
x += dx
return (x_arr,y)

def task_b(a, b, x):
y = []
for item in x:
y.append(calc(a, b, item))
return y

if __name__ == "__main__":
print(calc(2.5, 4.6, 1.15))
x, y = task_a(2.5, 4.6, 1.15, 3.05, 0.38) # (x,y)
print(x, y)
y = task_b(2.5, 4.6,[1.2, 1.36, 1.57, 1.93, 2.25])
print(y)
41 changes: 41 additions & 0 deletions lab/task_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import unittest
import task

class TestTask(unittest.TestCase):

def test_calc(self):
res = task.calc(2.5, 4.6, 1.15)
self.assertAlmostEqual(61.47, res, 2)

def test_calc_zeros(self):
res = task.calc(2.5, 4.6, 0)
self.assertAlmostEqual(0.13, res, 2)

def test_task_a_ok(self):
x, y = task.task_a(2.5, 4.6, 0, 0.5, 0.1)
self.assertEqual(6, len(x))
self.assertEqual(6, len(y))

def test_task_a_xk_lt_xn(self):
x, y = task.task_a(2.5, 4.6, 1, 0, 0.1)
self.assertEqual(0, len(x))
self.assertEqual(0, len(y))

def test_task_a_dx_gt_xk(self):
x, y = task.task_a(2.5, 4.6, 0, 1, 10)
self.assertEqual(1, len(x))
self.assertEqual(1, len(y))

def test_task_b_ok(self):
x = [0, 0.1 , 0.2, 0.3]
y = task.task_b(2.5, 4.6,x)
self.assertEqual(len(x), len(y))

def test_task_b_empty(self):
x = []
y = task.task_b(2.5, 4.6,x)
self.assertEqual(0, len(y))


if __name__ == '__main__':
unittest.main()
37 changes: 37 additions & 0 deletions python_learn/module_4.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
a = []
print(a)
a = [1,2,3,"some", "another", [5,6,"inner"], "last"]
print(a)
print(a[0])
print(a[6])
print(a[5])
print(len(a))
print(a[len(a)-1])
print(a[-1])
print(a[:3])
print(a[3:-1])
print(a[3:])

some = a[5]
print(some[-1])

print(a[5][-1])

some = [1,2,3]
copy = []
for item in some:
copy.append(item)
some.append("added")
print(some)
print(copy)

sample = { "Russia": {
"capital": "Moscow"
},
"UK": {
"capital": "London",
"population": 20000
}
}
print(sample["Russia"])
print(sample["UK"]["population"])
5 changes: 4 additions & 1 deletion python_learn/oop/phone.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ def call(self, phoneNumber: str):
print(f"AT+{phoneNumber}")

def accept_call(self) -> None:
print(f"{self.__name} принимаю звонок")
print(f"{self.__name} принимаю звонок")

if __name__ == "__main__":
print("hello")