From 5d965c6ddd9b275c0b539834adb2b3a47acc85aa Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Sat, 18 Sep 2021 13:37:28 +0300 Subject: [PATCH 01/12] Jskonst (#2) * Add information about course in readme * Fixed readme --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 95b4917..28dc6ee 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ -# Informatics_2021 \ No newline at end of file +# Informatics_2021 + +Repository for lectures on informatics for 2021 + +## Tools + +ToDo Need to define \ No newline at end of file From c52896bd8561d235eff12e909f063a393397785d Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Mon, 20 Sep 2021 19:05:37 +0300 Subject: [PATCH 02/12] Added surname --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 28dc6ee..96545ee 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Repository for lectures on informatics for 2021 +## Konstantinov Eugeny + ## Tools ToDo Need to define \ No newline at end of file From 88b696a804a5ccc1a5040059a45aece4665599b2 Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Sat, 25 Sep 2021 13:45:09 +0300 Subject: [PATCH 03/12] C++ first sample --- .gitignore | 105 +++++++++++++++++++++++++++-------------------------- LICENSE | 42 ++++++++++----------- README.md | 20 +++++----- first.cpp | 41 +++++++++++++++++++++ 4 files changed, 126 insertions(+), 82 deletions(-) create mode 100644 first.cpp diff --git a/.gitignore b/.gitignore index c6127b3..d22c254 100644 --- a/.gitignore +++ b/.gitignore @@ -1,52 +1,53 @@ -# Prerequisites -*.d - -# Object files -*.o -*.ko -*.obj -*.elf - -# Linker output -*.ilk -*.map -*.exp - -# Precompiled Headers -*.gch -*.pch - -# Libraries -*.lib -*.a -*.la -*.lo - -# Shared objects (inc. Windows DLLs) -*.dll -*.so -*.so.* -*.dylib - -# Executables -*.exe -*.out -*.app -*.i*86 -*.x86_64 -*.hex - -# Debug files -*.dSYM/ -*.su -*.idb -*.pdb - -# Kernel Module Compile Results -*.mod* -*.cmd -.tmp_versions/ -modules.order -Module.symvers -Mkfile.old -dkms.conf +# Prerequisites +*.d + +# Object files +*.o +*.ko +*.obj +*.elf + +# Linker output +*.ilk +*.map +*.exp + +# Precompiled Headers +*.gch +*.pch + +# Libraries +*.lib +*.a +*.la +*.lo + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*.i*86 +*.x86_64 +*.hex + +# Debug files +*.dSYM/ +*.su +*.idb +*.pdb + +# Kernel Module Compile Results +*.mod* +*.cmd +.tmp_versions/ +modules.order +Module.symvers +Mkfile.old +dkms.conf +*.out diff --git a/LICENSE b/LICENSE index c90de33..7beecf0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,21 @@ -MIT License - -Copyright (c) 2021 ISUCT - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT License + +Copyright (c) 2021 ISUCT + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 96545ee..32eec42 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ -# Informatics_2021 - -Repository for lectures on informatics for 2021 - -## Konstantinov Eugeny - -## Tools - -ToDo Need to define \ No newline at end of file +# Informatics_2021 + +Repository for lectures on informatics for 2021 + +## Konstantinov Eugeny + +## Tools + +ToDo Need to define + + diff --git a/first.cpp b/first.cpp new file mode 100644 index 0000000..46bea28 --- /dev/null +++ b/first.cpp @@ -0,0 +1,41 @@ +#include +using namespace std; + +// Однострочные комментарии + +// 8 bit - 1 byte - 2^8 - 256 (0-255) +// 1000 0001 -128 +127 +// short - 2 bytes 2^16 +// - 2^15 + (2^15-1) + + +/** Multiline +* Comment +* Sample +**/ +int main(int argc, char *argv[]) { // Функция main + cout << "Hello world!" << endl; + cout << "Hello Informatics" << endl; + + int age = 25; + cout << "Age = " << age <<" , size = " << sizeof(age) < +using namespace std; + +// Однострочные комментарии + +// 8 bit - 1 byte - 2^8 - 256 (0-255) +// 1000 0001 -128 +127 +// short - 2 bytes 2^16 +// - 2^15 + (2^15-1) + + +/** Multiline +* Comment +* Sample +**/ +int main(int argc, char *argv[]) { // Функция main + cout << "Hello world!" << endl; + cout << "Hello Informatics" << endl; + + int age = 25; + cout << "Age = " << age <<" , size = " << sizeof(age) < -using namespace std; - -// Однострочные комментарии - -// 8 bit - 1 byte - 2^8 - 256 (0-255) -// 1000 0001 -128 +127 -// short - 2 bytes 2^16 -// - 2^15 + (2^15-1) - - -/** Multiline -* Comment -* Sample -**/ -int main(int argc, char *argv[]) { // Функция main - cout << "Hello world!" << endl; - cout << "Hello Informatics" << endl; - - int age = 25; - cout << "Age = " << age <<" , size = " << sizeof(age) < 7 and age <= 18: + print("Школьник") +if age > 18 and age <= 25: + print("Студент") +if age > 25: + print("Работник") \ No newline at end of file From 08e554b758e9c607b0139fc91c4f575b31a1d60a Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Mon, 18 Oct 2021 10:03:55 +0300 Subject: [PATCH 06/12] Jskonst (#12) * Add information about course in readme * Fixed readme * Added surname * C++ first sample * Add sample for start and debug --- .vscode/launch.json | 15 +++++++++++++++ README.md | 3 ++- first.py | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .vscode/launch.json create mode 100644 first.py 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/README.md b/README.md index 32eec42..ce141ef 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Repository for lectures on informatics for 2021 ## Tools -ToDo Need to define +VSCode (Можно использовать любой другой редактор, но тогда настраивать придется самостоятельно) + diff --git a/first.py b/first.py new file mode 100644 index 0000000..2323c6b --- /dev/null +++ b/first.py @@ -0,0 +1,10 @@ +bool_sample = True +age = 5 +if age <= 7: + print("Дошкольник") +if age > 7 and age <= 18: + print("Школьник") +if age > 18 and age <= 25: + print("Студент") +if age > 25: + print("Работник") \ No newline at end of file From 34d35333fa41451a4cf91d614608c2d2931543fe Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Mon, 18 Oct 2021 10:05:05 +0300 Subject: [PATCH 07/12] Removed unnecessary cpp file --- first.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first.cpp b/first.cpp index 46bea28..1bd4a71 100644 --- a/first.cpp +++ b/first.cpp @@ -1,4 +1,4 @@ -#include +include using namespace std; // Однострочные комментарии From ba8a189ae2fbb16b90c79de6b9304585f07a1455 Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Mon, 18 Oct 2021 10:05:58 +0300 Subject: [PATCH 08/12] Jskonst (#13) * Add information about course in readme * Fixed readme * Added surname * C++ first sample * Add sample for start and debug * Removed unnecessary cpp file --- first.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first.cpp b/first.cpp index 46bea28..1bd4a71 100644 --- a/first.cpp +++ b/first.cpp @@ -1,4 +1,4 @@ -#include +include using namespace std; // Однострочные комментарии From e63fd7f6a1637439bef7196361532fac5aabab51 Mon Sep 17 00:00:00 2001 From: Eugeny Konstantinov Date: Mon, 18 Oct 2021 10:06:52 +0300 Subject: [PATCH 09/12] Removed cpp file --- first.cpp | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 first.cpp diff --git a/first.cpp b/first.cpp deleted file mode 100644 index 1bd4a71..0000000 --- a/first.cpp +++ /dev/null @@ -1,41 +0,0 @@ -include -using namespace std; - -// Однострочные комментарии - -// 8 bit - 1 byte - 2^8 - 256 (0-255) -// 1000 0001 -128 +127 -// short - 2 bytes 2^16 -// - 2^15 + (2^15-1) - - -/** Multiline -* Comment -* Sample -**/ -int main(int argc, char *argv[]) { // Функция main - cout << "Hello world!" << endl; - cout << "Hello Informatics" << endl; - - int age = 25; - cout << "Age = " << age <<" , size = " << sizeof(age) < Date: Mon, 13 Dec 2021 19:19:33 +0300 Subject: [PATCH 11/12] Add sample project file --- .gitignore | 3 +++ conda.yml | Bin 0 -> 1916 bytes first.py | 2 ++ function.py | 18 ++++++++++++------ workspace.code-workspace | 24 ++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 conda.yml create mode 100644 workspace.code-workspace diff --git a/.gitignore b/.gitignore index d22c254..454685e 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ Module.symvers Mkfile.old dkms.conf *.out +__pycache__/ +.mypy_cache/ + diff --git a/conda.yml b/conda.yml new file mode 100644 index 0000000000000000000000000000000000000000..317b4814081d3c2c7bad12163b8f1910c29eb6e6 GIT binary patch literal 1916 zcmb7_-ENye5QXQuQr{sjU}V6qlSsbnZ7y?H34w!St1b}0PTGfW`<-1A7pQDUtA%BE z=gi-k;m_~FQu|@K-P?_At+2I~R4OG{+!Q?c(y{mi*4kWL5V8zTaJ$6;}FAr+s|3VF`T2#fJNve`_9`y6znYkxs zVpB=(gfq8Whw-tjH01ORX#Ub?!_Bv7p*l%|_B}aQ=Tm1t z;fO&I9ZvUr$D4DmoWxirKl&Z-6;E@9>Q3y{t#b_MbNChg1(bpzC#-Au z?D4uTEM}_b$v@eqC@Hf4NAiAE?!Nl&oBQ8=<@wDXiJkrw4eOl9J@YI;3aCBRjx_0y cr+BK*9=P}5*7`r{hS(50>4H Date: Mon, 13 Dec 2021 19:21:54 +0300 Subject: [PATCH 12/12] removed unnecessary dependencies --- workspace.code-workspace | 1 - 1 file changed, 1 deletion(-) diff --git a/workspace.code-workspace b/workspace.code-workspace index 3571cc2..b2a905d 100644 --- a/workspace.code-workspace +++ b/workspace.code-workspace @@ -16,7 +16,6 @@ }, "extensions": { "recommendations": [ - "ms-azuretools.vscode-docker", "mhutchie.git-graph", "ms-python.python" ]