From f1cee14254b5cd78cc1c54dddb6f8b4e7011b687 Mon Sep 17 00:00:00 2001 From: Eugeny KOnstantinov Date: Mon, 19 Oct 2020 18:26:48 +0300 Subject: [PATCH 1/4] Added name and surname --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 46f9eea..c573c2b 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# Tprogramming_184_2020 \ No newline at end of file +# Tprogramming_184_2020 + +## Eugeny Konstantinov \ No newline at end of file From 4a2853a2f0f7a521b43025afc8cde9a7a5f94081 Mon Sep 17 00:00:00 2001 From: Eugeny KOnstantinov Date: Mon, 26 Oct 2020 17:34:07 +0300 Subject: [PATCH 2/4] initial lab --- .gitignore | 1 + .vscode/launch.json | 15 ++++++ Pipfile | 12 +++++ Pipfile.lock | 108 ++++++++++++++++++++++++++++++++++++++++++++ hello.py | 2 + 5 files changed, 138 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 Pipfile create mode 100644 Pipfile.lock create mode 100644 hello.py diff --git a/.gitignore b/.gitignore index b6e4761..b8757aa 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ dmypy.json # Pyre type checker .pyre/ +settings.json \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..17e15f2 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Python: Current File", + "type": "python", + "request": "launch", + "program": "${file}", + "console": "integratedTerminal" + } + ] +} \ No newline at end of file diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..b07123f --- /dev/null +++ b/Pipfile @@ -0,0 +1,12 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] +pylint = "*" + +[packages] + +[requires] +python_version = "3.9" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..51b26d4 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,108 @@ +{ + "_meta": { + "hash": { + "sha256": "adde8a7d5cfb21874ab5990863b66d22388740f67ef3e9dea28713c498f7167f" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.9" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": {}, + "develop": { + "astroid": { + "hashes": [ + "sha256:2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703", + "sha256:bc58d83eb610252fd8de6363e39d4f1d0619c894b0ed24603b881c02e64c7386" + ], + "markers": "python_version >= '3.5'", + "version": "==2.4.2" + }, + "colorama": { + "hashes": [ + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + ], + "markers": "sys_platform == 'win32'", + "version": "==0.4.4" + }, + "isort": { + "hashes": [ + "sha256:dcab1d98b469a12a1a624ead220584391648790275560e1a43e54c5dceae65e7", + "sha256:dcaeec1b5f0eca77faea2a35ab790b4f3680ff75590bfcb7145986905aab2f58" + ], + "markers": "python_version >= '3.6' and python_version < '4.0'", + "version": "==5.6.4" + }, + "lazy-object-proxy": { + "hashes": [ + "sha256:0c4b206227a8097f05c4dbdd323c50edf81f15db3b8dc064d08c62d37e1a504d", + "sha256:194d092e6f246b906e8f70884e620e459fc54db3259e60cf69a4d66c3fda3449", + "sha256:1be7e4c9f96948003609aa6c974ae59830a6baecc5376c25c92d7d697e684c08", + "sha256:4677f594e474c91da97f489fea5b7daa17b5517190899cf213697e48d3902f5a", + "sha256:48dab84ebd4831077b150572aec802f303117c8cc5c871e182447281ebf3ac50", + "sha256:5541cada25cd173702dbd99f8e22434105456314462326f06dba3e180f203dfd", + "sha256:59f79fef100b09564bc2df42ea2d8d21a64fdcda64979c0fa3db7bdaabaf6239", + "sha256:8d859b89baf8ef7f8bc6b00aa20316483d67f0b1cbf422f5b4dc56701c8f2ffb", + "sha256:9254f4358b9b541e3441b007a0ea0764b9d056afdeafc1a5569eee1cc6c1b9ea", + "sha256:9651375199045a358eb6741df3e02a651e0330be090b3bc79f6d0de31a80ec3e", + "sha256:97bb5884f6f1cdce0099f86b907aa41c970c3c672ac8b9c8352789e103cf3156", + "sha256:9b15f3f4c0f35727d3a0fba4b770b3c4ebbb1fa907dbcc046a1d2799f3edd142", + "sha256:a2238e9d1bb71a56cd710611a1614d1194dc10a175c1e08d75e1a7bcc250d442", + "sha256:a6ae12d08c0bf9909ce12385803a543bfe99b95fe01e752536a60af2b7797c62", + "sha256:ca0a928a3ddbc5725be2dd1cf895ec0a254798915fb3a36af0964a0a4149e3db", + "sha256:cb2c7c57005a6804ab66f106ceb8482da55f5314b7fcb06551db1edae4ad1531", + "sha256:d74bb8693bf9cf75ac3b47a54d716bbb1a92648d5f781fc799347cfc95952383", + "sha256:d945239a5639b3ff35b70a88c5f2f491913eb94871780ebfabb2568bd58afc5a", + "sha256:eba7011090323c1dadf18b3b689845fd96a61ba0a1dfbd7f24b921398affc357", + "sha256:efa1909120ce98bbb3777e8b6f92237f5d5c8ea6758efea36a473e1d38f7d3e4", + "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.4.3" + }, + "mccabe": { + "hashes": [ + "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" + ], + "version": "==0.6.1" + }, + "pylint": { + "hashes": [ + "sha256:bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210", + "sha256:bfe68f020f8a0fece830a22dd4d5dddb4ecc6137db04face4c3420a46a52239f" + ], + "index": "pypi", + "version": "==2.6.0" + }, + "six": { + "hashes": [ + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "version": "==1.15.0" + }, + "toml": { + "hashes": [ + "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f", + "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88" + ], + "version": "==0.10.1" + }, + "wrapt": { + "hashes": [ + "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" + ], + "version": "==1.12.1" + } + } +} diff --git a/hello.py b/hello.py new file mode 100644 index 0000000..cd4570b --- /dev/null +++ b/hello.py @@ -0,0 +1,2 @@ +name = "Konstantinov Eugeny" +print(f"Hello {name}") From 99a81ce55ec78c4b42346a31e9ecba78fe53e07b Mon Sep 17 00:00:00 2001 From: Qu1s Date: Mon, 26 Oct 2020 18:52:53 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 2 +- Hu.py | 2 ++ Pipfile | 2 +- Pipfile.lock | 37 +++++++++++++++++++++++++++++++++++-- README.md | 2 +- m.py | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 Hu.py create mode 100644 m.py diff --git a/.vscode/launch.json b/.vscode/launch.json index 17e15f2..9829b87 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "version": "0.2.0", "configurations": [ { - "name": "Python: Current File", + "name": "Python: Текущий файл", "type": "python", "request": "launch", "program": "${file}", diff --git a/Hu.py b/Hu.py new file mode 100644 index 0000000..15ea95b --- /dev/null +++ b/Hu.py @@ -0,0 +1,2 @@ +name = 'Lampasova Anastasia' +print(f'Hello {name}') diff --git a/Pipfile b/Pipfile index b07123f..1ae2d73 100644 --- a/Pipfile +++ b/Pipfile @@ -9,4 +9,4 @@ pylint = "*" [packages] [requires] -python_version = "3.9" +python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 51b26d4..e0e9eae 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "adde8a7d5cfb21874ab5990863b66d22388740f67ef3e9dea28713c498f7167f" + "sha256": "ed63b31f068d51bac7a2fd34e605f75dbafcc8c96209103c96edcd09c836d424" }, "pipfile-spec": 6, "requires": { - "python_version": "3.9" + "python_version": "3.7" }, "sources": [ { @@ -98,6 +98,39 @@ ], "version": "==0.10.1" }, + "typed-ast": { + "hashes": [ + "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355", + "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919", + "sha256:0d8110d78a5736e16e26213114a38ca35cb15b6515d535413b090bd50951556d", + "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa", + "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652", + "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75", + "sha256:3742b32cf1c6ef124d57f95be609c473d7ec4c14d0090e5a5e05a15269fb4d0c", + "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01", + "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d", + "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1", + "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907", + "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c", + "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3", + "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b", + "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614", + "sha256:92c325624e304ebf0e025d1224b77dd4e6393f18aab8d829b5b7e04afe9b7a2c", + "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb", + "sha256:b52ccf7cfe4ce2a1064b18594381bccf4179c2ecf7f513134ec2f993dd4ab395", + "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b", + "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41", + "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6", + "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34", + "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe", + "sha256:d648b8e3bf2fe648745c8ffcee3db3ff903d0817a01a12dd6a6ea7a8f4889072", + "sha256:fac11badff8313e23717f3dada86a15389d0708275bddf766cca67a84ead3e91", + "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4", + "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7" + ], + "markers": "implementation_name == 'cpython' and python_version < '3.8'", + "version": "==1.4.1" + }, "wrapt": { "hashes": [ "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" diff --git a/README.md b/README.md index c573c2b..c31b735 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Tprogramming_184_2020 -## Eugeny Konstantinov \ No newline at end of file +## Лампасова Анастасия 2/184 \ No newline at end of file diff --git a/m.py b/m.py new file mode 100644 index 0000000..9a0188c --- /dev/null +++ b/m.py @@ -0,0 +1,35 @@ +import math +def calc(a, b, x): + numerator = math.asin(math.pow(x,a))-math.acos(math.pow(x,b)) + return numerator + +def task_a(a, b, xn, xk, dx): + x = xn + y = [] + while x <= xk: + res = calc(a, b, x) + y.append(res) + x += dx + return y + +def task_b(a, b, x_arr): + y = [] + for x in x_arr: + res = calc(a, b, x) + y.append(res) + return y + + +if __name__ == "__main__": + a = 2 + b = 3 + x = 0.11 + y = calc(a, b, x) + print(f'x={x:.3f} y={y:.3f}') + + a_res = task_a(a, b, 0.11, 0.36, 0.05) + print(a_res) + + x_arr = [0.08, 0.26, 0.35, 0.41, 0.53] + b_res = task_b(a, b, x_arr) + print(b_res) \ No newline at end of file From ce0e5e6a67a5861e1df6a648d45460a4c54a91e2 Mon Sep 17 00:00:00 2001 From: Tvarinka Date: Mon, 26 Oct 2020 19:54:07 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- m.py | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/m.py b/m.py index 9a0188c..200e7d4 100644 --- a/m.py +++ b/m.py @@ -1,35 +1,44 @@ +import matplotlib.pyplot as plt import math + def calc(a, b, x): numerator = math.asin(math.pow(x,a))-math.acos(math.pow(x,b)) return numerator def task_a(a, b, xn, xk, dx): x = xn - y = [] + result = [] while x <= xk: - res = calc(a, b, x) - y.append(res) + y = calc(a, b, x) + result.append([x, y]) x += dx - return y + return result def task_b(a, b, x_arr): - y = [] + result = [] for x in x_arr: - res = calc(a, b, x) - y.append(res) - return y + y = calc(a, b, x) + result.append([x, y]) + return result if __name__ == "__main__": a = 2 b = 3 - x = 0.11 - y = calc(a, b, x) - print(f'x={x:.3f} y={y:.3f}') + xn = -1 + xk = 0.36 + dx = 0.05 + + y = calc(a, b, xn) + print(f'x={xn:.3f} y={y:.3f}') - a_res = task_a(a, b, 0.11, 0.36, 0.05) + a_res = task_a(a, b, xn, xk, dx) print(a_res) x_arr = [0.08, 0.26, 0.35, 0.41, 0.53] b_res = task_b(a, b, x_arr) - print(b_res) \ No newline at end of file + print(b_res) + + plt.plot(*zip(*a_res), 'b') + plt.plot(*zip(*b_res), 'r') + plt.show() \ No newline at end of file