From 4d3ac307fa1013f2f1d97acd7d6b31490e9d1c46 Mon Sep 17 00:00:00 2001 From: nick_milkin Date: Sat, 5 Feb 2022 17:10:10 +0100 Subject: [PATCH 1/2] fixed workspace --- .DS_Store | Bin 8196 -> 8196 bytes lesson1/.DS_Store | Bin 6148 -> 6148 bytes lesson1/.idea/workspace.xml | 7 +++++-- lesson2/.DS_Store | Bin 0 -> 6148 bytes lesson2/homework2/.idea/.gitignore | 5 +++++ lesson2/homework2/.idea/homework2.iml | 12 ++++++++++++ lesson2/homework2/.idea/modules.xml | 8 ++++++++ lesson2/homework2/.idea/vcs.xml | 6 ++++++ 8 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 lesson2/.DS_Store create mode 100644 lesson2/homework2/.idea/.gitignore create mode 100644 lesson2/homework2/.idea/homework2.iml create mode 100644 lesson2/homework2/.idea/modules.xml create mode 100644 lesson2/homework2/.idea/vcs.xml diff --git a/.DS_Store b/.DS_Store index e05b13ae153f400894ec8f6656e500ba039e0c87..8e4923c70c9a443a68bc78b3543394f7707a50b2 100644 GIT binary patch delta 60 zcmV-C0K@-;K!iY$PXQ~jP`eKSE3*s`!vT{X5Y&^-5s(csc2jb0Y;SI700001vrQ7m S1hWSi_5_pA5g@ZF6z2kPkQ8MA delta 48 zcmV-00MGw~K!iY$PXQ^hP`eKSDYFa^!vT||5|6V{6Sf4Afb+8l81@8{I2IAJ0Tu=V Gk$~`~#SvHl diff --git a/lesson1/.DS_Store b/lesson1/.DS_Store index cef1eac554def6367d9b441afe63d2cc09cbfa36..bb27f318e06fca4261efdb0b9855e5a8890c6bc8 100644 GIT binary patch delta 71 zcmZoMXfc=|#>B)qu~2NHo+2ar#(>?7jO>#qvWjh1V%f#GS%gEFWnzQGW_AvK4xqBl Zf*jwOC-aLqaxee^BLf4=<_M8B%m9XN5J3O{ delta 130 zcmZoMXfc=|#>B!ku~2NHo+2a1#(>?7i$5?kF>*|v$Sk&5iD?(3B|k$cLmop3LnaXC zFr+f1FeosjG2{c;DL`J4XHI@{Qcivn0|SEq5Vr%d`+qRl{E+z*<7Rdaeh#1wK+bpO W$^0UY9E=PMOh82pn - + + + diff --git a/lesson2/.DS_Store b/lesson2/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..78f82ed25f7a88d9137d3dcae20bd1d63b82edf9 GIT binary patch literal 6148 zcmeHK&1xGl5FR;BtR)nDNNA3NTuo~`KM-=+y6&OZY-tbualBa*FWFrg|8x(=u-Eiu zdh7#~JU}k(t*_F~NODQ=7IF$9oq^Fe8qG+nPeNJ&fauJk7C;>UBr0LW!=gl}opePi z&Qn7arjHynjNt;>ualK%c05D|Xze^0;<}|UfE(+l&%#89*h*XD1?sckM$jtF2=mFv zWqb=qNj#Z0n?FQlt-8KZlQp?1KL$gc2h;v^HtF=o@2U1i>m*#-{qSu($b0pzmpYsF z<7_ZC32`*QkPq+TEYf*L&$4J@as%5SJ?Zu8Pv`S?tDz3|4i*hHKWaA{YJcx=vGC;f z?(^f5-bIpT`qF$l2;8bho;X~>7c@$!NX}cqnNCN`u=1!>ce`%-^7_}+*H1sc6KN&= zr8>G};h5%m6d+s2C8{ZqV)El-%9AGC8_y u73wJ}3B?r_|E8c}u40U(t9S?12>KNnh`z(ZB6?8xN5Ig)1v7B34EzBR&3}ym literal 0 HcmV?d00001 diff --git a/lesson2/homework2/.idea/.gitignore b/lesson2/homework2/.idea/.gitignore new file mode 100644 index 0000000..b58b603 --- /dev/null +++ b/lesson2/homework2/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/lesson2/homework2/.idea/homework2.iml b/lesson2/homework2/.idea/homework2.iml new file mode 100644 index 0000000..0c8867d --- /dev/null +++ b/lesson2/homework2/.idea/homework2.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/lesson2/homework2/.idea/modules.xml b/lesson2/homework2/.idea/modules.xml new file mode 100644 index 0000000..de00548 --- /dev/null +++ b/lesson2/homework2/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/lesson2/homework2/.idea/vcs.xml b/lesson2/homework2/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/lesson2/homework2/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From aed2a14c85708e596e0dafca6f4ecd4897433221 Mon Sep 17 00:00:00 2001 From: nick_milkin Date: Sat, 5 Feb 2022 17:10:46 +0100 Subject: [PATCH 2/2] Homework 2 --- lesson2/homework2/index.html | 10 +++ lesson2/homework2/script.js | 123 +++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 lesson2/homework2/index.html create mode 100644 lesson2/homework2/script.js diff --git a/lesson2/homework2/index.html b/lesson2/homework2/index.html new file mode 100644 index 0000000..3806a4c --- /dev/null +++ b/lesson2/homework2/index.html @@ -0,0 +1,10 @@ + + + + + Homework 2 + + + + + diff --git a/lesson2/homework2/script.js b/lesson2/homework2/script.js new file mode 100644 index 0000000..055a55e --- /dev/null +++ b/lesson2/homework2/script.js @@ -0,0 +1,123 @@ +// Task 1 +/* +var a = 1, b = 1, c, d; +c = ++a; alert(c); // 2 +d = b++; alert(d); // 1 +c = (2+ ++a); alert(c); // 5 +d = (2+ b++); alert(d); // 4 +alert(a); // 3 +alert(b); // 3 +- операторы post-increment и pre-increment увеличивают переменную на 1 и сохраняют ее, но в момент присваивания ++а +дает увеличенное значение а, а а++ изначальное значение а. После каждого инкремента переменная увеличиается на один +(поэтому в конце обе = 3). В момент сложения с 2 ++а и а++ так же передают соответсвенно увеличенное и изначальное +значение. +*/ + +// Task 2 + +// var a = 2; +// var x = 1 + (a *= 2); +// х = 5 (1 + 2 * 2) + +// Task 3 + +let a = -1, b = -4; + +if (a >= 0 && b >= 0) console.log(a - b); +else if (a <= 0 && b <= 0) console.log(b * a); +else console.log(a + b); + +// Task 4 + +a = 2; + +switch (a) { + case 0: + for (let i = 0; i < 16; i++) console.log(i); + break; + case 1: + for (let i = 1; i < 16; i++) console.log(i); + break; + case 2: + for (let i = 2; i < 16; i++) console.log(i); + break; + case 3: + for (let i = 3; i < 16; i++) console.log(i); + break; + case 4: + for (let i = 4; i < 16; i++) console.log(i); + break; + case 5: + for (let i = 5; i < 16; i++) console.log(i); + break; + case 6: + for (let i = 6; i < 16; i++) console.log(i); + break; + case 7: + for (let i = 7; i < 16; i++) console.log(i); + break; + case 8: + for (let i = 8; i < 16; i++) console.log(i); + break; + case 9: + for (let i = 9; i < 16; i++) console.log(i); + break; + case 10: + for (let i = 10; i < 16; i++) console.log(i); + break; + case 11: + for (let i = 11; i < 16; i++) console.log(i); + break; + case 12: + for (let i = 12; i < 16; i++) console.log(i); + break; + case 13: + for (let i = 13; i < 16; i++) console.log(i); + break; + case 14: + for (let i = 14; i < 16; i++) console.log(i); + break; + default: break; +} + +// Task 5 + +function addNums(n1, n2) { + return n1 + n2; +} + +function subNums(n1, n2) { + return n1 - n2; +} + +function mulNums(n1, n2) { + return n1 * n2; +} + +function divNums(n1, n2) { + return n1 / n2; +} + +// Task 6 + +function mathOperation(arg1, arg2, operation) { + switch (operation) { + case '+': return addNums(arg1, arg2); + case '-': return subNums(arg1, arg2); + case '*': return mulNums(arg1, arg2); + case '/': return divNums(arg1, arg2); + default: return 'Error'; + } +} + +// Task 7 + +// null не равен 0, но равен undefined в js, потому что оператор равенства приводит значение null к undefined, хотя +// в операциях сравнения (<, >, <=, >=) null будет приведет к 0 + +// Task 8 + +function recursivePow(val, pow) { + if (pow == 0) return 1; + else return val * recursivePow(val, pow - 1); +}