@gkucmierz/utils 1.12.0 → 1.13.0

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gkucmierz/utils",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gkucmierz/utils",
-      "version": "1.12.0",
+      "version": "1.13.0",
       "license": "MIT",
       "devDependencies": {
         "husky": "^8.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkucmierz/utils",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Usefull functions for solving programming tasks",
   "main": "src/main.mjs",
   "scripts": {

package/spec/herons-formula.spec.mjs

@@ -0,0 +1,41 @@
+
+import {
+  heronsFormula,
+  heronsFormulaBI,
+} from '../src/herons-formula.mjs';
+
+describe('herons-formula', () => {
+  it('Integer', () => {
+    expect(heronsFormula(5, 12, 13)).toEqual(30);
+    expect(heronsFormula(6, 8, 10)).toEqual(24);
+    expect(heronsFormula(7, 15, 20)).toEqual(42);
+    expect(heronsFormula(17, 17, 30)).toEqual(120);
+    expect(heronsFormula(13, 37, 30)).toEqual(180);
+    expect(heronsFormula(6, 25, 29)).toEqual(60);
+    expect(heronsFormula(73, 9, 80)).toEqual(216);
+    expect(heronsFormula(12, 35, 37)).toEqual(210);
+    expect(heronsFormula(120, 109, 13)).toEqual(396);
+    expect(heronsFormula(9, 10, 17)).toEqual(36);
+  });
+
+  it('Float', () => {
+    expect(heronsFormula(2, 3, 4)).toEqual(2.9047375096555625);
+    expect(heronsFormula(7, 10, 12)).toEqual(34.977671449083054);
+    expect(heronsFormula(6, 11, 12)).toEqual(32.839572165300815);
+    expect(heronsFormula(25, 25, 45)).toEqual(245.1880655741629);
+    expect(heronsFormula(10, 11, 18)).toEqual(48.59976851796724);
+  });
+
+  it('BigInt', () => {
+    expect(heronsFormulaBI(5n, 12n, 13n)).toEqual(30n);
+    expect(heronsFormulaBI(6n, 8n, 10n)).toEqual(24n);
+    expect(heronsFormulaBI(7n, 15n, 20n)).toEqual(42n);
+    expect(heronsFormulaBI(17n, 17n, 30n)).toEqual(120n);
+    expect(heronsFormulaBI(13n, 37n, 30n)).toEqual(180n);
+    expect(heronsFormulaBI(6n, 25n, 29n)).toEqual(60n);
+    expect(heronsFormulaBI(73n, 9n, 80n)).toEqual(216n);
+    expect(heronsFormulaBI(12n, 35n, 37n)).toEqual(210n);
+    expect(heronsFormulaBI(120n, 109n, 13n)).toEqual(396n);
+    expect(heronsFormulaBI(9n, 10n, 17n)).toEqual(36n);
+  });
+});

package/src/herons-formula.mjs

@@ -0,0 +1,13 @@
+
+import {
+  squareRootBI,
+} from './square-root.mjs';
+
+// calculate triangle area given 3 sides
+
+const getHeronsFormula = (four, sq) => (a, b, c) => {
+  return sq((a + b + c) * (-a + b + c) * (a - b + c) * (a + b - c)) / four;
+};
+
+export const heronsFormula = getHeronsFormula(4, n => n ** 0.5);
+export const heronsFormulaBI = getHeronsFormula(4n, squareRootBI);

package/src/phi.mjs

@@ -4,6 +4,11 @@ import {
   gcdBI,
 } from './gcd.mjs';
 
+import {
+  factors,
+  factorsBI,
+} from './factors.mjs';
+
 // Euler's Totient Function
 
 const getPhi = (ONE, TWO, gcd) => {
@@ -18,5 +23,16 @@ const getPhi = (ONE, TWO, gcd) => {
   };
 }
 
-export const phi = getPhi(1, 2, gcd);
-export const phiBI = getPhi(1n, 2n, gcdBI);
+// Eulers formula
+
+const getPhiEuler = factors => {
+  return n => {
+    return [...new Set(factors(n))].reduce((res, f) => res - res / f, n);
+  };
+};
+
+export const phi = getPhiEuler(factors);
+export const phiBI = getPhiEuler(factorsBI);
+
+// export const phi = getPhi(1, 2, gcd);
+// export const phiBI = getPhi(1n, 2n, gcdBI);

package/src/square-root.mjs

@@ -0,0 +1,15 @@
+
+
+export const squareRoot = n => n ** 0.5;
+
+// Newrton's formula
+export const squareRootBI = n => {
+  let res = BigInt(n.toString().substr(0, n.toString().length / 2));
+  let last;
+  while (res * res - n !== 0n) {
+    last = res;
+    res = (res + n / res) / 2n;
+    if (res === last) return res;
+  }
+  return res;
+};