α 1.3.4

Naruyoko · May 31, 2020 · 26f209a · 26f209a
1 parent 746df74
commit 26f209a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/ExpantaNum.js b/ExpantaNum.js
@@ -721,7 +721,7 @@
     }
     var m=t.max(other);
     if (m.gt("10^^^"+MAX_SAFE_INTEGER)) return m;
-    if (other.gt(ExpantaNum.MAX_SAFE_INTEGER)){
+    if (m.gt(ExpantaNum.TETRATED_MAX_SAFE_INTEGER)||other.gt(ExpantaNum.MAX_SAFE_INTEGER)){
       if (this.lt(Math.exp(1/Math.E))){
         negln = t.ln().neg();
         return negln.lambertw().div(negln);
@@ -910,7 +910,7 @@
       }
       if (other.eq(2)) return t.arrow(arrows-1)(t,depth+1);
       if (t.max(other).gt("10{"+arrows.add(ExpantaNum.ONE)+"}"+MAX_SAFE_INTEGER)) return t.max(other);
-      if (other.gt(ExpantaNum.MAX_SAFE_INTEGER)){
+      if (t.gt("10{"+arrows+"}"+MAX_SAFE_INTEGER)||other.gt(ExpantaNum.MAX_SAFE_INTEGER)){
         if (t.gt("10{"+arrows+"}"+MAX_SAFE_INTEGER)){
           r=t.clone();
           r.operator(arrows,r.operator(arrows)-1);
@@ -1494,13 +1494,14 @@
     if (!(input.array instanceof Array)) throw Error(invalidArgument+"Expected that property 'array' exists");
     if (input.sign!==undefined&&typeof input.sign!="number") throw Error(invalidArgument+"Expected that property 'sign' is Number");
     if (input.layer!==undefined&&typeof input.layer!="number") throw Error(invalidArgument+"Expected that property 'layer' is Number");
-    var x=new ExpantaNum();
+    return ExpantaNum.fromArray(input.array,input.sign,input.layer);
+    /*var x=new ExpantaNum();
     x.array=[];
-    for (var i=0;i<input.array.length;i++) x.array.push(temp.push([input.array[i][0],input.array[i][1]]));
+    for (var i=0;i<input.array.length;i++) x.array.push([input.array[i][0],input.array[i][1]]);
     x.sign=Number(input.sign)||1;
     x.layer=Number(input.layer)||0;
     x.standardize();
-    return x;
+    return x;*/
   };
   Q.fromJSON=function (input){
     if (typeof input=="object") return ExpantaNum.fromObject(parsedObject);
@@ -1565,7 +1566,7 @@
       if (a[min][0]==i) return min;
       if (a[max][0]==i) return max;
       var mid=Math.floor((min+max)/2);
-      if (a[mid][0]==i){
+      if (min==mid||a[mid][0]==i){
         min=mid;
         break;
       }

diff --git a/ExpantaNum.min.js b/ExpantaNum.min.js
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ![ExpantaNum.js](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/ExpantaNumJS.png) ![α](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/alpha.png) ![1](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/1.png) ![.](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/dot.png) ![3](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/3.png) ![.](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/dot.png) ![3](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/3.png)
+# ![ExpantaNum.js](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/ExpantaNumJS.png) ![α](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/alpha.png) ![1](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/1.png) ![.](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/dot.png) ![3](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/3.png) ![.](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/dot.png) ![4](https://raw.githubusercontent.com/Naruyoko/ExpantaNum.js/non-code/4.png)
 [![NPM](https://img.shields.io/npm/v/expanta_num.js.svg)](https://www.npmjs.com/package/expanta_num.js)
 A huge number library holding up to {10,9e15,1,2}.
 

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+# α 1.3.4 - 2020/05/30
+* Fixed `a{n}b` for `10{n}MAX_SAFE_INTEGER<a<=10{n+1}MAX_SAFE_INTEGER` and `b<MAX_SAFE_INTEGER`.
+* Fixed `toJSON`.
+
 # α 1.3.3 - 2020/05/23
 * Fixed `tetr` and up returning non-`NaN` for special cases involving `NaN`.
 * Fixed `pent` and up returning `Infinity` for `0{n}Infinity`.