diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..91a2d2c --- /dev/null +++ b/jest.config.js @@ -0,0 +1,4 @@ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', +}; \ No newline at end of file diff --git a/modules/ecs6-class/line.ts b/modules/ecs6-class/line.ts index e2d6086..79799b0 100644 --- a/modules/ecs6-class/line.ts +++ b/modules/ecs6-class/line.ts @@ -15,11 +15,14 @@ export default class Line { calculateSlope() { - this.slope = (this.point1.y - this.point2.y) / (this.point1.x - this.point2.x) + if (this.point1.x === this.point2.x) { + throw new Error("Vertical line - slope is undefined"); + } + this.slope = (this.point1.y - this.point2.y) / (this.point1.x - this.point2.x); } calculateNOfLineFunction() { - if (this.slope) + if (this.slope !== undefined) this.n = this.point1.y - this.slope * this.point1.x } @@ -33,14 +36,14 @@ export default class Line { getPointByX(x: number) { - if (this.slope && this.n) { - let y = this.slope * x + this.n - return new Point({ x, y }) - } + if (this.slope !== undefined && this.n !== undefined) { + let y = this.slope * x + this.n; + return new Point({ x, y }); } +} getPointByY(y: number) { - if (this.slope && this.n) { + if (this.slope !== undefined && this.n !== undefined) { let x = (y - this.n) / this.slope; return new Point({ x, y }) } diff --git a/modules/geometry-calculation.ts b/modules/geometry-calculation.ts index 22ab78b..cb895d5 100644 --- a/modules/geometry-calculation.ts +++ b/modules/geometry-calculation.ts @@ -3,39 +3,56 @@ import Point from './ecs6-class/point'; export const calculateDistance = (point1: Point, point2: Point): number => { let distanceX = (point2.x - point1.x) ** 2; - let distanceY = (point2.y - point2.y) ** 2; + let distanceY = (point2.y - point1.y) ** 2; const distance = Math.sqrt(distanceX + distanceY); return distance; } export const calculateJunctionPoint = (line1: Line, line2: Line): Boolean | Point | undefined => { + // ודא שלשני הקווים יש slope ו-n + if (line1.slope === undefined) line1.calculateSlope?.(); + if (line1.n === undefined) line1.calculateNOfLineFunction?.(); + if (line2.slope === undefined) line2.calculateSlope?.(); + if (line2.n === undefined) line2.calculateNOfLineFunction?.(); + if (line1.slope === line2.slope) { if (line1.n === line2.n) { - return true - } - else { - return false + return true; + } else { + return false; } - } - else { - if (line1.n !== undefined && line1.slope !== undefined && line2.n !== undefined && line2.slope !== undefined) { - const x = (line1.n - line2.n) / (line2.slope - line1.slope) + } else { + if ( + line1.n !== undefined && line1.slope !== undefined && + line2.n !== undefined && line2.slope !== undefined + ) { + const x = (line1.n - line2.n) / (line2.slope - line1.slope); const junctionPoint = line1.getPointByX(x); - return junctionPoint + return junctionPoint; } } } export const isPointOnLine = (line: Line, point: Point): Boolean => { - const proxyLine = new Line({ point1: line.point1, point2: point }) - proxyLine.calculateSlope() - if (line.slope === proxyLine.slope) { - proxyLine.calculateNOfLineFunction() - if (line.n === proxyLine.n) { - return true + if (line.slope === undefined) line.calculateSlope?.(); + if (line.n === undefined) line.calculateNOfLineFunction?.(); + + const proxyLine = new Line({ point1: line.point1, point2: point }); + proxyLine.calculateSlope(); + if ( + line.slope !== undefined && + proxyLine.slope !== undefined && + Math.abs(line.slope - proxyLine.slope) < 1e-10 + ) { + proxyLine.calculateNOfLineFunction(); + if ( + line.n !== undefined && + proxyLine.n !== undefined && + Math.abs(line.n - proxyLine.n) < 1e-10 + ) { + return true; } } - return false + return false; } - diff --git a/package-lock.json b/package-lock.json index 5bc5ea8..3da30fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "devDependencies": { "@types/jest": "^30.0.0", "jest": "^30.0.4", + "ts-jest": "^29.4.0", "ts-node": "^10.9.2", "typescript": "^5.8.3" } @@ -1662,6 +1663,13 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "dev": true, + "license": "MIT" + }, "node_modules/babel-jest": { "version": "30.0.4", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.0.4.tgz", @@ -1823,6 +1831,19 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/bser": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", @@ -2153,6 +2174,22 @@ "dev": true, "license": "MIT" }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/electron-to-chromium": { "version": "1.5.181", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.181.tgz", @@ -2300,6 +2337,29 @@ "bser": "2.1.1" } }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -2681,6 +2741,49 @@ "@pkgjs/parseargs": "^0.11.0" } }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/jest": { "version": "30.0.4", "resolved": "https://registry.npmjs.org/jest/-/jest-30.0.4.tgz", @@ -3371,6 +3474,13 @@ "node": ">=8" } }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true, + "license": "MIT" + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -4221,6 +4331,85 @@ "node": ">=8.0" } }, + "node_modules/ts-jest": { + "version": "29.4.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.0.tgz", + "integrity": "sha512-d423TJMnJGu80/eSgfQ5w/R+0zFJvdtTxwtF9KzFFunOpSeD+79lHJQIiAhluJoyGRbvj9NZJsl9WjCUo0ND7Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "^0.2.6", + "ejs": "^3.1.10", + "fast-json-stable-stringify": "^2.1.0", + "json5": "^2.2.3", + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.7.2", + "type-fest": "^4.41.0", + "yargs-parser": "^21.1.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/transform": "^29.0.0 || ^30.0.0", + "@jest/types": "^29.0.0 || ^30.0.0", + "babel-jest": "^29.0.0 || ^30.0.0", + "jest": "^29.0.0 || ^30.0.0", + "jest-util": "^29.0.0 || ^30.0.0", + "typescript": ">=4.3 <6" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/transform": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "jest-util": { + "optional": true + } + } + }, + "node_modules/ts-jest/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ts-jest/node_modules/type-fest": { + "version": "4.41.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", + "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ts-node": { "version": "10.9.2", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", diff --git a/package.json b/package.json index f9371ee..58402fa 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "devDependencies": { "@types/jest": "^30.0.0", "jest": "^30.0.4", + "ts-jest": "^29.4.0", "ts-node": "^10.9.2", "typescript": "^5.8.3" } diff --git a/tests/geometry-calculation.test.ts b/tests/geometry-calculation.test.ts new file mode 100644 index 0000000..0fd7264 --- /dev/null +++ b/tests/geometry-calculation.test.ts @@ -0,0 +1,58 @@ +import { calculateDistance, calculateJunctionPoint, isPointOnLine } from '../modules/geometry-calculation'; +import Point from '../modules/ecs6-class/point'; +import Line from '../modules/ecs6-class/line'; + +describe('geometry-calculation', () => { + describe('calculateDistance', () => { + it('should calculate the distance between two points', () => { + const p1 = new Point({ x: 0, y: 0 }); + const p2 = new Point({ x: 3, y: 4 }); + expect(calculateDistance(p1, p2)).toBe(5); + }); + }); + + describe('calculateJunctionPoint', () => { + it('should return true for identical lines', () => { + const line1 = new Line({ slope: 2, n: 1 }); + const line2 = new Line({ slope: 2, n: 1 }); + expect(calculateJunctionPoint(line1, line2)).toBe(true); + }); + + it('should return false for parallel lines with different n', () => { + const line1 = new Line({ slope: 2, n: 1 }); + const line2 = new Line({ slope: 2, n: 3 }); + expect(calculateJunctionPoint(line1, line2)).toBe(false); + }); + + it('should return the junction point for intersecting lines', () => { + const line1 = new Line({ point1: new Point({ x: 0, y: 0 }), point2: new Point({ x: 2, y: 2 }) }); +const line2 = new Line({ point1: new Point({ x: 0, y: 2 }), point2: new Point({ x: 2, y: 0 }) }); +line1.calculateSlope(); +line1.calculateNOfLineFunction(); +line2.calculateSlope(); +line2.calculateNOfLineFunction(); +const point = calculateJunctionPoint(line1, line2) as Point; +expect(point).toBeInstanceOf(Point); +expect(point.x).toBeCloseTo(1); +expect(point.y).toBeCloseTo(1); + }); + }); + + describe('isPointOnLine', () => { + it('should return true if point is on the line', () => { + const line = new Line({ point1: new Point({ x: 0, y: 1 }), point2: new Point({ x: 2, y: 5 }) }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = new Point({ x: 2, y: 5 }); + expect(isPointOnLine(line, point)).toBe(true); +}); + + it('should return true if point is on the line', () => { + const line = new Line({ point1: new Point({ x: 0, y: 1 }), point2: new Point({ x: 2, y: 5 }) }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = new Point({ x: 2, y: 5 }); + expect(isPointOnLine(line, point)).toBe(true); +}); + }); +}); \ No newline at end of file diff --git a/tests/line.test.ts b/tests/line.test.ts new file mode 100644 index 0000000..79f1616 --- /dev/null +++ b/tests/line.test.ts @@ -0,0 +1,95 @@ +import Line from '../modules/ecs6-class/line'; +import Point from '../modules/ecs6-class/point'; + +describe("Line class", () => { + it("should create a line with default points", () => { + const line = new Line(); + expect(line.point1).toBeInstanceOf(Point); + expect(line.point2).toBeInstanceOf(Point); + expect(line.slope).toBeUndefined(); + expect(line.n).toBeUndefined(); + }); + + it("should create a line with custom points", () => { + const p1 = new Point({ x: 1, y: 2 }); + const p2 = new Point({ x: 3, y: 4 }); + const line = new Line({ point1: p1, point2: p2 }); + expect(line.point1.x).toBe(1); + expect(line.point1.y).toBe(2); + expect(line.point2.x).toBe(3); + expect(line.point2.y).toBe(4); + }); + + it("should calculate the slope correctly", () => { + const p1 = new Point({ x: 1, y: 2 }); + const p2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1: p1, point2: p2 }); + line.calculateSlope(); + expect(line.slope).toBe((2 - 6) / (1 - 3)); + }); + + it("should calculate n of the line function", () => { + const p1 = new Point({ x: 1, y: 2 }); + const p2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1: p1, point2: p2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + expect(line.slope).not.toBeUndefined(); + if (line.slope !== undefined) { + expect(line.n).toBeCloseTo(p1.y - line.slope * p1.x); + } + }); + + it("should get point by X", () => { + const line = new Line({ point1: new Point({ x: 0, y: 1 }), point2: new Point({ x: 2, y: 5 }) }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = line.getPointByX(3); + expect(point).toBeInstanceOf(Point); + expect(point?.x).toBe(3); + expect(point?.y).toBe(2 * 3 + 1); + }); + + it("should get point by Y", () => { + const line = new Line({ point1: new Point({ x: 0, y: 1 }), point2: new Point({ x: 2, y: 5 }) }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = line.getPointByY(7); + expect(point).toBeInstanceOf(Point); + expect(point?.y).toBe(7); + expect(point?.x).toBe((7 - 1) / 2); + }); + + it("should get point on X axis (y=0)", () => { + const line = new Line({ point1: new Point({ x: 0, y: 1 }), point2: new Point({ x: 2, y: 5 }) }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = line.getPointOnXAsis(); + expect(point).toBeInstanceOf(Point); + expect(point?.y).toBe(0); + expect(point?.x).toBe(-0.5); + }); + + it("should get point on Y axis (x=0)", () => { + const line = new Line({ point1: new Point({ x: 0, y: 1 }), point2: new Point({ x: 2, y: 5 }) }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = line.getPointOnYAsis(); + expect(point).toBeInstanceOf(Point); + expect(point?.x).toBe(0); + expect(point?.y).toBe(1); + }); + + it("should return undefined for getPointByX/getPointByY if slope or n is missing", () => { + const line = new Line(); + expect(line.getPointByX(1)).toBeUndefined(); + expect(line.getPointByY(1)).toBeUndefined(); + }); + + it("should handle vertical line slope calculation (division by zero)", () => { + const p1 = new Point({ x: 2, y: 3 }); + const p2 = new Point({ x: 2, y: 5 }); + const line = new Line({ point1: p1, point2: p2 }); + expect(() => line.calculateSlope()).toThrow(); + }); +}); \ No newline at end of file diff --git a/tests/point.test.ts b/tests/point.test.ts new file mode 100644 index 0000000..2dc9599 --- /dev/null +++ b/tests/point.test.ts @@ -0,0 +1,31 @@ +import Point from '../modules/ecs6-class/point'; + +describe("Point class", () => { + it("should create a point with default values", () => { + const p = new Point(); + expect(p.x).toBe(0); + expect(p.y).toBe(0); + }); + + it("should create a point with custom values", () => { + const p = new Point({ x: 5, y: -3 }); + expect(p.x).toBe(5); + expect(p.y).toBe(-3); + }); + + it("should move vertically", () => { + const p = new Point({ x: 1, y: 2 }); + p.moveVertical(3); + expect(p.y).toBe(5); + p.moveVertical(-2); + expect(p.y).toBe(3); + }); + + it("should move horizontally", () => { + const p = new Point({ x: 1, y: 2 }); + p.moveHorizontal(4); + expect(p.x).toBe(5); + p.moveHorizontal(-1); + expect(p.x).toBe(4); + }); +}); \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..0c4f03d --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "target": "es2017", + "module": "commonjs", + "esModuleInterop": true, + "strict": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + } +} \ No newline at end of file