exponential-number 1.2.2 → 1.3.1

package/dist/class/exponent-number.class.d.ts

@@ -5,15 +5,18 @@ export declare class ExponentNumber {
     copy(): ExponentNumber;
     normalize(): void;
     applyNewValues(newNumber: ExponentNumber): void;
+    resetValue(): void;
     toString(): string;
     plus(otherNumber: ExponentNumber): ExponentNumber;
     minus(otherNumber: ExponentNumber): ExponentNumber;
     multiply(otherNumber: ExponentNumber): ExponentNumber;
     divide(otherNumber: ExponentNumber): ExponentNumber;
     power(otherNumber: ExponentNumber): ExponentNumber;
+    root(otherNumber: ExponentNumber): ExponentNumber;
+    sqrt(): ExponentNumber;
     log(base: ExponentNumber): ExponentNumber;
     log10(): ExponentNumber;
-    isMoreThanValue(otherNumber: ExponentNumber): boolean;
+    isGreaterThanValue(otherNumber: ExponentNumber): boolean;
     isEqual(otherNumber: ExponentNumber): boolean;
-    isMoreThanOrEqualValue(otherNumber: ExponentNumber): boolean;
+    isGreaterThanOrEqualValue(otherNumber: ExponentNumber): boolean;
 }

package/dist/class/exponent-number.class.js

@@ -28,14 +28,17 @@ class ExponentNumber {
             this.value = Math.max(Math.log10(this.value), 0);
         }
         if (this.value === Math.pow(10, -const_1.VALUE_EXPONENT_DIFFERENCE_LIMIT)) {
-            this.value = 0;
-            this.exponentFactor = 0;
+            this.resetValue();
         }
     }
     applyNewValues(newNumber) {
         this.exponentFactor = newNumber.exponentFactor;
         this.value = newNumber.value;
     }
+    resetValue() {
+        this.exponentFactor = 0;
+        this.value = 0;
+    }
     toString() {
         const cutNumber = Number(this.value.toPrecision(const_1.DECIMAL_DIGITS));
         let numberText = cutNumber.toString();
@@ -49,7 +52,10 @@ class ExponentNumber {
             const firstPart = `${firstNumbers[0]}.${firstNumbers.slice(1)}`;
             numberText = `${Number(firstPart)}e${numberExp}`;
         }
-        return `${'e'.repeat(this.exponentFactor)}${numberText}`;
+        const exponentText = this.exponentFactor <= const_1.EXPONENT_COUNT_LIMIT
+            ? 'e'.repeat(this.exponentFactor)
+            : `e(${this.exponentFactor})`;
+        return `${exponentText}${numberText}`;
     }
     plus(otherNumber) {
         if (this.exponentFactor === otherNumber.exponentFactor) {
@@ -74,12 +80,13 @@ class ExponentNumber {
         if (this.exponentFactor === otherNumber.exponentFactor) {
             if (this.exponentFactor > 1) {
                 if (otherNumber.value >= this.value) {
-                    this.applyNewValues(new ExponentNumber(0, 0));
+                    this.resetValue();
                 }
                 return this;
             }
+            console.log(this, otherNumber);
             if (this.value === otherNumber.value) {
-                this.applyNewValues(new ExponentNumber(0, 0));
+                this.resetValue();
                 return this;
             }
             this.applyNewValues((0, util_math_utils_1.minusEqualExponentLevelNumber)(this, otherNumber));
@@ -89,8 +96,8 @@ class ExponentNumber {
                 this.applyNewValues((0, util_math_utils_1.minusDifferentExponentLevelNumber)(this, otherNumber));
             }
             else {
-                if (otherNumber.exponentFactor > this.exponentFactor) {
-                    this.applyNewValues(new ExponentNumber(0, 0));
+                if (otherNumber.exponentFactor >= this.exponentFactor) {
+                    this.resetValue();
                 }
             }
         }
@@ -111,6 +118,7 @@ class ExponentNumber {
         }
         const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
         result.minus(new ExponentNumber(otherNumber.exponentFactor, Math.log10(otherNumber.value)));
+        console.log(result);
         this.exponentFactor = result.exponentFactor + 1;
         this.value = result.value;
         this.normalize();
@@ -124,6 +132,24 @@ class ExponentNumber {
         this.normalize();
         return this;
     }
+    root(otherNumber) {
+        const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
+        if (result.exponentFactor >= 1 &&
+            (otherNumber.exponentFactor > result.exponentFactor ||
+                (otherNumber.exponentFactor === result.exponentFactor && otherNumber.value > result.value))) {
+            this.resetValue();
+            return this;
+        }
+        result.divide(otherNumber);
+        console.log(result);
+        this.exponentFactor = result.exponentFactor + 1;
+        this.value = result.value;
+        this.normalize();
+        return this;
+    }
+    sqrt() {
+        return this.root(new ExponentNumber(0, 2));
+    }
     log(base) {
         const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
         result.divide(new ExponentNumber(base.exponentFactor, Math.log10(base.value)));
@@ -134,15 +160,15 @@ class ExponentNumber {
     log10() {
         return new ExponentNumber(this.exponentFactor - 1, this.value);
     }
-    isMoreThanValue(otherNumber) {
+    isGreaterThanValue(otherNumber) {
         return (this.exponentFactor > otherNumber.exponentFactor ||
             (this.exponentFactor === otherNumber.exponentFactor && this.value > otherNumber.value));
     }
     isEqual(otherNumber) {
         return otherNumber.exponentFactor === this.exponentFactor && otherNumber.value === this.value;
     }
-    isMoreThanOrEqualValue(otherNumber) {
-        return this.isMoreThanValue(otherNumber) || this.isEqual(otherNumber);
+    isGreaterThanOrEqualValue(otherNumber) {
+        return this.isGreaterThanValue(otherNumber) || this.isEqual(otherNumber);
     }
 }
 exports.ExponentNumber = ExponentNumber;

package/dist/const.d.ts

@@ -1,3 +1,4 @@
 export declare const VALUE_EXPONENT_LIMIT = 100;
 export declare const VALUE_EXPONENT_DIFFERENCE_LIMIT = 12;
 export declare const DECIMAL_DIGITS = 5;
+export declare const EXPONENT_COUNT_LIMIT = 5;

package/dist/const.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DECIMAL_DIGITS = exports.VALUE_EXPONENT_DIFFERENCE_LIMIT = exports.VALUE_EXPONENT_LIMIT = void 0;
+exports.EXPONENT_COUNT_LIMIT = exports.DECIMAL_DIGITS = exports.VALUE_EXPONENT_DIFFERENCE_LIMIT = exports.VALUE_EXPONENT_LIMIT = void 0;
 exports.VALUE_EXPONENT_LIMIT = 100;
 exports.VALUE_EXPONENT_DIFFERENCE_LIMIT = 12;
 exports.DECIMAL_DIGITS = 5;
+exports.EXPONENT_COUNT_LIMIT = 5;

package/package.json

@@ -1,14 +1,19 @@
 {
   "name": "exponential-number",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "Small package with class to work with big numbers. This class allows to work with 1e...(1.8e308)...e1e100. Allowed methods",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
   "license": "Apache-2.0",
-  "repository": "https://github.com/AlexSmykov/exponential-numbers",
+  "repository": {
+    "url": "git+https://github.com/AlexSmykov/exponential-numbers.git"
+  },
   "scripts": {
-    "build": "tsc -w",
+    "build": "tsc",
     "test": "jest --config=jest.config.js test.ts"
   },
   "keywords": [

package/.prettierignore

@@ -1,5 +0,0 @@
-**/.idea
-**/dist
-**/node_modules
-
-package-lock.json

package/.prettierrc.yml

@@ -1,3 +0,0 @@
-endOfLine: auto
-printWidth: 100
-singleQuote: true

package/jest.config.js

@@ -1,12 +0,0 @@
-const { createDefaultPreset } = require("ts-jest");
-
-const tsJestTransformCfg = createDefaultPreset().transform;
-
-/** @type {import("jest").Config} **/
-module.exports = {
-  testEnvironment: "node",
-  rootDir: "./",
-  transform: {
-    ...tsJestTransformCfg,
-  },
-};

package/src/class/exponent-number.class.ts

@@ -1,229 +0,0 @@
-import {
-  minusDifferentExponentLevelNumber,
-  minusEqualExponentLevelNumber,
-  plusDifferentExponentLevelNumber,
-  plusEqualExponentLevelNumber,
-} from '../utils/util-math.utils';
-import { DECIMAL_DIGITS, VALUE_EXPONENT_DIFFERENCE_LIMIT, VALUE_EXPONENT_LIMIT } from '../const';
-
-export class ExponentNumber {
-  exponentFactor = 0;
-  value = 0;
-
-  constructor(exponentFactor = 0, value = 0) {
-    this.exponentFactor = exponentFactor;
-    this.value = value;
-
-    this.normalize();
-  }
-
-  copy(): ExponentNumber {
-    return new ExponentNumber(this.exponentFactor, this.value);
-  }
-
-  normalize(): void {
-    while (Math.log10(this.value) >= VALUE_EXPONENT_LIMIT) {
-      this.exponentFactor += 1;
-      this.value = Math.log10(this.value);
-    }
-
-    while (this.exponentFactor >= 1 && this.value < VALUE_EXPONENT_LIMIT) {
-      this.exponentFactor -= 1;
-      this.value = Math.pow(10, this.value);
-    }
-
-    while (this.exponentFactor < 0 && this.value > 0) {
-      this.exponentFactor += 1;
-      this.value = Math.max(Math.log10(this.value), 0);
-    }
-
-    if (this.value === Math.pow(10, -VALUE_EXPONENT_DIFFERENCE_LIMIT)) {
-      this.resetValue();
-    }
-  }
-
-  applyNewValues(newNumber: ExponentNumber): void {
-    this.exponentFactor = newNumber.exponentFactor;
-    this.value = newNumber.value;
-  }
-
-  resetValue(): void {
-    this.exponentFactor = 0;
-    this.value = 0;
-  }
-
-  toString(): string {
-    const cutNumber = Number(this.value.toPrecision(DECIMAL_DIGITS));
-
-    let numberText = cutNumber.toString();
-
-    if (Math.log10(cutNumber) >= VALUE_EXPONENT_DIFFERENCE_LIMIT) {
-      const numberExp = Math.floor(Math.log10(cutNumber));
-      const firstNumbers = cutNumber
-        .toString()
-        .replace('.', '')
-        .split('e')[0]
-        .slice(0, DECIMAL_DIGITS);
-      const firstPart = `${firstNumbers[0]}.${firstNumbers.slice(1)}`;
-      numberText = `${Number(firstPart)}e${numberExp}`;
-    }
-
-    return `${'e'.repeat(this.exponentFactor)}${numberText}`;
-  }
-
-  plus(otherNumber: ExponentNumber): ExponentNumber {
-    if (this.exponentFactor === otherNumber.exponentFactor) {
-      if (this.exponentFactor > 1) {
-        return this;
-      }
-
-      this.applyNewValues(plusEqualExponentLevelNumber(this, otherNumber));
-    } else {
-      if (this.exponentFactor <= 1 && otherNumber.exponentFactor <= 1) {
-        this.applyNewValues(plusDifferentExponentLevelNumber(this, otherNumber));
-      } else {
-        const biggerNumber = this.exponentFactor > otherNumber.exponentFactor ? this : otherNumber;
-        this.applyNewValues(biggerNumber);
-      }
-    }
-
-    this.normalize();
-
-    return this;
-  }
-
-  minus(otherNumber: ExponentNumber): ExponentNumber {
-    if (this.exponentFactor === otherNumber.exponentFactor) {
-      if (this.exponentFactor > 1) {
-        if (otherNumber.value >= this.value) {
-          this.resetValue();
-        }
-
-        return this;
-      }
-
-      console.log(this, otherNumber);
-      if (this.value === otherNumber.value) {
-        this.resetValue();
-
-        return this;
-      }
-
-      this.applyNewValues(minusEqualExponentLevelNumber(this, otherNumber));
-    } else {
-      if (this.exponentFactor <= 1 && otherNumber.exponentFactor <= 1) {
-        this.applyNewValues(minusDifferentExponentLevelNumber(this, otherNumber));
-      } else {
-        if (otherNumber.exponentFactor >= this.exponentFactor) {
-          this.resetValue();
-        }
-      }
-    }
-
-    this.normalize();
-
-    return this;
-  }
-
-  multiply(otherNumber: ExponentNumber): ExponentNumber {
-    const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
-
-    result.plus(new ExponentNumber(otherNumber.exponentFactor, Math.log10(otherNumber.value)));
-
-    this.exponentFactor = result.exponentFactor + 1;
-    this.value = result.value;
-
-    this.normalize();
-
-    return this;
-  }
-
-  divide(otherNumber: ExponentNumber): ExponentNumber {
-    if (this.exponentFactor === 0 && this.value === 0) {
-      return this;
-    }
-
-    const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
-
-    result.minus(new ExponentNumber(otherNumber.exponentFactor, Math.log10(otherNumber.value)));
-
-    console.log(result);
-    this.exponentFactor = result.exponentFactor + 1;
-    this.value = result.value;
-
-    this.normalize();
-
-    return this;
-  }
-
-  power(otherNumber: ExponentNumber): ExponentNumber {
-    const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
-
-    result.multiply(otherNumber);
-
-    this.exponentFactor = result.exponentFactor + 1;
-    this.value = result.value;
-
-    this.normalize();
-
-    return this;
-  }
-
-  root(otherNumber: ExponentNumber): ExponentNumber {
-    const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
-
-    if (
-      result.exponentFactor >= 1 &&
-      (otherNumber.exponentFactor > result.exponentFactor ||
-        (otherNumber.exponentFactor === result.exponentFactor && otherNumber.value > result.value))
-    ) {
-      this.resetValue();
-
-      return this;
-    }
-
-    result.divide(otherNumber);
-
-    console.log(result);
-    this.exponentFactor = result.exponentFactor + 1;
-    this.value = result.value;
-
-    this.normalize();
-
-    return this;
-  }
-
-  sqrt(): ExponentNumber {
-    return this.root(new ExponentNumber(0, 2));
-  }
-
-  log(base: ExponentNumber): ExponentNumber {
-    const result = new ExponentNumber(this.exponentFactor, Math.log10(this.value));
-    result.divide(new ExponentNumber(base.exponentFactor, Math.log10(base.value)));
-
-    this.applyNewValues(result);
-
-    this.normalize();
-
-    return this;
-  }
-
-  log10(): ExponentNumber {
-    return new ExponentNumber(this.exponentFactor - 1, this.value);
-  }
-
-  isGreaterThanValue(otherNumber: ExponentNumber): boolean {
-    return (
-      this.exponentFactor > otherNumber.exponentFactor ||
-      (this.exponentFactor === otherNumber.exponentFactor && this.value > otherNumber.value)
-    );
-  }
-
-  isEqual(otherNumber: ExponentNumber): boolean {
-    return otherNumber.exponentFactor === this.exponentFactor && otherNumber.value === this.value;
-  }
-
-  isGreaterThanOrEqualValue(otherNumber: ExponentNumber): boolean {
-    return this.isGreaterThanValue(otherNumber) || this.isEqual(otherNumber);
-  }
-}

package/src/const.ts

@@ -1,3 +0,0 @@
-export const VALUE_EXPONENT_LIMIT = 100;
-export const VALUE_EXPONENT_DIFFERENCE_LIMIT = 12;
-export const DECIMAL_DIGITS = 5;

package/src/index.ts

@@ -1 +0,0 @@
-export * from './class/exponent-number.class';

package/src/utils/util-math.utils.ts

@@ -1,118 +0,0 @@
-import { ExponentNumber } from '../class/exponent-number.class';
-import { VALUE_EXPONENT_DIFFERENCE_LIMIT } from '../const';
-
-export function plusEqualExponentLevelNumber(
-  first: ExponentNumber,
-  second: ExponentNumber,
-): ExponentNumber {
-  if (first.exponentFactor !== second.exponentFactor) {
-    throw new Error('Expected exponentFactor to be equal');
-  }
-
-  if (second.exponentFactor > 1) {
-    throw new Error('Expected exponentFactor to be lower or equal than 1');
-  }
-
-  if (second.exponentFactor === 1) {
-    if (Math.abs(first.value - second.value) > VALUE_EXPONENT_DIFFERENCE_LIMIT) {
-      return first.value - second.value > 0 ? first.copy() : second.copy();
-    }
-
-    const biggerValue = Math.max(first.value, second.value);
-    const smallerValue = Math.min(first.value, second.value);
-
-    return new ExponentNumber(
-      1,
-      biggerValue + Math.log10(1 + Math.pow(10, smallerValue - biggerValue)),
-    );
-  }
-
-  return new ExponentNumber(0, first.value + second.value);
-}
-
-export function plusDifferentExponentLevelNumber(
-  first: ExponentNumber,
-  second: ExponentNumber,
-): ExponentNumber {
-  if (first.exponentFactor === second.exponentFactor) {
-    throw new Error('Expected exponentFactor to be different');
-  }
-
-  if (first.exponentFactor > 1 || second.exponentFactor > 1) {
-    throw new Error('Expected exponentFactor to be lower or equal than 1');
-  }
-
-  const biggerValue = first.exponentFactor > second.exponentFactor ? first : second;
-  const smallerValue = first.exponentFactor > second.exponentFactor ? second : first;
-
-  const smallValueExponent = Math.log10(smallerValue.value);
-  const exponentDifference = biggerValue.value - smallValueExponent;
-
-  if (exponentDifference > VALUE_EXPONENT_DIFFERENCE_LIMIT) {
-    return biggerValue.copy();
-  }
-
-  return new ExponentNumber(
-    1,
-    biggerValue.value + Math.log10(1 + 1 / Math.pow(10, exponentDifference)),
-  );
-}
-
-export function minusEqualExponentLevelNumber(
-  first: ExponentNumber,
-  second: ExponentNumber,
-): ExponentNumber {
-  if (first.exponentFactor !== second.exponentFactor) {
-    throw new Error('Expected exponentFactor to be equal');
-  }
-
-  if (second.exponentFactor > 1) {
-    throw new Error('Expected exponentFactor to be lower or equal than 1');
-  }
-
-  if (second.exponentFactor === 1) {
-    if (second.value >= first.value) {
-      return new ExponentNumber(0, 0);
-    }
-
-    if (first.value - second.value > VALUE_EXPONENT_DIFFERENCE_LIMIT) {
-      return first.value - second.value < 0 ? first.copy() : second.copy();
-    }
-
-    return new ExponentNumber(
-      1,
-      first.value + Math.log10(1 - Math.pow(10, second.value - first.value)),
-    );
-  }
-
-  return new ExponentNumber(
-    0,
-    Math.max(first.value - second.value, -VALUE_EXPONENT_DIFFERENCE_LIMIT),
-  );
-}
-
-export function minusDifferentExponentLevelNumber(
-  first: ExponentNumber,
-  second: ExponentNumber,
-): ExponentNumber {
-  if (first.exponentFactor === second.exponentFactor) {
-    throw new Error('Expected exponentFactor to be different');
-  }
-
-  if (first.exponentFactor > 1 || second.exponentFactor > 1) {
-    throw new Error('Expected exponentFactor to be lower or equal than 1');
-  }
-
-  if (second.exponentFactor > first.exponentFactor) {
-    return new ExponentNumber(0, 0);
-  }
-
-  const smallValueExponent = Math.log10(second.value);
-  const exponentDifference = first.value - smallValueExponent;
-
-  if (exponentDifference > VALUE_EXPONENT_DIFFERENCE_LIMIT) {
-    return first.copy();
-  }
-
-  return new ExponentNumber(1, first.value + Math.log10(1 - 1 / Math.pow(10, exponentDifference)));
-}