diff options
| author | drbaggy <js5@sanger.ac.uk> | 2021-08-02 08:14:40 +0100 |
|---|---|---|
| committer | drbaggy <js5@sanger.ac.uk> | 2021-08-02 08:14:40 +0100 |
| commit | 206be8f80280977dd0145f179c8818e7d222eb80 (patch) | |
| tree | 78a5cce793be3c4f04be9923892fbddda438bcb0 | |
| parent | ccf0d4d21e8537f4d49a5361efa0f4604120d994 (diff) | |
| parent | cd47bdc95fd20e4eee01b8e59d4642c8ad61f8aa (diff) | |
| download | perlweeklychallenge-club-206be8f80280977dd0145f179c8818e7d222eb80.tar.gz perlweeklychallenge-club-206be8f80280977dd0145f179c8818e7d222eb80.tar.bz2 perlweeklychallenge-club-206be8f80280977dd0145f179c8818e7d222eb80.zip | |
Merge remote-tracking branch 'upstream/master'
107 files changed, 6288 insertions, 2296 deletions
diff --git a/challenge-120/mohammad-anwar/blog.txt b/challenge-120/mohammad-anwar/blog.txt new file mode 100644 index 0000000000..f4c64323b0 --- /dev/null +++ b/challenge-120/mohammad-anwar/blog.txt @@ -0,0 +1 @@ +https://www.youtube.com/watch?v=VyBVS0IHvnI diff --git a/challenge-120/mohammad-anwar/blog1.txt b/challenge-120/mohammad-anwar/blog1.txt new file mode 100644 index 0000000000..21914f3561 --- /dev/null +++ b/challenge-120/mohammad-anwar/blog1.txt @@ -0,0 +1 @@ +https://www.youtube.com/watch?v=lTwlnsnDl2I diff --git a/challenge-121/mohammad-anwar/blog.txt b/challenge-121/mohammad-anwar/blog.txt new file mode 100644 index 0000000000..7d014e94cd --- /dev/null +++ b/challenge-121/mohammad-anwar/blog.txt @@ -0,0 +1 @@ +https://www.youtube.com/watch?v=n1EECfp0YTA diff --git a/challenge-122/mohammad-anwar/blog.txt b/challenge-122/mohammad-anwar/blog.txt new file mode 100644 index 0000000000..d5d084d268 --- /dev/null +++ b/challenge-122/mohammad-anwar/blog.txt @@ -0,0 +1 @@ +https://www.youtube.com/watch?v=vOad7ZjwqlQ diff --git a/challenge-123/abigail/awk/ch-2.awk b/challenge-123/abigail/awk/ch-2.awk index 27709d6fd0..96ac5314b1 100644 --- a/challenge-123/abigail/awk/ch-2.awk +++ b/challenge-123/abigail/awk/ch-2.awk @@ -8,13 +8,11 @@ # Run as: awk -f ch-2.awk < input-file # -{ - e1 = ($1 - $3) ^ 2 + ($2 - $4) ^ 2 - e2 = ($3 - $5) ^ 2 + ($4 - $6) ^ 2 - e3 = ($5 - $7) ^ 2 + ($6 - $8) ^ 2 - e4 = ($7 - $1) ^ 2 + ($8 - $2) ^ 2 - d1 = ($1 - $5) ^ 2 + ($2 - $6) ^ 2 - d2 = ($3 - $7) ^ 2 + ($4 - $8) ^ 2 +function dist (x1, y1, x2, y2) {(x1 - x2) ^ 2 + (y1 - y2) ^ 2} - print ((e1 == e2 && e2 == e3 && e3 == e4 && d1 == d2) ? 1 : 0) +{ + print (dist ($1, $2, $3, $4) == dist ($3, $4, $5, $6) && + dist ($3, $4, $5, $6) == dist ($5, $6, $7, $8) && + dist ($5, $6, $7, $8) == dist ($7, $8, $1, $2) && + dist ($1, $2, $5, $6) == dist ($3, $4, $7, $8) ? 1 : 0) } diff --git a/challenge-123/abigail/bash/ch-2.sh b/challenge-123/abigail/bash/ch-2.sh index fb12779c2e..68844b2f46 100644 --- a/challenge-123/abigail/bash/ch-2.sh +++ b/challenge-123/abigail/bash/ch-2.sh @@ -10,13 +10,15 @@ set -f +function dist () {((dist = ($1 - $3) ** 2 + ($2 - $4) ** 2))} + while read x1 y1 x2 y2 x3 y3 x4 y4 -do ((e1 = (x1 - x2) ** 2 + (y1 - y2) ** 2)) - ((e2 = (x2 - x3) ** 2 + (y2 - y3) ** 2)) - ((e3 = (x3 - x4) ** 2 + (y3 - y4) ** 2)) - ((e4 = (x4 - x1) ** 2 + (y4 - y1) ** 2)) - ((d1 = (x1 - x3) ** 2 + (y1 - y3) ** 2)) - ((d2 = (x2 - x4) ** 2 + (y2 - y4) ** 2)) +do dist $x1 $y1 $x2 $y2; ((e1 = dist)) + dist $x2 $y2 $x3 $y3; ((e2 = dist)) + dist $x3 $y3 $x4 $y4; ((e3 = dist)) + dist $x4 $y4 $x1 $y1; ((e4 = dist)) + dist $x1 $y1 $x3 $y3; ((d1 = dist)) + dist $x2 $y2 $x4 $y4; ((d2 = dist)) if ((e1 == e2 && e2 == e3 && e3 == e4 && d1 == d2)) then echo 1 else echo 0 diff --git a/challenge-123/abigail/bc/ch-2.bc b/challenge-123/abigail/bc/ch-2.bc index 2ea9169a08..70815c52d7 100644 --- a/challenge-123/abigail/bc/ch-2.bc +++ b/challenge-123/abigail/bc/ch-2.bc @@ -8,6 +8,8 @@ # Input should be terminated with a line starting with a 0 # +define dist (a, b, c, d) {return ((a - c) ^ 2 + (b - d) ^ 2)} + while (1) { a = read () if (a == 0) {break} @@ -18,15 +20,13 @@ while (1) { f = read () g = read () h = read () - i = (a - c) ^ 2 + (b - d) ^ 2 - j = (c - e) ^ 2 + (d - f) ^ 2 - k = (e - g) ^ 2 + (f - h) ^ 2 - l = (g - a) ^ 2 + (h - b) ^ 2 - m = (a - e) ^ 2 + (b - f) ^ 2 - n = (c - g) ^ 2 + (d - h) ^ 2 - o = 0 - if (i == j && j == k && k == l && m == n) { - o = 1 + + if (dist (a, b, c, d) == dist (c, d, e, f) && \ + dist (c, d, e, f) == dist (e, f, g, h) && \ + dist (e, f, g, h) == dist (g, h, a, b) && \ + dist (a, b, e, f) == dist (c, d, g, h)) { + 1 + } else { + 0 } - o } diff --git a/challenge-123/abigail/blog.txt b/challenge-123/abigail/blog.txt new file mode 100644 index 0000000000..421517e534 --- /dev/null +++ b/challenge-123/abigail/blog.txt @@ -0,0 +1 @@ +https://abigail.github.io/HTML/Perl-Weekly-Challenge/week-123-1.html diff --git a/challenge-123/abigail/blog1.txt b/challenge-123/abigail/blog1.txt new file mode 100644 index 0000000000..8f627b4c43 --- /dev/null +++ b/challenge-123/abigail/blog1.txt @@ -0,0 +1 @@ +https://abigail.github.io/HTML/Perl-Weekly-Challenge/week-123-2.html diff --git a/challenge-123/abigail/c/ch-2.c b/challenge-123/abigail/c/ch-2.c index 56f0b615d4..60a24fb06b 100644 --- a/challenge-123/abigail/c/ch-2.c +++ b/challenge-123/abigail/c/ch-2.c @@ -10,19 +10,19 @@ * Run as: cc -o ch-2.o ch-2.c; ./ch-2.o < input-file */ +int dist (int x1, int y1, int x2, int y2) { + return ((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2)); +} + |