From fb24eb6e399409e6d71e0a302214bfad3089f77a Mon Sep 17 00:00:00 2001 From: tehliang Date: 2022年7月24日 21:36:02 +0800 Subject: [PATCH 1/5] Added FindTrianglePerimeter function --- Maths/FindTrianglePerimeter.js | 13 +++++++++++++ Maths/test/FindTrianglePerimeter.test.js | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 Maths/FindTrianglePerimeter.js create mode 100644 Maths/test/FindTrianglePerimeter.test.js diff --git a/Maths/FindTrianglePerimeter.js b/Maths/FindTrianglePerimeter.js new file mode 100644 index 0000000000..501c45aab7 --- /dev/null +++ b/Maths/FindTrianglePerimeter.js @@ -0,0 +1,13 @@ +/* +* A polygon with three edges and three vertices is called a triangle. It is one of the fundamental geometric shapes. +* The total length of a triangle's sides makes up the perimeter. +* Algorithm to find the perimeter of a triangle +*/ + +function findTrianglePerimeter(x, y, z) { + + return (x + y + z); + + } + +export { findTrianglePerimeter } \ No newline at end of file diff --git a/Maths/test/FindTrianglePerimeter.test.js b/Maths/test/FindTrianglePerimeter.test.js new file mode 100644 index 0000000000..928776bb94 --- /dev/null +++ b/Maths/test/FindTrianglePerimeter.test.js @@ -0,0 +1,19 @@ +import { findTrianglePerimeter } from '../FindTrianglePerimeter' + +describe('findTrianglePerimeter', () => { + it('should return the perimeter of a triangle', () => { + expect(findTrianglePerimeter(5, 6, 4)).toBe(15) + }) + + it('should return the perimeter of a triangle', () => { + expect(findTrianglePerimeter(2, 6, 5)).toBe(13) + }) + + it('should return the perimeter of a triangle', () => { + expect(findTrianglePerimeter(7, 2, 6)).toBe(15) + }) + + it('should return the perimeter of a triangle', () => { + expect(findTrianglePerimeter(6, 3, 8)).toBe(17) + }) +}) From a7a557a76ac460bad8e0b4d77be50b6fba52591b Mon Sep 17 00:00:00 2001 From: tehliang Date: 2022年7月24日 21:54:36 +0800 Subject: [PATCH 2/5] Updated code style with Javascript Standard Style --- Maths/CollatzSequence.js | 2 +- Maths/FindTrianglePerimeter.js | 12 ++++------ package-lock.json | 40 +++++++++++++++++++--------------- package.json | 2 +- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Maths/CollatzSequence.js b/Maths/CollatzSequence.js index d8ead61cc2..4a3566b216 100644 --- a/Maths/CollatzSequence.js +++ b/Maths/CollatzSequence.js @@ -26,5 +26,5 @@ export function collatz (n) { steps.push(n) } - return { result: n, steps: steps } + return { result: n, steps } } diff --git a/Maths/FindTrianglePerimeter.js b/Maths/FindTrianglePerimeter.js index 501c45aab7..b64c7efdfb 100644 --- a/Maths/FindTrianglePerimeter.js +++ b/Maths/FindTrianglePerimeter.js @@ -3,11 +3,7 @@ * The total length of a triangle's sides makes up the perimeter. * Algorithm to find the perimeter of a triangle */ - -function findTrianglePerimeter(x, y, z) { - - return (x + y + z); - - } - -export { findTrianglePerimeter } \ No newline at end of file +function findTrianglePerimeter (x, y, z) { + return x + y + z +} +export { findTrianglePerimeter } diff --git a/package-lock.json b/package-lock.json index d7cb0da2ee..892ad81a74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "node-fetch": "3.1.1" }, "devDependencies": { - "@babel/eslint-parser": "^7.17.0", + "@babel/eslint-parser": "^7.18.9", "@types/jest": "^27.4.1", "babel-jest": "^26.3.0", "globby": "^12.0.2", @@ -79,9 +79,9 @@ } }, "node_modules/@babel/eslint-parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", - "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz", + "integrity": "sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==", "dev": true, "dependencies": { "eslint-scope": "^5.1.1", @@ -3223,13 +3223,19 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001283", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz", - "integrity": "sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "version": "1.0.30001369", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001369.tgz", + "integrity": "sha512-OY1SBHaodJc4wflDIKnlkdqWzJZd1Ls/2zbVJHBSv3AT7vgOJ58yAhd2CN4d57l2kPJrgMb7P9+N1Mhy4tNSQA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ] }, "node_modules/capture-exit": { "version": "2.0.0", @@ -11206,9 +11212,9 @@ } }, "@babel/eslint-parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", - "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz", + "integrity": "sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==", "dev": true, "requires": { "eslint-scope": "^5.1.1", @@ -13491,9 +13497,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001283", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz", - "integrity": "sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==" + "version": "1.0.30001369", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001369.tgz", + "integrity": "sha512-OY1SBHaodJc4wflDIKnlkdqWzJZd1Ls/2zbVJHBSv3AT7vgOJ58yAhd2CN4d57l2kPJrgMb7P9+N1Mhy4tNSQA==" }, "capture-exit": { "version": "2.0.0", diff --git a/package.json b/package.json index 8ba035922c..427357eef2 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "parser": "@babel/eslint-parser" }, "devDependencies": { - "@babel/eslint-parser": "^7.17.0", + "@babel/eslint-parser": "^7.18.9", "@types/jest": "^27.4.1", "babel-jest": "^26.3.0", "globby": "^12.0.2", From d68a0b1fefe204d847d1afb0426c552e4bd89a8e Mon Sep 17 00:00:00 2001 From: tehliang Date: 2022年7月25日 10:03:59 +0800 Subject: [PATCH 3/5] Revert CollatzSequence.js back as unrelated test Not sure why to have changes in this code. Sorry. --- Maths/CollatzSequence.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maths/CollatzSequence.js b/Maths/CollatzSequence.js index 4a3566b216..d8ead61cc2 100644 --- a/Maths/CollatzSequence.js +++ b/Maths/CollatzSequence.js @@ -26,5 +26,5 @@ export function collatz (n) { steps.push(n) } - return { result: n, steps } + return { result: n, steps: steps } } From 6f9bb058bee96802ccf5ad09dffcb815449b1c84 Mon Sep 17 00:00:00 2001 From: tehliang Date: 2022年7月25日 10:09:21 +0800 Subject: [PATCH 4/5] Revert back package.json as unrelated changes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 427357eef2..8ba035922c 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "parser": "@babel/eslint-parser" }, "devDependencies": { - "@babel/eslint-parser": "^7.18.9", + "@babel/eslint-parser": "^7.17.0", "@types/jest": "^27.4.1", "babel-jest": "^26.3.0", "globby": "^12.0.2", From e088bf270adf6ea2c03419f2a9137c73d5db6016 Mon Sep 17 00:00:00 2001 From: tehliang Date: 2022年7月25日 10:20:12 +0800 Subject: [PATCH 5/5] Revert back collatzsequence --- Maths/CollatzSequence.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maths/CollatzSequence.js b/Maths/CollatzSequence.js index 4a3566b216..420578954f 100644 --- a/Maths/CollatzSequence.js +++ b/Maths/CollatzSequence.js @@ -26,5 +26,5 @@ export function collatz (n) { steps.push(n) } - return { result: n, steps } + return { result: n, steps: steps} }

AltStyle によって変換されたページ (->オリジナル) /