Merge pull request #8 from Saikowsik23/main

made changes to unit-conversions geometry (even in tests)

Author: PB2204

adv-math/src/geometry-trigonometry/geometry.js

@@ -33,6 +33,19 @@ class Geometry {
     static equilateralTriangleArea(side) {
         return (Math.sqrt(3) / 4) * Math.pow(side, 2);
     }
+    //Method to calulate the area of the triangle given its side lengths
+    static triangleArea_sides(side1, side2, side3) {
+        const s = (side1 + side2 + side3) / 2;
+        return Math.sqrt(s * (s - side1) * (s - side2) * (s - side3));
+    }
+    //Method to calulate the area of a square given its side length
+    static squareArea(side) {
+        return Math.pow(side, 2);
+    }
+    //Method to calculate the perimeter of a square given its side length
+    static squarePerimeter(side) {
+        return 4 * side;
+    }
 
     // Method to calculate the volume of a cube given its side length
     static cubeVolume(side) {

adv-math/src/units-conversions/units.js

@@ -18,9 +18,19 @@ class Units {
     static convertTemperature(value, fromUnit, toUnit) {
         if (fromUnit === 'Celsius' && toUnit === 'Fahrenheit') {
             return (value * 9 / 5) + 32;
+        } else if (fromUnit=='Celsius' && toUnit=='Kelvin') {
+            return value + 273.15;
         } else if (fromUnit === 'Fahrenheit' && toUnit === 'Celsius') {
             return (value - 32) * 5 / 9;
-        } else {
+        } else if (fromUnit=='Fahrenheit' && toUnit=='Kelvin') {
+            return (value + 459.67) * 5 / 9;
+        } else if (fromUnit=='Kelvin' && toUnit=='Celsius') {
+            return value - 273.15;
+        } else if (fromUnit=='Kelvin' && toUnit=='Fahrenheit') {
+            return (value * 9 / 5) - 459.67;
+        }
+
+        else {
             throw new Error('Invalid temperature unit conversion.');
         }
     }

adv-math/tests/geometry-trigonometry.test.js

@@ -17,7 +17,45 @@ describe('Geometry', () => {
     test('calculates the circumference of a circle', () => {
         expect(Geometry.circleCircumference(3)).toBeCloseTo(18.850, 3);
     });
-
+    test('calculates the area of a triangle', () => {
+        expect(Geometry.triangleArea(3, 4)).toBe(6);
+    });
+    test('calculates the volume of a sphere', () => {
+        expect(Geometry.sphereVolume(3)).toBeCloseTo(113.097, 3);
+    });
+    test('calculates the area of an equilateral triangle', () => {
+        expect(Geometry.equilateralTriangleArea(3)).toBeCloseTo(3.897, 3);
+    });
+    test('calculates the area of a triangle given its side lengths', () => {
+        expect(Geometry.triangleArea_sides(3, 4, 5)).toBe(6);
+    });
+    test('calculates the area of a square given its side length', () => {
+        expect(Geometry.squareArea(3)).toBe(9);
+    });
+    test('calculates the perimeter of a square given its side length', () => {
+        expect(Geometry.squarePerimeter(3)).toBe(12);
+    });
+    test('calculates the volume of a cube given its side length', () => {
+        expect(Geometry.cubeVolume(3)).toBe(27);
+    });
+    test('calculates the volume of a rectangular prism given length, width, and height', () => {
+        expect(Geometry.rectangularPrismVolume(3, 4, 5)).toBe(60);
+    });
+    test('calculates the surface area of a rectangular prism given length, width, and height', () => {
+        expect(Geometry.rectangularPrismSurfaceArea(3, 4, 5)).toBe(94);
+    });
+    test('calculates the volume of a cylinder given radius and height', () => {
+        expect(Geometry.cylinderVolume(3, 5)).toBeCloseTo(141.371, 3);
+    });
+    test('calculates the surface area of a cylinder given radius and height', () => {
+        expect(Geometry.cylinderSurfaceArea(3, 5)).toBeCloseTo(150.796, 3);
+    });
+    test('calculates the volume of a cone given radius and height', () => {
+        expect(Geometry.coneVolume(3, 5)).toBeCloseTo(47.123, 3);
+    });
+    test('calculates the surface area of a cone given radius and height', () => {
+        expect(Geometry.coneSurfaceArea(3, 5)).toBeCloseTo(83.229, 3);
+    });
     // Add more test cases as needed
 });
 

adv-math/tests/units-conversions.test.js

@@ -12,10 +12,21 @@ describe('Units', () => {
     test('converts Celsius to Fahrenheit', () => {
         expect(Units.convertTemperature(25, 'Celsius', 'Fahrenheit')).toBeCloseTo(77, 1);
     });
-
+    test('converts Celsius to Kelvin', () => {
+        expect(Units.convertTemperature(25, 'Celsius', 'Kelvin')).toBeCloseTo(298.15, 1);
+    });
+    test('converts Fahrenheit to Kelvin', () => {
+        expect(Units.convertTemperature(68, 'Fahrenheit', 'Kelvin')).toBeCloseTo(293.15, 1);
+    });
     test('converts Fahrenheit to Celsius', () => {
         expect(Units.convertTemperature(68, 'Fahrenheit', 'Celsius')).toBeCloseTo(20, 1);
     });
+    test('converts Kelvin to Celsius', () => {
+        expect(Units.convertTemperature(300, 'Kelvin', 'Celsius')).toBeCloseTo(26.85, 1);
+    });
+    test('converts Kelvin to Fahrenheit', () => {
+        expect(Units.convertTemperature(300, 'Kelvin', 'Fahrenheit')).toBeCloseTo(80.33, 1);
+    });
 
     // Add more test cases as needed
 });