+
Numeric Javascript
is a library for numerical computations in Javascript. You can write Javascript
@@ -60,7 +51,7 @@
Performance
Although Javascript does not reach the same performance as native programs, the Numeric Javascript
library is carefully tuned to obtain the best possible performance for a Javascript program. You
can compare the performance of Numeric, Sylvester and
-Google Closure's
+Google Closure's
Matrix
object using our Benchmark.
@@ -91,3 +82,4 @@
About the Author
+
\ No newline at end of file
diff --git a/documentation.html b/documentation.html
index 80ac39a..a988652 100644
--- a/documentation.html
+++ b/documentation.html
@@ -1,6 +1,10 @@
-
+
+
+
+
+
@@ -49,6 +53,7 @@
bnot
Binary negation ~x
bor
Binary or x|y
bxor
Binary xor x^y
+
ccsDiag
Create sparse diagonal matrix
ccsDim
Dimensions of sparse matrix
ccsDot
Sparse matrix-matrix product
ccsFull
Convert sparse to full
@@ -58,6 +63,7 @@
ccsLUPSolve
Solve Ax=b using LUP decomp
ccsScatter
Scatter entries of sparse matrix
ccsSparse
Convert from full to sparse
+
ccsTranspose
Sparse matrix transpose
ccsTSolve
Solve upper/lower triangular system
ccs<op>
Supported ops include: add/div/mul/geq/etc...
cLU
Coordinate matrix LU decomposition
@@ -81,10 +87,15 @@
Function
Description
dot
Matrix-Matrix, Matrix-Vector and Vector-Matrix product
+
e
2.71828182845904...
eig
Eigenvalues and eigenvectors
+
empty
Create an empty Array
epsilon
2.220446049250313e-16
eq
Pointwise comparison x === y
exp
Pointwise Math.exp(x)
+
flip
Flip an Array on a given axis
+
fliplr
Flip an Array on the innermost axis
+
flipud
Flip an Array on the second innermost axis
floor
Poinwise Math.floor(x)
geq
Pointwise x>=y
getBlock
Extract a block from a matrix
@@ -95,9 +106,11 @@
inv
Matrix inverse
isFinite
Pointwise isFinite(x)
isNaN
Pointwise isNaN(x)
+
kron
Kronecker product of two matrices
largeArray
Don't prettyPrint Arrays larger than this
leq
Pointwise x<=y
linspace
Generate evenly spaced values
+
logspace
Generate logarithmically spaced values
log
Pointwise Math.log(x)
lshift
Pointwise x<<y
lshifteq
Pointwise x<<=y
@@ -110,26 +123,31 @@
mul
Pointwise x*y
neg
Pointwise -x
neq
Pointwise x!==y
-
norm2
Square root of the sum of the square of the entries of x
+
+
By default, this happens with the Array's length is more than 50. This can be controlled by setting the
variable numeric.largeArray to an appropriate value:
@@ -336,6 +355,19 @@
Utility functions
[0,0,0]]
+You can create a multidimensional Array of zeros or ones using the functions numeric.zeros() and
+numeric.ones(), and empty Arrays using numeric.empty().
+
+
+
You can loop over Arrays as you normally would. However, in order to quickly generate optimized
loops, the numeric library provides a few efficient loop-generation mechanisms. For example, the
numeric.mapreduce() function can be used to make a function that computes the sum of all the
@@ -366,6 +398,7 @@
Utility functions
You can create a diagonal matrix using numeric.diag()
+
-IN> sqr = function(x) { return x*x; };
+IN> sqr = function(x) { return x*x; };
numeric.uncmin(function(x) { return sqr(10*(x[1]-x[0]*x[0])) + sqr(1-x[0]); },[-1.2,1]).solution
OUT> [1,1]
-IN> f = function(x) { return sqr(-13+x[0]+((5-x[1])*x[1]-2)*x[1])+sqr(-29+x[0]+((x[1]+1)*x[1]-14)*x[1]); };
+IN> f = function(x) { return sqr(-13+x[0]+((5-x[1])*x[1]-2)*x[1])+sqr(-29+x[0]+((x[1]+1)*x[1]-14)*x[1]); };
x0 = numeric.uncmin(f,[0.5,-2]).solution
OUT> [11.41,-0.8968]
-IN> f = function(x) { return sqr(1e4*x[0]*x[1]-1)+sqr(Math.exp(-x[0])+Math.exp(-x[1])-1.0001); };
+IN> f = function(x) { return sqr(1e4*x[0]*x[1]-1)+sqr(Math.exp(-x[0])+Math.exp(-x[1])-1.0001); };
x0 = numeric.uncmin(f,[0,1]).solution
OUT> [1.098e-5,9.106]
-IN> f = function(x) { return sqr(x[0]-1e6)+sqr(x[1]-2e-6)+sqr(x[0]*x[1]-2)};
+IN> f = function(x) { return sqr(x[0]-1e6)+sqr(x[1]-2e-6)+sqr(x[0]*x[1]-2)};
x0 = numeric.uncmin(f,[0,1]).solution
OUT> [1e6,2e-6]
-IN> f = function(x) {
+IN> f = function(x) {
return sqr(1.5-x[0]*(1-x[1]))+sqr(2.25-x[0]*(1-x[1]*x[1]))+sqr(2.625-x[0]*(1-x[1]*x[1]*x[1]));
- };
+ };
x0 = numeric.uncmin(f,[1,1]).solution
OUT> [3,0.5]
-IN> f = function(x) {
- var ret = 0,i;
+IN> f = function(x) {
+ var ret = 0,i;
for(i=1;i<=10;i++) ret+=sqr(2+2*i-Math.exp(i*x[0])-Math.exp(i*x[1]));
- return ret;
+ return ret;
};
x0 = numeric.uncmin(f,[0.3,0.4]).solution
OUT> [0.2578,0.2578]
-IN> y = [0.14,0.18,0.22,0.25,0.29,0.32,0.35,0.39,0.37,0.58,0.73,0.96,1.34,2.10,4.39];
- f = function(x) {
- var ret = 0,i;
- for(i=1;i<=15;i++) ret+=sqr(y[i-1]-(x[0]+i/((16-i)*x[1]+Math.min(i,16-i)*x[2])));
- return ret;
- };
+IN> y = [0.14,0.18,0.22,0.25,0.29,0.32,0.35,0.39,0.37,0.58,0.73,0.96,1.34,2.10,4.39];
+ f = function(x) {
+ var ret = 0,i;
+ for(i=1;i<=15;i++) ret+=sqr(y[i-1]-(x[0]+i/((16-i)*x[1]+Math.min(i,16-i)*x[2])));
+ return ret;
+ };
x0 = numeric.uncmin(f,[1,1,1]).solution
OUT> [0.08241,1.133,2.344]
-IN> y = [0.0009,0.0044,0.0175,0.0540,0.1295,0.2420,0.3521,0.3989,0.3521,0.2420,0.1295,0.0540,0.0175,0.0044,0.0009];
- f = function(x) {
- var ret = 0,i;
- for(i=1;i<=15;i++)
- ret+=sqr(x[0]*Math.exp(-x[1]*sqr((8-i)/2-x[2])/2)-y[i-1]);
- return ret;
- };
+IN> y = [0.0009,0.0044,0.0175,0.0540,0.1295,0.2420,0.3521,0.3989,0.3521,0.2420,0.1295,0.0540,0.0175,0.0044,0.0009];
+ f = function(x) {
+ var ret = 0,i;
+ for(i=1;i<=15;i++)
+ ret+=sqr(x[0]*Math.exp(-x[1]*sqr((8-i)/2-x[2])/2)-y[i-1]);
+ return ret;
+ };
x0 = numeric.div(numeric.round(numeric.mul(numeric.uncmin(f,[1,1,1]).solution,1000)),1000)
OUT> [0.399,1,0]
-IN> f = function(x) { return sqr(x[0]+10*x[1])+5*sqr(x[2]-x[3])+sqr(sqr(x[1]-2*x[2]))+10*sqr(x[0]-x[3]); };
+IN> f = function(x) { return sqr(x[0]+10*x[1])+5*sqr(x[2]-x[3])+sqr(sqr(x[1]-2*x[2]))+10*sqr(x[0]-x[3]); };
x0 = numeric.div(numeric.round(numeric.mul(numeric.uncmin(f,[3,-1,0,1]).solution,1e5)),1e5)
OUT> [0,0,0,0]
-IN> f = function(x) {
+IN> f = function(x) {
return (sqr(10*(x[1]-x[0]*x[0]))+sqr(1-x[0])+
90*sqr(x[3]-x[2]*x[2])+sqr(1-x[2])+
- 10*sqr(x[1]+x[3]-2)+0.1*sqr(x[1]-x[3])); };
+ 10*sqr(x[1]+x[3]-2)+0.1*sqr(x[1]-x[3])); };
x0 = numeric.uncmin(f,[-3,-1,-3,-1]).solution
OUT> [1,1,1,1]
-IN> y = [0.1957,0.1947,0.1735,0.1600,0.0844,0.0627,0.0456,0.0342,0.0323,0.0235,0.0246];
- u = [4,2,1,0.5,0.25,0.167,0.125,0.1,0.0833,0.0714,0.0625];
- f = function(x) {
- var ret=0, i;
- for(i=0;i<11;++i) ret += sqr(y[i]-x[0]*(u[i]*u[i]+u[i]*x[1])/(u[i]*u[i]+u[i]*x[2]+x[3]));
- return ret;
- };
+IN> y = [0.1957,0.1947,0.1735,0.1600,0.0844,0.0627,0.0456,0.0342,0.0323,0.0235,0.0246];
+ u = [4,2,1,0.5,0.25,0.167,0.125,0.1,0.0833,0.0714,0.0625];
+ f = function(x) {
+ var ret=0, i;
+ for(i=0;i<11;++i) ret += sqr(y[i]-x[0]*(u[i]*u[i]+u[i]*x[1])/(u[i]*u[i]+u[i]*x[2]+x[3]));
+ return ret;
+ };
x0 = numeric.uncmin(f,[0.25,0.39,0.415,0.39]).solution
OUT> [ 0.1928, 0.1913, 0.1231, 0.1361]
IN> y = [0.844,0.908,0.932,0.936,0.925,0.908,0.881,0.850,0.818,0.784,0.751,0.718,
0.685,0.658,0.628,0.603,0.580,0.558,0.538,0.522,0.506,0.490,0.478,0.467,
- 0.457,0.448,0.438,0.431,0.424,0.420,0.414,0.411,0.406];
- f = function(x) {
- var ret=0, i;
- for(i=0;i<33;++i) ret += sqr(y[i]-(x[0]+x[1]*Math.exp(-10*i*x[3])+x[2]*Math.exp(-10*i*x[4])));
- return ret;
- };
+ 0.457,0.448,0.438,0.431,0.424,0.420,0.414,0.411,0.406];
+ f = function(x) {
+ var ret=0, i;
+ for(i=0;i<33;++i) ret += sqr(y[i]-(x[0]+x[1]*Math.exp(-10*i*x[3])+x[2]*Math.exp(-10*i*x[4])));
+ return ret;
+ };
x0 = numeric.uncmin(f,[0.5,1.5,-1,0.01,0.02]).solution
OUT> [ 0.3754, 1.936, -1.465, 0.01287, 0.02212]
-IN> f = function(x) {
- var ret=0, i,ti,yi,exp=Math.exp;
- for(i=1;i<=13;++i) {
- ti = 0.1*i;
- yi = exp(-ti)-5*exp(-10*ti)+3*exp(-4*ti);
- ret += sqr(x[2]*exp(-ti*x[0])-x[3]*exp(-ti*x[1])+x[5]*exp(-ti*x[4])-yi);
- }
- return ret;
- };
+IN> f = function(x) {
+ var ret=0, i,ti,yi,exp=Math.exp;
+ for(i=1;i<=13;++i) {
+ ti = 0.1*i;
+ yi = exp(-ti)-5*exp(-10*ti)+3*exp(-4*ti);
+ ret += sqr(x[2]*exp(-ti*x[0])-x[3]*exp(-ti*x[1])+x[5]*exp(-ti*x[4])-yi);
+ }
+ return ret;
+ };
x0 = numeric.uncmin(f,[1,2,1,1,1,1],1e-14).solution;
f(x0)<1e-20;
OUT> true
@@ -1163,8 +1263,8 @@
Unconstrained optimization
gradient of f(). If it is not provided, a numerical gradient is used. The iteration stops when
maxit iterations have been performed. The optional callback() parameter, if provided, is called at each step:
IN> x = numeric.solveLP([1,1], /* minimize [1,1]*x */
[[-1,0],[0,-1],[-1,-2]], /* matrix of inequalities */
[0,0,-3] /* right-hand-side of inequalities */
- );
+ );
numeric.trunc(x.solution,1e-12);
OUT> [0,1.5]
@@ -1349,7 +1449,7 @@
Solving ODEs
Seedrandom (David Bau)
-The object numeric.seedrandom is based on
+The object numeric.seedrandom is based on
David Bau's seedrandom.js.
This small library can be used to create better pseudorandom numbers than Math.random() which can
furthermore be "seeded".
@@ -1367,4 +1467,4 @@
Seedrandom (David Bau)
-
+
\ No newline at end of file
diff --git a/favicon.ico b/favicon.ico
old mode 100755
new mode 100644
diff --git a/index.php b/index.php
index 6a6d2ed..5ee25b5 100644
--- a/index.php
+++ b/index.php
@@ -1,13 +1,19 @@
+
+
+
+
+
Numeric Javascript
+
@@ -62,7 +68,7 @@
Although Javascript does not reach the same performance as native programs, the Numeric Javascript
library is carefully tuned to obtain the best possible performance for a Javascript program. You
can compare the performance of Numeric, Sylvester and
-Google Closure's
+Google Closure's
Matrix
object using our Benchmark.
@@ -94,3 +100,4 @@
+
By default, this happens with the Array's length is more than 50. This can be controlled by setting the
variable numeric.largeArray to an appropriate value:
@@ -336,6 +355,19 @@
Utility functions
[0,0,0]]
+You can create a multidimensional Array of zeros or ones using the functions numeric.zeros() and
+numeric.ones(), and empty Arrays using numeric.empty().
+
+
+
You can loop over Arrays as you normally would. However, in order to quickly generate optimized
loops, the numeric library provides a few efficient loop-generation mechanisms. For example, the
numeric.mapreduce() function can be used to make a function that computes the sum of all the
@@ -366,6 +398,7 @@
Utility functions
You can create a diagonal matrix using numeric.diag()
+
-IN> sqr = function(x) { return x*x; };
+IN> sqr = function(x) { return x*x; };
numeric.uncmin(function(x) { return sqr(10*(x[1]-x[0]*x[0])) + sqr(1-x[0]); },[-1.2,1]).solution
OUT> [1,1]
-IN> f = function(x) { return sqr(-13+x[0]+((5-x[1])*x[1]-2)*x[1])+sqr(-29+x[0]+((x[1]+1)*x[1]-14)*x[1]); };
+IN> f = function(x) { return sqr(-13+x[0]+((5-x[1])*x[1]-2)*x[1])+sqr(-29+x[0]+((x[1]+1)*x[1]-14)*x[1]); };
x0 = numeric.uncmin(f,[0.5,-2]).solution
OUT> [11.41,-0.8968]
-IN> f = function(x) { return sqr(1e4*x[0]*x[1]-1)+sqr(Math.exp(-x[0])+Math.exp(-x[1])-1.0001); };
+IN> f = function(x) { return sqr(1e4*x[0]*x[1]-1)+sqr(Math.exp(-x[0])+Math.exp(-x[1])-1.0001); };
x0 = numeric.uncmin(f,[0,1]).solution
OUT> [1.098e-5,9.106]
-IN> f = function(x) { return sqr(x[0]-1e6)+sqr(x[1]-2e-6)+sqr(x[0]*x[1]-2)};
+IN> f = function(x) { return sqr(x[0]-1e6)+sqr(x[1]-2e-6)+sqr(x[0]*x[1]-2)};
x0 = numeric.uncmin(f,[0,1]).solution
OUT> [1e6,2e-6]
-IN> f = function(x) {
+IN> f = function(x) {
return sqr(1.5-x[0]*(1-x[1]))+sqr(2.25-x[0]*(1-x[1]*x[1]))+sqr(2.625-x[0]*(1-x[1]*x[1]*x[1]));
- };
+ };
x0 = numeric.uncmin(f,[1,1]).solution
OUT> [3,0.5]
-IN> f = function(x) {
- var ret = 0,i;
+IN> f = function(x) {
+ var ret = 0,i;
for(i=1;i<=10;i++) ret+=sqr(2+2*i-Math.exp(i*x[0])-Math.exp(i*x[1]));
- return ret;
+ return ret;
};
x0 = numeric.uncmin(f,[0.3,0.4]).solution
OUT> [0.2578,0.2578]
-IN> y = [0.14,0.18,0.22,0.25,0.29,0.32,0.35,0.39,0.37,0.58,0.73,0.96,1.34,2.10,4.39];
- f = function(x) {
- var ret = 0,i;
- for(i=1;i<=15;i++) ret+=sqr(y[i-1]-(x[0]+i/((16-i)*x[1]+Math.min(i,16-i)*x[2])));
- return ret;
- };
+IN> y = [0.14,0.18,0.22,0.25,0.29,0.32,0.35,0.39,0.37,0.58,0.73,0.96,1.34,2.10,4.39];
+ f = function(x) {
+ var ret = 0,i;
+ for(i=1;i<=15;i++) ret+=sqr(y[i-1]-(x[0]+i/((16-i)*x[1]+Math.min(i,16-i)*x[2])));
+ return ret;
+ };
x0 = numeric.uncmin(f,[1,1,1]).solution
OUT> [0.08241,1.133,2.344]
-IN> y = [0.0009,0.0044,0.0175,0.0540,0.1295,0.2420,0.3521,0.3989,0.3521,0.2420,0.1295,0.0540,0.0175,0.0044,0.0009];
- f = function(x) {
- var ret = 0,i;
- for(i=1;i<=15;i++)
- ret+=sqr(x[0]*Math.exp(-x[1]*sqr((8-i)/2-x[2])/2)-y[i-1]);
- return ret;
- };
+IN> y = [0.0009,0.0044,0.0175,0.0540,0.1295,0.2420,0.3521,0.3989,0.3521,0.2420,0.1295,0.0540,0.0175,0.0044,0.0009];
+ f = function(x) {
+ var ret = 0,i;
+ for(i=1;i<=15;i++)
+ ret+=sqr(x[0]*Math.exp(-x[1]*sqr((8-i)/2-x[2])/2)-y[i-1]);
+ return ret;
+ };
x0 = numeric.div(numeric.round(numeric.mul(numeric.uncmin(f,[1,1,1]).solution,1000)),1000)
OUT> [0.399,1,0]
-IN> f = function(x) { return sqr(x[0]+10*x[1])+5*sqr(x[2]-x[3])+sqr(sqr(x[1]-2*x[2]))+10*sqr(x[0]-x[3]); };
+IN> f = function(x) { return sqr(x[0]+10*x[1])+5*sqr(x[2]-x[3])+sqr(sqr(x[1]-2*x[2]))+10*sqr(x[0]-x[3]); };
x0 = numeric.div(numeric.round(numeric.mul(numeric.uncmin(f,[3,-1,0,1]).solution,1e5)),1e5)
OUT> [0,0,0,0]
-IN> f = function(x) {
+IN> f = function(x) {
return (sqr(10*(x[1]-x[0]*x[0]))+sqr(1-x[0])+
90*sqr(x[3]-x[2]*x[2])+sqr(1-x[2])+
- 10*sqr(x[1]+x[3]-2)+0.1*sqr(x[1]-x[3])); };
+ 10*sqr(x[1]+x[3]-2)+0.1*sqr(x[1]-x[3])); };
x0 = numeric.uncmin(f,[-3,-1,-3,-1]).solution
OUT> [1,1,1,1]
-IN> y = [0.1957,0.1947,0.1735,0.1600,0.0844,0.0627,0.0456,0.0342,0.0323,0.0235,0.0246];
- u = [4,2,1,0.5,0.25,0.167,0.125,0.1,0.0833,0.0714,0.0625];
- f = function(x) {
- var ret=0, i;
- for(i=0;i<11;++i) ret += sqr(y[i]-x[0]*(u[i]*u[i]+u[i]*x[1])/(u[i]*u[i]+u[i]*x[2]+x[3]));
- return ret;
- };
+IN> y = [0.1957,0.1947,0.1735,0.1600,0.0844,0.0627,0.0456,0.0342,0.0323,0.0235,0.0246];
+ u = [4,2,1,0.5,0.25,0.167,0.125,0.1,0.0833,0.0714,0.0625];
+ f = function(x) {
+ var ret=0, i;
+ for(i=0;i<11;++i) ret += sqr(y[i]-x[0]*(u[i]*u[i]+u[i]*x[1])/(u[i]*u[i]+u[i]*x[2]+x[3]));
+ return ret;
+ };
x0 = numeric.uncmin(f,[0.25,0.39,0.415,0.39]).solution
OUT> [ 0.1928, 0.1913, 0.1231, 0.1361]
IN> y = [0.844,0.908,0.932,0.936,0.925,0.908,0.881,0.850,0.818,0.784,0.751,0.718,
0.685,0.658,0.628,0.603,0.580,0.558,0.538,0.522,0.506,0.490,0.478,0.467,
- 0.457,0.448,0.438,0.431,0.424,0.420,0.414,0.411,0.406];
- f = function(x) {
- var ret=0, i;
- for(i=0;i<33;++i) ret += sqr(y[i]-(x[0]+x[1]*Math.exp(-10*i*x[3])+x[2]*Math.exp(-10*i*x[4])));
- return ret;
- };
+ 0.457,0.448,0.438,0.431,0.424,0.420,0.414,0.411,0.406];
+ f = function(x) {
+ var ret=0, i;
+ for(i=0;i<33;++i) ret += sqr(y[i]-(x[0]+x[1]*Math.exp(-10*i*x[3])+x[2]*Math.exp(-10*i*x[4])));
+ return ret;
+ };
x0 = numeric.uncmin(f,[0.5,1.5,-1,0.01,0.02]).solution
OUT> [ 0.3754, 1.936, -1.465, 0.01287, 0.02212]
-IN> f = function(x) {
- var ret=0, i,ti,yi,exp=Math.exp;
- for(i=1;i<=13;++i) {
- ti = 0.1*i;
- yi = exp(-ti)-5*exp(-10*ti)+3*exp(-4*ti);
- ret += sqr(x[2]*exp(-ti*x[0])-x[3]*exp(-ti*x[1])+x[5]*exp(-ti*x[4])-yi);
- }
- return ret;
- };
+IN> f = function(x) {
+ var ret=0, i,ti,yi,exp=Math.exp;
+ for(i=1;i<=13;++i) {
+ ti = 0.1*i;
+ yi = exp(-ti)-5*exp(-10*ti)+3*exp(-4*ti);
+ ret += sqr(x[2]*exp(-ti*x[0])-x[3]*exp(-ti*x[1])+x[5]*exp(-ti*x[4])-yi);
+ }
+ return ret;
+ };
x0 = numeric.uncmin(f,[1,2,1,1,1,1],1e-14).solution;
f(x0)<1e-20;
OUT> true
@@ -1163,8 +1263,8 @@
Unconstrained optimization
gradient of f(). If it is not provided, a numerical gradient is used. The iteration stops when
maxit iterations have been performed. The optional callback() parameter, if provided, is called at each step:
IN> x = numeric.solveLP([1,1], /* minimize [1,1]*x */
[[-1,0],[0,-1],[-1,-2]], /* matrix of inequalities */
[0,0,-3] /* right-hand-side of inequalities */
- );
+ );
numeric.trunc(x.solution,1e-12);
OUT> [0,1.5]
@@ -1349,7 +1449,7 @@
Solving ODEs
Seedrandom (David Bau)
-The object numeric.seedrandom is based on
+The object numeric.seedrandom is based on
David Bau's seedrandom.js.
This small library can be used to create better pseudorandom numbers than Math.random() which can
furthermore be "seeded".
@@ -1367,4 +1467,4 @@
Seedrandom (David Bau)
-
+
\ No newline at end of file
diff --git a/src/intro.js b/src/intro.js
new file mode 100644
index 0000000..759fa9e
--- /dev/null
+++ b/src/intro.js
@@ -0,0 +1,17 @@
+(function (root, factory) {
+ if (typeof exports === 'object') {
+ // Node.
+ module.exports = factory();
+ } else if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define(factory);
+ } else {
+ // Browser globals (root is window)
+ root.numeric = factory();
+ }
+}(this, function() {
+
+'use strict';
+var numeric = function numeric(){};
+
+//if(typeof global !== "undefined") { global.numeric = numeric; }
diff --git a/src/iterative.js b/src/iterative.js
new file mode 100644
index 0000000..b895f28
--- /dev/null
+++ b/src/iterative.js
@@ -0,0 +1,363 @@
+// CCS matrix mul dense vector
+//
+// numeric.ccsMV is defined in src/numeric.js
+
+
+numeric.bicgstab = function bicgstab(A, b, maxIters, residue) {
+ var maxIters = maxIters || 1024;
+ var residue = residue || 1e-6;
+
+ var BiCG = function( A, b, dotVV, dotMV ) {
+ // initialization
+ var iters = 0;
+ var converged = false;
+ var rows = b.length;
+
+ var dot = dotVV;
+ var mv = dotMV;
+ var add = numeric.add;
+ var mul = numeric.mul;
+ var axpy = function(alpha, x, y) {
+ return add(mul(x, alpha), y);
+ };
+
+ // initialize x
+ var x = numeric.rep([rows], 0);
+
+ // r = b - A x
+ // x is zero initially
+ var r = mul(b, 1);
+ var rhat = mul(b, 1);
+ var rho = 1, alpha = 1, w = 1;
+ var p = mul(b, 1);
+ var v = numeric.rep([rows], 0);
+ var s, t, alpha, beta;
+
+ var bnorm = dot(b, b);
+
+ while( !converged && iters < maxIters ) {
+ var rDotr = dot(rhat, r);
+
+ if( Math.abs(rDotr / bnorm) <= residue ) {
+ converged = true;
+ break;
+ }
+
+ v = mv(A, p);
+ alpha = rDotr / dot(rhat, v);
+ s = axpy(-alpha, v, r);
+
+ t = mv(A, s);
+ w = dot(t, s) / dot(t, t);
+
+ x = axpy(w, s, axpy(alpha, p, x));
+ r = axpy(-w, t, s);
+
+ beta = dot(rhat, r) / rDotr * (alpha/w);
+ p = axpy(beta, axpy(-w, v, p), r);
+
+ iters++;
+ }
+
+ if( converged )
+ console.log('converged in ' + iters + ' iterations');
+ else
+ console.log('not converged in ' + iters + ' iterations');
+
+ return x;
+ }
+
+ switch(A.format) {
+ case 'full': {
+ return BiCG(A, b, numeric.dot, numeric.dot);
+ }
+ case 'ccs': {
+ return BiCG(A, b, numeric.dot, numeric.ccsMV);
+ }
+ case 'crs': {
+ return BiCG(A, b, numeric.dot, numeric.cdotMV);
+ }
+ default: {
+ throw 'Not supported matrix format';
+ }
+ }
+}
+
+numeric.cg = function cg(A, b, maxIters, residue) {
+ var maxIters = maxIters || 1024;
+ var residue = residue || 1e-6;
+
+ var CG = function( A, b, dotVV, dotMV ) {
+ // initialization
+ var iters = 0;
+ var converged = false;
+ var rows = b.length;
+
+ var dot = dotVV;
+ var mv = dotMV;
+ var add = numeric.add;
+ var mul = numeric.mul;
+ var axpy = function(alpha, x, y) {
+ return add(mul(x, alpha), y);
+ };
+
+ // initialize x
+ var x = numeric.rep([rows], 0);
+
+ // r = b - A x
+ // x is zero initially
+ var r = mul(b, 1);
+ var p = mul(b, 1);
+
+ var bnorm = dot(b, b);
+ var rho = bnorm;
+ var flag = 1;
+ var Ap, pAp, alpha, beta, rho_new;
+ while( !converged && iters < maxIters ) {
+ if( Math.abs(rho / bnorm) <= residue ) {
+ converged = true;
+ break;
+ }
+
+ Ap = mv(A, p);
+ pAp = dot(p, Ap);
+ alpha = rho / pAp;
+
+ x = axpy(alpha, p, x);
+ r = axpy(-alpha, Ap, r);
+
+ rho_new = dot(r, r);
+ beta = rho_new / rho;
+ p = axpy(beta, p, r);
+ rho = rho_new;
+ iters++;
+ }
+
+ if( converged )
+ console.log('converged in ' + iters + ' iterations');
+ else
+ console.log('not converged in ' + iters + ' iterations');
+
+ return x;
+ }
+
+ switch(A.format) {
+ case 'full': {
+ return CG(A, b, numeric.dot, numeric.dot);
+ }
+ case 'ccs': {
+ return CG(A, b, numeric.dot, numeric.ccsMV);
+ }
+ case 'crs': {
+ return CG(A, b, numeric.dot, numeric.cdotMV);
+ }
+ default: {
+ throw 'Not supported matrix format';
+ }
+ }
+};
+
+numeric.sor = function sor(A, b, relax, maxIters, residue) {
+ var maxIters = maxIters || 1024;
+ var residue = residue || 1e-6;
+ var relax = relax || 1.0; // no relaxation by default, fall back to Gauss-Seidel
+
+ var sor_full = function(A, b) {
+ // initialization
+ var iters = 0;
+ var converged = false;
+ var rows = b.length;
+
+ var sA = numeric.dim(A);
+ var n = sA[0], m = sA[1];
+ if( n != rows ) {
+ throw 'Matrix dimension does not match input vector.';
+ }
+
+ // initialize x
+ var x = numeric.rep([rows], 0);
+ var dot = numeric.dot;
+ var bnorm = dot(b, b);
+ var rowsum = 0;
+ var i, j;
+ var Ai;
+ var rowdiff;
+ var res = numeric.rep([rows], 0), r2;
+
+ while(!converged && iters < maxIters) {
+ for(i=0;i phi0 && t > epsilon) {
+ var theta = phi1 / phi0;
+ var u = (Math.sqrt(1.0 + 6.0 * theta) - 1.0) / (3.0 * theta);
+ t *= u;
+ }
+ else {
+ this.copyVariables(x, x_new);
+ break;
+ }
+ }
+ }
+
+ // add -dx to x to get the new variables
+ //
+ this.getNewVariableValue = function (x, dx, t) {
+ var x_new = new Array(x.length);
+ var i = 0;
+ for (i = 0; i < x.length; i++) {
+ x_new[i] = x[i] - t*dx[i];
+ }
+
+ return x_new;
+ }
+
+ // copy x_new to x
+ //
+ this.copyVariables = function (x, x_new) {
+ var i = 0;
+ for (i = 0; i < x.length; i++) {
+ x[i] = x_new[i]
+ }
+ }
+
+ // evaluate the function value's residual
+ //
+ this.evaluate_residual = function (funcsVal) {
+ var i;
+ var residual = 0;
+ for (i = 0; i < funcsVal.length; i++) {
+ residual += Math.abs(funcsVal[i]);
+ }
+ return residual;
+ }
+
+ // evaluate the Euclidean_norm_of_residual
+ //
+ this.evaluate_Euclidean_norm_of_residual = function (funcsVal) {
+ var i;
+ var residual2 = 0;
+ for (i = 0; i < funcsVal.length; i++) {
+ var fabs = Math.abs(funcsVal[i]);
+ residual2 += fabs*fabs;
+ }
+ return Math.sqrt(residual2);
+ }
+
+ // main function start here
+ //
+ var residual_tol = 1e-7;
+ var max_iteration = 1000;
+ var epsilon = 2.22e-16;
+ var JS_GSL_SUCCESS = 0;
+ var JS_GSL_CONTINUE = 1;
+
+ // evaluate none linear system of equations and its jacobian matrix
+ //
+ var funcs = F(x);
+ var jacobian = A(x);
+
+ // iterate to get the solution
+ //
+ var iter = 0;
+ var status;
+ do {
+ iter++;
+
+ this.newton_iterate(F, A, x);
+
+ if (this.evaluate_residual(F(x)) < residual_tol)
+ status = JS_GSL_SUCCESS;
+ else
+ status = JS_GSL_CONTINUE;
+
+ } while (status == JS_GSL_CONTINUE && iter < max_iteration)
+
+}
+
+/* unit test
+
+Rosenbrock Function
+
+ double y0 = 1 - x0;
+ double y1 = 10 * (x1 - x0 * x0);
+
+ x0 = -1.2
+ x1 = 1.0
+
+*/
+
+
diff --git a/src/numeric.js b/src/numeric.js
index 336f081..2b37c32 100644
--- a/src/numeric.js
+++ b/src/numeric.js
@@ -1,9 +1,5 @@
-"use strict";
-var numeric = (typeof exports === "undefined")?(function numeric() {}):(exports);
-if(typeof global !== "undefined") { global.numeric = numeric; }
-
-numeric.version = "1.2.6";
+numeric.version = "1.2.8-2";
// 1. Utility functions
numeric.bench = function bench (f,interval) {
@@ -22,7 +18,7 @@ numeric.bench = function bench (f,interval) {
while(i>0) { f(); i--; }
t2 = new Date();
return 1000*(3*n-1)/(t2-t1);
-}
+};
numeric._myIndexOf = (function _myIndexOf(w) {
var n = this.length,k;
@@ -31,10 +27,17 @@ numeric._myIndexOf = (function _myIndexOf(w) {
});
numeric.myIndexOf = (Array.prototype.indexOf)?Array.prototype.indexOf:numeric._myIndexOf;
-numeric.Function = Function;
numeric.precision = 4;
numeric.largeArray = 50;
+// Wrapper around `new Function` that closures in the `numeric` object.
+numeric.compile = function () {
+ var args = Array.prototype.slice.call(arguments);
+ var body = args.pop();
+ body = 'return function (' + args.join(',') + ') {' + body + '}';
+ return (new Function(['numeric'], body))(numeric);
+}
+
numeric.prettyPrint = function prettyPrint(x) {
function fmtnum(x) {
if(x === 0) { return '0'; }
@@ -56,25 +59,25 @@ numeric.prettyPrint = function prettyPrint(x) {
if(typeof x === "string") { ret.push('"'+x+'"'); return false; }
if(typeof x === "boolean") { ret.push(x.toString()); return false; }
if(typeof x === "number") {
- var a = fmtnum(x);
+ var a = parseFloat(x.toString()).toString();
var b = x.toPrecision(numeric.precision);
- var c = parseFloat(x.toString()).toString();
+ var c = fmtnum(x);
var d = [a,b,c,parseFloat(b).toString(),parseFloat(c).toString()];
for(k=1;k0) {
- ret[count] = [];
- for(j=0;j0) {
+ ret[count] = [];
+ for(j=0;j>> 8) ^ table[y];
}
-
+
return crc ^ (-1);
}
@@ -232,7 +236,7 @@ numeric.imageURL = function imageURL(img) {
var stream = [
137, 80, 78, 71, 13, 10, 26, 10, // 0: PNG signature
0,0,0,13, // 8: IHDR Chunk length
- 73, 72, 68, 82, // 12: "IHDR"
+ 73, 72, 68, 82, // 12: "IHDR"
(w >> 24) & 255, (w >> 16) & 255, (w >> 8) & 255, w&255, // 16: Width
(h >> 24) & 255, (h >> 16) & 255, (h >> 8) & 255, h&255, // 20: Height
8, // 24: bit depth
@@ -303,14 +307,14 @@ numeric.imageURL = function imageURL(img) {
stream.push(96); // CRC3
stream.push(130); // CRC4
return 'data:image/png;base64,'+base64(stream);
-}
+};
// 2. Linear algebra with Arrays.
numeric._dim = function _dim(x) {
var ret = [];
while(typeof x === "object") { ret.push(x.length); x = x[0]; }
return ret;
-}
+};
numeric.dim = function dim(x) {
var y,z;
@@ -326,10 +330,11 @@ numeric.dim = function dim(x) {
return [x.length];
}
return [];
-}
+};
-numeric.mapreduce = function mapreduce(body,init) {
- return Function('x','accum','_s','_k',
+// mapreduce
+numeric.mapreduce = function mapreduce(body, init) {
+ return numeric.compile('x','accum','_s','_k',
'if(typeof accum === "undefined") accum = '+init+';\n'+
'if(typeof x === "number") { var xi = x; '+body+'; return accum; }\n'+
'if(typeof _s === "undefined") _s = numeric.dim(x);\n'+
@@ -354,47 +359,76 @@ numeric.mapreduce = function mapreduce(body,init) {
'}\n'+
'return accum;'
);
-}
-numeric.mapreduce2 = function mapreduce2(body,setup) {
- return Function('x',
+};
+
+//
+numeric.mapreduce2 = function mapreduce2(body, setup) {
+ return numeric.compile('x',
'var n = x.length;\n'+
- 'var i,xi;\n'+setup+';\n'+
+ 'var i,xi;\n'+setup+'\n'+
'for(i=n-1;i!==-1;--i) { \n'+
' xi = x[i];\n'+
- ' '+body+';\n'+
+ ' '+body+'\n'+
'}\n'+
'return accum;'
);
-}
-
+};
+// compare arrays/tensors
numeric.same = function same(x,y) {
- var i,n;
+ var i, n;
+
if(!(x instanceof Array) || !(y instanceof Array)) { return false; }
+
n = x.length;
+
if(n !== y.length) { return false; }
- for(i=0;i=0;i--) { z[i] = numeric.empty(s,k+1); }
+ return z;
+};
+
+// repeat
+numeric.rep = function rep(s, v, k)
+{
+ // repeat value v over a tensor of size s = [s0, s1, s2, ...]
+ // k recursive index
+ if(typeof k === "undefined") { k = 0; }
+
var n = s[k], ret = Array(n), i;
- if(k === s.length-1) {
- for(i=n-2;i>=0;i-=2) { ret[i+1] = v; ret[i] = v; }
- if(i===-1) { ret[0] = v; }
+
+ if(k === s.length - 1)
+ {
+ for(i = n - 2; i >= 0; i -= 2) { ret[i+1] = v; ret[i] = v; }
+ if(i === -1) { ret[0] = v; }
return ret;
}
- for(i=n-1;i>=0;i--) { ret[i] = numeric.rep(s,v,k+1); }
+
+ for(i = n - 1; i >= 0; i--) { ret[i] = numeric.rep(s, v, k+1); }
+
return ret;
-}
+};
+numeric.zeros = function zeros(s) { return numeric.rep(s,0); };
+numeric.ones = function ones(s) { return numeric.rep(s,1); };
-numeric.dotMMsmall = function dotMMsmall(x,y) {
+// dot functions
+numeric.dotMMsmall = function dotMMsmall(x,y)
+{
var i,j,k,p,q,r,ret,foo,bar,woo,i0,k0,p0,r0;
p = x.length; q = y.length; r = y[0].length;
ret = Array(p);
@@ -413,7 +447,8 @@ numeric.dotMMsmall = function dotMMsmall(x,y) {
ret[i] = foo;
}
return ret;
-}
+};
+
numeric._getCol = function _getCol(A,j,x) {
var n = A.length, i;
for(i=n-1;i>0;--i) {
@@ -422,7 +457,8 @@ numeric._getCol = function _getCol(A,j,x) {
x[i] = A[i][j];
}
if(i===0) x[0] = A[0][j];
-}
+};
+
numeric.dotMMbig = function dotMMbig(x,y){
var gc = numeric._getCol, p = y.length, v = Array(p);
var m = x.length, n = y[0].length, A = new Array(m), xj;
@@ -441,14 +477,14 @@ numeric.dotMMbig = function dotMMbig(x,y){
}
}
return A;
-}
+};
numeric.dotMV = function dotMV(x,y) {
var p = x.length, q = y.length,i;
var ret = Array(p), dotVV = numeric.dotVV;
for(i=p-1;i>=0;i--) { ret[i] = dotVV(x[i],y); }
return ret;
-}
+};
numeric.dotVM = function dotVM(x,y) {
var i,j,k,p,q,r,ret,foo,bar,woo,i0,k0,p0,r0,s1,s2,s3,baz,accum;
@@ -464,7 +500,7 @@ numeric.dotVM = function dotVM(x,y) {
ret[k] = woo;
}
return ret;
-}
+};
numeric.dotVV = function dotVV(x,y) {
var i,n=x.length,i1,ret = x[n-1]*y[n-1];
@@ -474,7 +510,7 @@ numeric.dotVV = function dotVV(x,y) {
}
if(i===0) { ret += x[0]*y[0]; }
return ret;
-}
+};
numeric.dot = function dot(x,y) {
var d = numeric.dim;
@@ -490,7 +526,63 @@ numeric.dot = function dot(x,y) {
case 0: return x*y;
default: throw new Error('numeric.dot only works on vectors and matrices');
}
-}
+};
+
+// diag function
+
+numeric.roll = function roll(x, r, a, s, k) {
+ if(typeof r === 'undefined') { r=1; }
+ if(typeof a === 'undefined') { a=-1; }
+ if(typeof s === 'undefined') { s=numeric.dim(x); }
+ if(typeof k === 'undefined') { k=0; }
+ if(a < 0) { a=s.length+a; }
+ if(k === a) { return x.slice(s[k]-r).concat(x.slice(0,s[k]-r)); }
+ var i,n=s[k],z=Array(n);
+ for(i=0;i=1;--i) {
@@ -523,10 +616,12 @@ numeric.getDiag = function(A) {
ret[0] = A[0][0];
}
return ret;
-}
+};
+
+numeric.identity = function identity(n) { return numeric.diag(numeric.rep([n],1)); };
-numeric.identity = function identity(n) { return numeric.diag(numeric.rep([n],1)); }
-numeric.pointwise = function pointwise(params,body,setup) {
+numeric.pointwise = function pointwise(params,body,setup)
+{
if(typeof setup === "undefined") { setup = ""; }
var fun = [];
var k;
@@ -557,9 +652,11 @@ numeric.pointwise = function pointwise(params,body,setup) {
'}\n'+
'return ret;'
);
- return Function.apply(null,fun);
-}
-numeric.pointwise2 = function pointwise2(params,body,setup) {
+ return numeric.compile.apply(null,fun);
+};
+
+numeric.pointwise2 = function pointwise2(params,body,setup)
+{
if(typeof setup === "undefined") { setup = ""; }
var fun = [];
var k;
@@ -582,24 +679,28 @@ numeric.pointwise2 = function pointwise2(params,body,setup) {
'}\n'+
'return ret;'
);
- return Function.apply(null,fun);
-}
+ return numeric.compile.apply(null,fun);
+};
+
numeric._biforeach = (function _biforeach(x,y,s,k,f) {
if(k === s.length-1) { f(x,y); return; }
var i,n=s[k];
for(i=n-1;i>=0;i--) { _biforeach(typeof x==="object"?x[i]:x,typeof y==="object"?y[i]:y,s,k+1,f); }
});
+
numeric._biforeach2 = (function _biforeach2(x,y,s,k,f) {
if(k === s.length-1) { return f(x,y); }
var i,n=s[k],ret = Array(n);
for(i=n-1;i>=0;--i) { ret[i] = _biforeach2(typeof x==="object"?x[i]:x,typeof y==="object"?y[i]:y,s,k+1,f); }
return ret;
});
+
numeric._foreach = (function _foreach(x,s,k,f) {
if(k === s.length-1) { f(x); return; }
var i,n=s[k];
for(i=n-1;i>=0;i--) { _foreach(x[i],s,k+1,f); }
});
+
numeric._foreach2 = (function _foreach2(x,s,k,f) {
if(k === s.length-1) { return f(x); }
var i,n=s[k], ret = Array(n);
@@ -633,6 +734,7 @@ numeric.ops2 = {
rshift: '>>',
rrshift: '>>>'
};
+
numeric.opseq = {
addeq: '+=',
subeq: '-=',
@@ -646,16 +748,20 @@ numeric.opseq = {
boreq: '|=',
bxoreq: '^='
};
+
numeric.mathfuns = ['abs','acos','asin','atan','ceil','cos',
'exp','floor','log','round','sin','sqrt','tan',
'isNaN','isFinite'];
+
numeric.mathfuns2 = ['atan2','pow','max','min'];
+
numeric.ops1 = {
neg: '-',
not: '!',
bnot: '~',
clone: ''
};
+
numeric.mapreducers = {
any: ['if(xi) return true;','var accum = false;'],
all: ['if(!xi) return false;','var accum = true;'],
@@ -663,7 +769,7 @@ numeric.mapreducers = {
prod: ['accum *= xi;','var accum = 1;'],
norm2Squared: ['accum += xi*xi;','var accum = 0;'],
norminf: ['accum = max(accum,abs(xi));','var accum = 0, max = Math.max, abs = Math.abs;'],
- norm1: ['accum += abs(xi)','var accum = 0, abs = Math.abs;'],
+ norm1: ['accum += abs(xi);','var accum = 0, abs = Math.abs;'],
sup: ['accum = max(accum,xi);','var accum = -Infinity, max = Math.max;'],
inf: ['accum = min(accum,xi);','var accum = Infinity, min = Math.min;']
};
@@ -693,7 +799,7 @@ numeric.mapreducers = {
numeric[i+'VV'] = numeric.pointwise2(['x[i]','y[i]'],code('ret[i]','x[i]','y[i]'),setup);
numeric[i+'SV'] = numeric.pointwise2(['x','y[i]'],code('ret[i]','x','y[i]'),setup);
numeric[i+'VS'] = numeric.pointwise2(['x[i]','y'],code('ret[i]','x[i]','y'),setup);
- numeric[i] = Function(
+ numeric[i] = numeric.compile(
'var n = arguments.length, i, x = arguments[0], y;\n'+
'var VV = numeric.'+i+'VV, VS = numeric.'+i+'VS, SV = numeric.'+i+'SV;\n'+
'var dim = numeric.dim;\n'+
@@ -708,7 +814,7 @@ numeric.mapreducers = {
numeric[o] = numeric[i];
numeric[i+'eqV'] = numeric.pointwise2(['ret[i]','x[i]'], codeeq('ret[i]','x[i]'),setup);
numeric[i+'eqS'] = numeric.pointwise2(['ret[i]','x'], codeeq('ret[i]','x'),setup);
- numeric[i+'eq'] = Function(
+ numeric[i+'eq'] = numeric.compile(
'var n = arguments.length, i, x = arguments[0], y;\n'+
'var V = numeric.'+i+'eqV, S = numeric.'+i+'eqS\n'+
'var s = numeric.dim(x);\n'+
@@ -735,7 +841,7 @@ numeric.mapreducers = {
if(Math.hasOwnProperty(o)) setup = 'var '+o+' = Math.'+o+';\n';
}
numeric[i+'eqV'] = numeric.pointwise2(['ret[i]'],'ret[i] = '+o+'(ret[i]);',setup);
- numeric[i+'eq'] = Function('x',
+ numeric[i+'eq'] = numeric.compile('x',
'if(typeof x !== "object") return '+o+'x\n'+
'var i;\n'+
'var V = numeric.'+i+'eqV;\n'+
@@ -743,7 +849,7 @@ numeric.mapreducers = {
'numeric._foreach(x,s,0,V);\n'+
'return x;\n');
numeric[i+'V'] = numeric.pointwise2(['x[i]'],'ret[i] = '+o+'(x[i]);',setup);
- numeric[i] = Function('x',
+ numeric[i] = numeric.compile('x',
'if(typeof x !== "object") return '+o+'(x)\n'+
'var i;\n'+
'var V = numeric.'+i+'V;\n'+
@@ -759,11 +865,11 @@ numeric.mapreducers = {
if(numeric.mapreducers.hasOwnProperty(i)) {
o = numeric.mapreducers[i];
numeric[i+'V'] = numeric.mapreduce2(o[0],o[1]);
- numeric[i] = Function('x','s','k',
+ numeric[i] = numeric.compile('x','s','k',
o[1]+
'if(typeof x !== "object") {'+
' xi = x;\n'+
- o[0]+';\n'+
+ o[0]+'\n'+
' return accum;\n'+
'}'+
'if(typeof s === "undefined") s = numeric.dim(x);\n'+
@@ -773,7 +879,7 @@ numeric.mapreducers = {
'var n = x.length, i;\n'+
'for(i=n-1;i!==-1;--i) {\n'+
' xi = arguments.callee(x[i]);\n'+
- o[0]+';\n'+
+ o[0]+'\n'+
'}\n'+
'return accum;\n');
}
@@ -783,6 +889,7 @@ numeric.mapreducers = {
numeric.truncVV = numeric.pointwise(['x[i]','y[i]'],'ret[i] = round(x[i]/y[i])*y[i];','var round = Math.round;');
numeric.truncVS = numeric.pointwise(['x[i]','y'],'ret[i] = round(x[i]/y)*y;','var round = Math.round;');
numeric.truncSV = numeric.pointwise(['x','y[i]'],'ret[i] = round(x/y[i])*y[i];','var round = Math.round;');
+
numeric.trunc = function trunc(x,y) {
if(typeof x === "object") {
if(typeof y === "object") return numeric.truncVV(x,y);
@@ -790,7 +897,7 @@ numeric.trunc = function trunc(x,y) {
}
if (typeof y === "object") return numeric.truncSV(x,y);
return Math.round(x/y)*y;
-}
+};
numeric.inv = function inv(x) {
var s = numeric.dim(x), abs = Math.abs, m = s[0], n = s[1];
@@ -804,7 +911,7 @@ numeric.inv = function inv(x) {
Aj = A[i0]; A[i0] = A[j]; A[j] = Aj;
Ij = I[i0]; I[i0] = I[j]; I[j] = Ij;
x = Aj[j];
- for(k=j;k!==n;++k) Aj[k] /= x;
+ for(k=j;k!==n;++k) Aj[k] /= x;
for(k=n-1;k!==-1;--k) Ij[k] /= x;
for(i=m-1;i!==-1;--i) {
if(i!==j) {
@@ -818,7 +925,7 @@ numeric.inv = function inv(x) {
}
}
return I;
-}
+};
numeric.det = function det(x) {
var s = numeric.dim(x);
@@ -846,7 +953,7 @@ numeric.det = function det(x) {
ret *= Aj[j];
}
return ret*A[j][j];
-}
+};
numeric.transpose = function transpose(x) {
var i,j,m = x.length,n = x[0].length, ret=Array(n),A0,A1,Bj;
@@ -873,7 +980,8 @@ numeric.transpose = function transpose(x) {
if(j===0) { ret[0][0] = A0[0]; }
}
return ret;
-}
+};
+
numeric.negtranspose = function negtranspose(x) {
var i,j,m = x.length,n = x[0].length, ret=Array(n),A0,A1,Bj;
for(j=0;j=0;i--) ret[i] = _random(s,k+1);
return ret;
-}
-numeric.random = function random(s) { return numeric._random(s,0); }
+};
+
+numeric.random = function random(s) { return numeric._random(s,0); };
-numeric.norm2 = function norm2(x) { return Math.sqrt(numeric.norm2Squared(x)); }
+numeric.norm2 = function norm2(x,a) { return numeric.sqrt(numeric.norm2Squared(x,a)); };
numeric.linspace = function linspace(a,b,n) {
if(typeof n === "undefined") n = Math.max(Math.round(b-a)+1,1);
@@ -926,6 +1035,21 @@ numeric.linspace = function linspace(a,b,n) {
n--;
for(i=n;i>=0;i--) { ret[i] = (i*b+(n-i)*a)/n; }
return ret;
+};
+
+numeric.logspace = function logspace(a,b,n,e) {
+ if(typeof e === 'undefined') { e=10; }
+ return numeric.pow(e, numeric.linspace(a,b,n));
+};
+
+numeric.range = function range(start,stop,step) {
+ if (typeof step === 'undefined') { step = 1; }
+ if (typeof stop === 'undefined') { stop = start; start = 0; }
+ if (step > 0 && (stop < start)) { return []; }
+ if (step < 0 && (stop > start)) { return []; }
+ var i,z=[];
+ for(i=start;i= 0 ? 1 : -1;
@@ -1360,8 +1503,9 @@ numeric.house = function house(x) {
var foo = numeric.norm2(v);
if(foo === 0) { /* this should not happen */ throw new Error('eig: internal error'); }
return numeric.div(v,foo);
-}
+};
+// upper hessenberg
numeric.toUpperHessenberg = function toUpperHessenberg(me) {
var s = numeric.dim(me);
if(s.length !== 2 || s[0] !== s[1]) { throw new Error('numeric: toUpperHessenberg() only works on square matrices'); }
@@ -1384,11 +1528,15 @@ numeric.toUpperHessenberg = function toUpperHessenberg(me) {
}
}
return {H:A, Q:Q};
-}
+};
+// precision
numeric.epsilon = 2.220446049250313e-16;
+numeric.pi = 3.141592653589793238462643383279502884197169399375105820;
+numeric.e = 2.71828182845904523536028747135266249775724709369995;
-numeric.QRFrancis = function(H,maxiter) {
+// qr
+numeric.QRFrancis = function(H, maxiter) {
if(typeof maxiter === "undefined") { maxiter = 10000; }
H = numeric.clone(H);
var H0 = numeric.clone(H);
@@ -1473,8 +1621,162 @@ numeric.QRFrancis = function(H,maxiter) {
}
}
throw new Error('numeric: eigenvalue iteration does not converge -- increase maxiter?');
+};
+
+// extension to real hermitian (symmetric) matrices
+numeric.eigh = function(A, maxiter)
+{
+ return numeric.jacobi(A, maxiter)
}
+numeric.jacobi = function(Ain, maxiter)
+{
+ // jacobi method with rutishauser improvements from
+ // Rutishauser, H. (1966). The Jacobi method for real symmetric matrices.
+ // Numerische Mathematik, 9(1), 1–10. doi:10.1007/BF02165223
+
+ // returns object containing
+ // E: {x : v} eigenvalues.
+ // lambda : {x: d} eigenstates.
+ // niter : number of iterations.
+ // iterations : list of convergence factors for each step of the iteration.
+ // nrot : number of rotations performed.
+
+ var size = [Ain.length, Ain[0].length];
+ if (size[0] != size[1])
+ {
+ throw 'jacobi : matrix must be square';
+ }
+ // remember use only symmetric real matrices.
+ var n = size[0];
+
+ var v = numeric.identity(n);
+ var A = numeric.clone(Ain);
+
+ var iters = numeric.rep([maxiter], 0);
+ var d = numeric.getDiag(A);
+ var bw = numeric.clone(d);
+
+ // zeros
+ var zw = numeric.rep([n], 0);
+
+ // iteration parameters
+ var iter = -1;
+ var niter = 0;
+ var nrot = 0;
+ var tresh = 0;
+
+ // prealloc
+ var h, g, gapq, term, termp, termq, theta, t, c, s, tau;
+ while (iter < maxiter)
+ {
+ iter++;
+ iters[iter] = numeric.jacobinorm(A)
+ niter = iter;
+ tresh = iters[iter]/(4 * n);
+
+ if (tresh==0) { return {E: {x: v}, lambda: {x: d}, iterations: iters, niter: niter, nrot: nrot}; }
+
+ for (var p = 0; p < n; p++)
+ {
+ for (var q = p + 1; q < n; q++)
+ {
+ gapq = 10*Math.abs(A[p][q]);
+ termp = gapq + Math.abs(d[p]);
+ termq = gapq + Math.abs(d[q]);
+ if (iter > 4 && termp == Math.abs(d[p]) && termq == Math.abs(d[q]))
+ {
+ // remove small elmts
+ A[p][q] = 0;
+ }
+ else
+ {
+ if (Math.abs(A[p][q]) >= tresh)
+ {
+ // apply rotation
+ h = d[q] - d[p];
+ term = Math.abs(h) + gapq;
+ if (term == Math.abs(h))
+ {
+ t = A[p][q]/h;
+ }
+ else
+ {
+ theta = 0.5 * h / A[p][q];
+ t = 1/(Math.abs(theta) + Math.sqrt(1 + theta*theta));
+ if (theta < 0)
+ {
+ t = -t;
+ }
+ }
+ c = 1/Math.sqrt(1 + t*t);
+ s = t * c;
+ tau = s/(1 + c);
+ h = t * A[p][q];
+ zw[p] = zw[p] - h;
+ zw[q] = zw[q] + h;
+ d[p] = d[p] - h;
+ d[q] = d[q] + h;
+ A[p][q] = 0;
+ // rotate and use upper tria only
+ for (var j = 0; j < p; j++)
+ {
+ g = A[j][p];
+ h = A[j][q];
+ A[j][p] = g - s * (h + g * tau);
+ A[j][q] = h + s * (g - h * tau);
+ }
+ for (var j = p + 1; j < q; j++)
+ {
+ g = A[p][j];
+ h = A[j][q];
+ A[p][j] = g - s * (h + g * tau);
+ A[j][q] = h + s * (g - h * tau);
+ }
+ for (var j = q + 1; j < n; j++)
+ {
+ g = A[p][j];
+ h = A[q][j];
+ A[p][j] = g - s * (h + g * tau);
+ A[q][j] = h + s * (g - h * tau);
+ }
+ // eigenstates
+ for (var j = 0; j < n; j++)
+ {
+ g = v[j][p];
+ h = v[j][q];
+ v[j][p] = g - s * (h + g * tau);
+ v[j][q] = h + s * (g - h * tau);
+ }
+ nrot++;
+ }
+ }
+ }
+ }
+ bw = numeric.add(bw, zw);
+ d = numeric.clone(bw);
+ zw = numeric.rep([n], 0);
+ }
+
+ return {E: {x: v}, lambda: {x: d}, iterations: iters, niter: niter, nrot: nrot};
+}
+
+numeric.jacobinorm = function(A)
+{
+ // used in numeric.jacobi
+ var n = A.length;
+ var s = 0;
+ for (var i = 0; i < n; i ++)
+ {
+ for (var j = i + 1; j < n; j ++)
+ {
+ s = s + Math.pow(A[i][j], 2)
+ }
+ }
+ return Math.sqrt(s);
+}
+
+// eig function
numeric.eig = function eig(A,maxiter) {
var QH = numeric.toUpperHessenberg(A);
var QB = numeric.QRFrancis(QH.H,maxiter);
@@ -1589,7 +1891,8 @@ numeric.ccsSparse = function ccsSparse(A) {
}
}
return [Ai,Aj,Av];
-}
+};
+
numeric.ccsFull = function ccsFull(A) {
var Ai = A[0], Aj = A[1], Av = A[2], s = numeric.ccsDim(A), m = s[0], n = s[1], i,j,j0,j1,k;
var B = numeric.rep([m,n],0);
@@ -1599,7 +1902,20 @@ numeric.ccsFull = function ccsFull(A) {
for(j=j0;jn) k.pop();
return ret;
-}
+};
// 6. Coordinate matrices
numeric.cLU = function LU(A) {
@@ -2338,7 +2686,7 @@ numeric.cgrid = function grid(n,shape) {
if(typeof shape !== "function") {
switch(shape) {
case 'L':
- shape = function(i,j) { return (i>=n[0]/2 || j=n[0]/2 || j=0;i--) { dx[i] = x[i+1]-x[i]; dy[i] = sub(y[i+1],y[i]); }
- if(typeof k1 === "string" || typeof kn === "string") {
+ if(typeof k1 === "string" || typeof kn === "string") {
k1 = kn = "periodic";
}
// Build sparse tridiagonal system
@@ -2600,7 +2953,7 @@ numeric.spline = function spline(x,y,k1,kn) {
if(typeof y[0] === "number") k = k[0];
else k = numeric.transpose(k);
return new numeric.Spline(x,y,y,k,k);
-}
+};
// 8. FFT
numeric.fftpow2 = function fftpow2(x,y) {
@@ -2630,7 +2983,8 @@ numeric.fftpow2 = function fftpow2(x,y) {
x[i] = xe[j] + ci*xo[j] - si*yo[j];
y[i] = ye[j] + ci*yo[j] + si*xo[j];
}
-}
+};
+
numeric._ifftpow2 = function _ifftpow2(x,y) {
var n = x.length;
if(n === 1) return;
@@ -2658,12 +3012,14 @@ numeric._ifftpow2 = function _ifftpow2(x,y) {
x[i] = xe[j] + ci*xo[j] - si*yo[j];
y[i] = ye[j] + ci*yo[j] + si*xo[j];
}
-}
+};
+
numeric.ifftpow2 = function ifftpow2(x,y) {
numeric._ifftpow2(x,y);
numeric.diveq(x,x.length);
numeric.diveq(y,y.length);
-}
+};
+
numeric.convpow2 = function convpow2(ax,ay,bx,by) {
numeric.fftpow2(ax,ay);
numeric.fftpow2(bx,by);
@@ -2674,13 +3030,14 @@ numeric.convpow2 = function convpow2(ax,ay,bx,by) {
ay[i] = axi*byi+ayi*bxi;
}
numeric.ifftpow2(ax,ay);
-}
+};
+
numeric.T.prototype.fft = function fft() {
var x = this.x, y = this.y;
var n = x.length, log = Math.log, log2 = log(2),
p = Math.ceil(log(2*n-1)/log2), m = Math.pow(2,p);
var cx = numeric.rep([m],0), cy = numeric.rep([m],0), cos = Math.cos, sin = Math.sin;
- var k, c = (-3.141592653589793238462643383279502884197169399375105820/n),t;
+ var k, c = (-numeric.pi/n),t;
var a = numeric.rep([m],0), b = numeric.rep([m],0),nhalf = Math.floor(n/2);
for(k=0;k b)
- return a*Math.sqrt(1.0+(b*b/a/a))
- else if (b == 0.0)
- return a
- return b*Math.sqrt(1.0+(a*a/b/b))
- }
-
- //Householder's reduction to bidiagonal form
-
- var f= 0.0;
- var g= 0.0;
- var h= 0.0;
- var x= 0.0;
- var y= 0.0;
- var z= 0.0;
- var s= 0.0;
-
- for (i=0; i < n; i++)
- {
- e[i]= g;
- s= 0.0;
- l= i+1;
- for (j=i; j < m; j++)
- s += (u[j][i]*u[j][i]);
- if (s <= tolerance)
- g= 0.0;
- else
- {
- f= u[i][i];
- g= Math.sqrt(s);
- if (f >= 0.0) g= -g;
- h= f*g-s
- u[i][i]=f-g;
- for (j=l; j < n; j++)
- {
- s= 0.0
- for (k=i; k < m; k++)
- s += u[k][i]*u[k][j]
- f= s/h
- for (k=i; k < m; k++)
- u[k][j]+=f*u[k][i]
- }
- }
- q[i]= g
- s= 0.0
- for (j=l; j < n; j++)
- s= s + u[i][j]*u[i][j]
- if (s <= tolerance)
- g= 0.0
- else
- {
- f= u[i][i+1]
- g= Math.sqrt(s)
- if (f >= 0.0) g= -g
- h= f*g - s
- u[i][i+1] = f-g;
- for (j=l; j < n; j++) e[j]= u[i][j]/h
- for (j=l; j < m; j++)
- {
- s=0.0
- for (k=l; k < n; k++)
- s += (u[j][k]*u[i][k])
- for (k=l; k < n; k++)
- u[j][k]+=s*e[k]
- }
- }
- y= Math.abs(q[i])+Math.abs(e[i])
- if (y>x)
- x=y
- }
-
- // accumulation of right hand gtransformations
- for (i=n-1; i != -1; i+= -1)
- {
- if (g != 0.0)
- {
- h= g*u[i][i+1]
- for (j=l; j < n; j++)
- v[j][i]=u[i][j]/h
- for (j=l; j < n; j++)
- {
- s=0.0
- for (k=l; k < n; k++)
- s += u[i][k]*v[k][j]
- for (k=l; k < n; k++)
- v[k][j]+=(s*v[k][i])
- }
- }
- for (j=l; j < n; j++)
- {
- v[i][j] = 0;
- v[j][i] = 0;
- }
- v[i][i] = 1;
- g= e[i]
- l= i
- }
-
- // accumulation of left hand transformations
- for (i=n-1; i != -1; i+= -1)
- {
- l= i+1
- g= q[i]
- for (j=l; j < n; j++)
- u[i][j] = 0;
- if (g != 0.0)
- {
- h= u[i][i]*g
- for (j=l; j < n; j++)
- {
- s=0.0
- for (k=l; k < m; k++) s += u[k][i]*u[k][j];
- f= s/h
- for (k=i; k < m; k++) u[k][j]+=f*u[k][i];
- }
- for (j=i; j < m; j++) u[j][i] = u[j][i]/g;
- }
- else
- for (j=i; j < m; j++) u[j][i] = 0;
- u[i][i] += 1;
- }
-
- // diagonalization of the bidiagonal form
- prec= prec*x
- for (k=n-1; k != -1; k+= -1)
- {
- for (var iteration=0; iteration < itmax; iteration++)
- { // test f splitting
- var test_convergence = false
- for (l=k; l != -1; l+= -1)
- {
- if (Math.abs(e[l]) <= prec)
- { test_convergence= true
- break
- }
- if (Math.abs(q[l-1]) <= prec)
- break
- }
- if (!test_convergence)
- { // cancellation of e[l] if l>0
- c= 0.0
- s= 1.0
- var l1= l-1
- for (i =l; i= itmax-1)
- throw 'Error: no convergence.'
- // shift from bottom 2x2 minor
- x= q[l]
- y= q[k-1]
- g= e[k-1]
- h= e[k]
- f= ((y-z)*(y+z)+(g-h)*(g+h))/(2.0*h*y)
- g= pythag(f,1.0)
- if (f < 0.0)
- f= ((x-z)*(x+z)+h*(y/(f-g)-h))/x
- else
- f= ((x-z)*(x+z)+h*(y/(f+g)-h))/x
- // next QR transformation
- c= 1.0
- s= 1.0
- for (i=l+1; i< k+1; i++)
- {
- g= e[i]
- y= q[i]
- h= s*g
- g= c*g
- z= pythag(f,h)
- e[i-1]= z
- c= f/z
- s= h/z
- f= x*c+g*s
- g= -x*s+g*c
- h= y*s
- y= y*c
- for (j=0; j < n; j++)
- {
- x= v[j][i-1]
- z= v[j][i]
- v[j][i-1] = x*c+z*s
- v[j][i] = -x*s+z*c
- }
- z= pythag(f,h)
- q[i-1]= z
- c= f/z
- s= h/z
- f= c*g+s*y
- x= -s*g+c*y
- for (j=0; j < m; j++)
- {
- y= u[j][i-1]
- z= u[j][i]
- u[j][i-1] = y*c+z*s
- u[j][i] = -y*s+z*c
- }
- }
- e[l]= 0.0
- e[k]= f
- q[k]= x
- }
- }
-
- //vt= transpose(v)
- //return (u,q,vt)
- for (i=0;i= 0; j--)
- {
- if (q[j] < q[i])
- {
- // writeln(i,'-',j)
- c = q[j]
- q[j] = q[i]
- q[i] = c
- for(k=0;k b)
+ return a*Math.sqrt(1.0+(b*b/a/a));
+ else if (b == 0.0)
+ return a;
+ return b*Math.sqrt(1.0+(a*a/b/b));
+ }
+
+ //Householder's reduction to bidiagonal form
+
+ var f= 0.0;
+ var g= 0.0;
+ var h= 0.0;
+ var x= 0.0;
+ var y= 0.0;
+ var z= 0.0;
+ var s= 0.0;
+
+ for (i=0; i < n; i++)
+ {
+ e[i]= g;
+ s= 0.0;
+ l= i+1;
+ for (j=i; j < m; j++)
+ s += (u[j][i]*u[j][i]);
+ if (s <= tolerance)
+ g= 0.0;
+ else
+ {
+ f= u[i][i];
+ g= Math.sqrt(s);
+ if (f >= 0.0) g= -g;
+ h= f*g-s;
+ u[i][i]=f-g;
+ for (j=l; j < n; j++)
+ {
+ s= 0.0;
+ for (k=i; k < m; k++)
+ s += u[k][i]*u[k][j];
+ f= s/h;
+ for (k=i; k < m; k++)
+ u[k][j]+=f*u[k][i];
+ }
+ }
+ q[i]= g;
+ s= 0.0;
+ for (j=l; j < n; j++)
+ s= s + u[i][j]*u[i][j];
+ if (s <= tolerance)
+ g= 0.0;
+ else
+ {
+ f= u[i][i+1];
+ g= Math.sqrt(s);
+ if (f >= 0.0) g= -g;
+ h= f*g - s;
+ u[i][i+1] = f-g;
+ for (j=l; j < n; j++) e[j]= u[i][j]/h;
+ for (j=l; j < m; j++)
+ {
+ s=0.0;
+ for (k=l; k < n; k++)
+ s += (u[j][k]*u[i][k]);
+ for (k=l; k < n; k++)
+ u[j][k]+=s*e[k];
+ }
+ }
+ y= Math.abs(q[i])+Math.abs(e[i]);
+ if (y>x)
+ x=y;
+ }
+
+ // accumulation of right hand gtransformations
+ for (i=n-1; i != -1; i+= -1)
+ {
+ if (g != 0.0)
+ {
+ h= g*u[i][i+1];
+ for (j=l; j < n; j++)
+ v[j][i]=u[i][j]/h;
+ for (j=l; j < n; j++)
+ {
+ s=0.0;
+ for (k=l; k < n; k++)
+ s += u[i][k]*v[k][j];
+ for (k=l; k < n; k++)
+ v[k][j]+=(s*v[k][i]);
+ }
+ }
+ for (j=l; j < n; j++)
+ {
+ v[i][j] = 0;
+ v[j][i] = 0;
+ }
+ v[i][i] = 1;
+ g= e[i];
+ l= i;
+ }
+
+ // accumulation of left hand transformations
+ for (i=n-1; i != -1; i+= -1)
+ {
+ l= i+1;
+ g= q[i];
+ for (j=l; j < n; j++)
+ u[i][j] = 0;
+ if (g != 0.0)
+ {
+ h= u[i][i]*g;
+ for (j=l; j < n; j++)
+ {
+ s=0.0;
+ for (k=l; k < m; k++) s += u[k][i]*u[k][j];
+ f= s/h;
+ for (k=i; k < m; k++) u[k][j]+=f*u[k][i];
+ }
+ for (j=i; j < m; j++) u[j][i] = u[j][i]/g;
+ }
+ else
+ for (j=i; j < m; j++) u[j][i] = 0;
+ u[i][i] += 1;
+ }
+
+ // diagonalization of the bidiagonal form
+ prec= prec*x;
+ for (k=n-1; k != -1; k+= -1)
+ {
+ for (var iteration=0; iteration < itmax; iteration++)
+ { // test f splitting
+ var test_convergence = false;
+ for (l=k; l != -1; l+= -1)
+ {
+ if (Math.abs(e[l]) <= prec)
+ { test_convergence= true;
+ break;
+ }
+ if (Math.abs(q[l-1]) <= prec)
+ break;
+ }
+ if (!test_convergence)
+ { // cancellation of e[l] if l>0
+ c= 0.0;
+ s= 1.0;
+ var l1= l-1;
+ for (i =l; i= itmax-1)
+ throw 'Error: no convergence.';
+ // shift from bottom 2x2 minor
+ x= q[l];
+ y= q[k-1];
+ g= e[k-1];
+ h= e[k];
+ f= ((y-z)*(y+z)+(g-h)*(g+h))/(2.0*h*y);
+ g= pythag(f,1.0);
+ if (f < 0.0)
+ f= ((x-z)*(x+z)+h*(y/(f-g)-h))/x;
+ else
+ f= ((x-z)*(x+z)+h*(y/(f+g)-h))/x;
+ // next QR transformation
+ c= 1.0;
+ s= 1.0;
+ for (i=l+1; i< k+1; i++)
+ {
+ g= e[i];
+ y= q[i];
+ h= s*g;
+ g= c*g;
+ z= pythag(f,h);
+ e[i-1]= z;
+ c= f/z;
+ s= h/z;
+ f= x*c+g*s;
+ g= -x*s+g*c;
+ h= y*s;
+ y= y*c;
+ for (j=0; j < n; j++)
+ {
+ x= v[j][i-1];
+ z= v[j][i];
+ v[j][i-1] = x*c+z*s;
+ v[j][i] = -x*s+z*c;
+ }
+ z= pythag(f,h);
+ q[i-1]= z;
+ c= f/z;
+ s= h/z;
+ f= c*g+s*y;
+ x= -s*g+c*y;
+ for (j=0; j < m; j++)
+ {
+ y= u[j][i-1];
+ z= u[j][i];
+ u[j][i-1] = y*c+z*s;
+ u[j][i] = -y*s+z*c;
+ }
+ }
+ e[l]= 0.0;
+ e[k]= f;
+ q[k]= x;
+ }
+ }
+
+ //vt= transpose(v)
+ //return (u,q,vt)
+ for (i=0;i= 0; j--)
+ {
+ if (q[j] < q[i])
+ {
+ // writeln(i,'-',j)
+ c = q[j];
+ q[j] = q[i];
+ q[i] = c;
+ for(k=0;klowerLimit to upperLimit
+ * for a root (i.e., zero) of the function func with respect to
+ * its first argument using Brent's method root-finding algorithm.
+ *
+ * @param {function} function for which the root is sought.
+ * @param {number} the lower point of the interval to be searched.
+ * @param {number} the upper point of the interval to be searched.
+ * @param {number} the desired accuracy (convergence tolerance).
+ * @param {number} the maximum number of iterations.
+ * @returns an estimate for the root within accuracy.
+ */
+// Translated from zeroin.c in http://www.netlib.org/c/brent.shar.
+numeric.uniroot = function uniroot(func, lowerLimit, upperLimit, errorTol, maxIter) {
+ var a = lowerLimit
+ , b = upperLimit
+ , c = a
+ , fa = func(a)
+ , fb = func(b)
+ , fc = fa
+ , s = 0
+ , fs = 0
+ , tol_act // Actual tolerance
+ , new_step // Step at this iteration
+ , prev_step // Distance from the last but one to the last approximation
+ , p // Interpolation step is calculated in the form p/q; division is delayed until the last moment
+ , q
+ ;
+
+ errorTol = errorTol || 0;
+ maxIter = maxIter || 1000;
+
+ while ( maxIter-- > 0 ) {
+
+ prev_step = b - a;
+
+ if ( Math.abs(fc) < Math.abs(fb) ) {
+ // Swap data for b to be the best approximation
+ a = b, b = c, c = a;
+ fa = fb, fb = fc, fc = fa;
+ }
+
+ tol_act = 1e-15 * Math.abs(b) + errorTol / 2;
+ new_step = ( c - b ) / 2;
+
+ if ( Math.abs(new_step) <= tol_act || fb === 0 ) {
+ return b; // Acceptable approx. is found
+ }
+
+ // Decide if the interpolation can be tried
+ if ( Math.abs(prev_step) >= tol_act && Math.abs(fa) > Math.abs(fb) ) {
+ // If prev_step was large enough and was in true direction, Interpolatiom may be tried
+ var t1, cb, t2;
+ cb = c - b;
+ if ( a === c ) { // If we have only two distinct points linear interpolation can only be applied
+ t1 = fb / fa;
+ p = cb * t1;
+ q = 1.0 - t1;
+ }
+ else { // Quadric inverse interpolation
+ q = fa / fc, t1 = fb / fc, t2 = fb / fa;
+ p = t2 * (cb * q * (q - t1) - (b - a) * (t1 - 1));
+ q = (q - 1) * (t1 - 1) * (t2 - 1);
+ }
+
+ if ( p > 0 ) {
+ q = -q; // p was calculated with the opposite sign; make p positive
+ }
+ else {
+ p = -p; // and assign possible minus to q
+ }
+
+ if ( p < ( 0.75 * cb * q - Math.abs( tol_act * q ) / 2 ) &&
+ p < Math.abs( prev_step * q / 2 ) ) {
+ // If (b + p / q) falls in [b,c] and isn't too large it is accepted
+ new_step = p / q;
+ }
+
+ // If p/q is too large then the bissection procedure can reduce [b,c] range to more extent
+ }
+
+ if ( Math.abs( new_step ) < tol_act ) { // Adjust the step to be not less than tolerance
+ new_step = ( new_step > 0 ) ? tol_act : -tol_act;
+ }
+
+ a = b, fa = fb; // Save the previous approx.
+ b += new_step, fb = func(b); // Do step to a new approxim.
+
+ if ( (fb > 0 && fc > 0) || (fb < 0 && fc < 0) ) {
+ c = a, fc = fa; // Adjust c for it to have a sign opposite to that of b
+ }
+ }
+
+};
+
+
+/*
+var test_counter;
+function f1 (x) { test_counter++; return (Math.pow(x,2)-1)*x - 5; }
+function f2 (x) { test_counter++; return Math.cos(x)-x; }
+function f3 (x) { test_counter++; return Math.sin(x)-x; }
+function f4 (x) { test_counter++; return (x + 3) * Math.pow(x - 1, 2); }
+[
+ [f1, 2, 3],
+ [f2, 2, 3],
+ [f2, -1, 3],
+ [f3, -1, 3],
+ [f4, -4, 4/3]
+].forEach(function (args) {
+ test_counter = 0;
+ var root = uniroot.apply( pv, args );
+ ;;;console.log( 'uniroot:', args.slice(1), root, test_counter );
+})
+*/
diff --git a/tools/Crypto-JS v2.4.0/aes/aes-min.js b/tools/Crypto-JS v2.4.0/aes/aes-min.js
index b96adf4..7109d37 100755
--- a/tools/Crypto-JS v2.4.0/aes/aes-min.js
+++ b/tools/Crypto-JS v2.4.0/aes/aes-min.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
(function(){function q(d,e){for(var b=0,a=0;a<8;a++){if(e&1)b^=d;var h=d&128;d=d<<1&255;if(h)d^=27;e>>>=1}return b}for(var o=Crypto,x=o.util,z=o.charenc.UTF8,k=[99,124,119,123,242,107,111,197,48,1,103,43,254,215,171,118,202,130,201,125,250,89,71,240,173,212,162,175,156,164,114,192,183,253,147,38,54,63,247,204,52,165,229,241,113,216,49,21,4,199,35,195,24,150,5,154,7,18,128,226,235,39,178,117,9,131,44,26,27,110,90,160,82,59,214,179,41,227,47,132,83,209,0,237,32,252,177,91,106,203,190,57,74,76,88,207,
208,239,170,251,67,77,51,133,69,249,2,127,80,60,159,168,81,163,64,143,146,157,56,245,188,182,218,33,16,255,243,210,205,12,19,236,95,151,68,23,196,167,126,61,100,93,25,115,96,129,79,220,34,42,144,136,70,238,184,20,222,94,11,219,224,50,58,10,73,6,36,92,194,211,172,98,145,149,228,121,231,200,55,109,141,213,78,169,108,86,244,234,101,122,174,8,186,120,37,46,28,166,180,198,232,221,116,31,75,189,139,138,112,62,181,102,72,3,246,14,97,53,87,185,134,193,29,158,225,248,152,17,105,217,142,148,155,30,135,233,
206,85,40,223,140,161,137,13,191,230,66,104,65,153,45,15,176,84,187,22],y=[],f=0;f<256;f++)y[k[f]]=f;var r=[],s=[],t=[],u=[],v=[],w=[];for(f=0;f<256;f++){r[f]=q(f,2);s[f]=q(f,3);t[f]=q(f,9);u[f]=q(f,11);v[f]=q(f,13);w[f]=q(f,14)}var A=[0,1,2,4,8,16,32,64,128,27,54],c=[[],[],[],[]],i,p,g,j=o.AES={encrypt:function(d,e,b){b=b||{};var a=b.mode||new o.mode.OFB;a.fixOptions&&a.fixOptions(b);d=d.constructor==String?z.stringToBytes(d):d;var h=b.iv||x.randomBytes(j._blocksize*4);e=e.constructor==String?o.PBKDF2(e,
diff --git a/tools/Crypto-JS v2.4.0/aes/aes.js b/tools/Crypto-JS v2.4.0/aes/aes.js
index bca0e13..d565a14 100755
--- a/tools/Crypto-JS v2.4.0/aes/aes.js
+++ b/tools/Crypto-JS v2.4.0/aes/aes.js
@@ -1,407 +1,407 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
-(function(){
-
-// Shortcuts
-var C = Crypto,
- util = C.util,
- charenc = C.charenc,
- UTF8 = charenc.UTF8;
-
-// Precomputed SBOX
-var SBOX = [ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
- 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
- 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
- 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
- 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
- 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
- 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
- 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
- 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
- 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
- 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
- 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
- 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
- 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
- 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
- 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
- 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
- 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
- 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
- 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
- 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
- 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
- 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
- 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
- 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
- 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
- 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
- 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
- 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
- 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
- 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
- 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 ];
-
-// Compute inverse SBOX lookup table
-for (var INVSBOX = [], i = 0; i < 256; i++) INVSBOX[SBOX[i]] = i;
-
-// Compute mulitplication in GF(2^8) lookup tables
-var MULT2 = [],
- MULT3 = [],
- MULT9 = [],
- MULTB = [],
- MULTD = [],
- MULTE = [];
-
-function xtime(a, b) {
- for (var result = 0, i = 0; i < 8; i++) {
- if (b & 1) result ^= a;
- var hiBitSet = a & 0x80;
- a = (a << 1) & 0xFF;
- if (hiBitSet) a ^= 0x1b;
- b >>>= 1;
- }
- return result;
-}
-
-for (var i = 0; i < 256; i++) {
- MULT2[i] = xtime(i,2);
- MULT3[i] = xtime(i,3);
- MULT9[i] = xtime(i,9);
- MULTB[i] = xtime(i,0xB);
- MULTD[i] = xtime(i,0xD);
- MULTE[i] = xtime(i,0xE);
-}
-
-// Precomputed RCon lookup
-var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
-
-// Inner state
-var state = [[], [], [], []],
- keylength,
- nrounds,
- keyschedule;
-
-var AES = C.AES = {
-
- /**
- * Public API
- */
-
- encrypt: function (message, password, options) {
-
- options = options || {};
-
- // Determine mode
- var mode = options.mode || new C.mode.OFB;
-
- // Allow mode to override options
- if (mode.fixOptions) mode.fixOptions(options);
-
- var
-
- // Convert to bytes if message is a string
- m = (
- message.constructor == String ?
- UTF8.stringToBytes(message) :
- message
- ),
-
- // Generate random IV
- iv = options.iv || util.randomBytes(AES._blocksize * 4),
-
- // Generate key
- k = (
- password.constructor == String ?
- // Derive key from passphrase
- C.PBKDF2(password, iv, 32, { asBytes: true }) :
- // else, assume byte array representing cryptographic key
- password
- );
-
- // Encrypt
- AES._init(k);
- mode.encrypt(AES, m, iv);
-
- // Return ciphertext
- m = options.iv ? m : iv.concat(m);
- return (options && options.asBytes) ? m : util.bytesToBase64(m);
-
- },
-
- decrypt: function (ciphertext, password, options) {
-
- options = options || {};
-
- // Determine mode
- var mode = options.mode || new C.mode.OFB;
-
- // Allow mode to override options
- if (mode.fixOptions) mode.fixOptions(options);
-
- var
-
- // Convert to bytes if ciphertext is a string
- c = (
- ciphertext.constructor == String ?
- util.base64ToBytes(ciphertext):
- ciphertext
- ),
-
- // Separate IV and message
- iv = options.iv || c.splice(0, AES._blocksize * 4),
-
- // Generate key
- k = (
- password.constructor == String ?
- // Derive key from passphrase
- C.PBKDF2(password, iv, 32, { asBytes: true }) :
- // else, assume byte array representing cryptographic key
- password
- );
-
- // Decrypt
- AES._init(k);
- mode.decrypt(AES, c, iv);
-
- // Return plaintext
- return (options && options.asBytes) ? c : UTF8.bytesToString(c);
-
- },
-
-
- /**
- * Package private methods and properties
- */
-
- _blocksize: 4,
-
- _encryptblock: function (m, offset) {
-
- // Set input
- for (var row = 0; row < AES._blocksize; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] = m[offset + col * 4 + row];
- }
-
- // Add round key
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] ^= keyschedule[col][row];
- }
-
- for (var round = 1; round < nrounds; round++) {
-
- // Sub bytes
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] = SBOX[state[row][col]];
- }
-
- // Shift rows
- state[1].push(state[1].shift());
- state[2].push(state[2].shift());
- state[2].push(state[2].shift());
- state[3].unshift(state[3].pop());
-
- // Mix columns
- for (var col = 0; col < 4; col++) {
-
- var s0 = state[0][col],
- s1 = state[1][col],
- s2 = state[2][col],
- s3 = state[3][col];
-
- state[0][col] = MULT2[s0] ^ MULT3[s1] ^ s2 ^ s3;
- state[1][col] = s0 ^ MULT2[s1] ^ MULT3[s2] ^ s3;
- state[2][col] = s0 ^ s1 ^ MULT2[s2] ^ MULT3[s3];
- state[3][col] = MULT3[s0] ^ s1 ^ s2 ^ MULT2[s3];
-
- }
-
- // Add round key
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] ^= keyschedule[round * 4 + col][row];
- }
-
- }
-
- // Sub bytes
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] = SBOX[state[row][col]];
- }
-
- // Shift rows
- state[1].push(state[1].shift());
- state[2].push(state[2].shift());
- state[2].push(state[2].shift());
- state[3].unshift(state[3].pop());
-
- // Add round key
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] ^= keyschedule[nrounds * 4 + col][row];
- }
-
- // Set output
- for (var row = 0; row < AES._blocksize; row++) {
- for (var col = 0; col < 4; col++)
- m[offset + col * 4 + row] = state[row][col];
- }
-
- },
-
- _decryptblock: function (c, offset) {
-
- // Set input
- for (var row = 0; row < AES._blocksize; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] = c[offset + col * 4 + row];
- }
-
- // Add round key
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] ^= keyschedule[nrounds * 4 + col][row];
- }
-
- for (var round = 1; round < nrounds; round++) {
-
- // Inv shift rows
- state[1].unshift(state[1].pop());
- state[2].push(state[2].shift());
- state[2].push(state[2].shift());
- state[3].push(state[3].shift());
-
- // Inv sub bytes
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] = INVSBOX[state[row][col]];
- }
-
- // Add round key
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] ^= keyschedule[(nrounds - round) * 4 + col][row];
- }
-
- // Inv mix columns
- for (var col = 0; col < 4; col++) {
-
- var s0 = state[0][col],
- s1 = state[1][col],
- s2 = state[2][col],
- s3 = state[3][col];
-
- state[0][col] = MULTE[s0] ^ MULTB[s1] ^ MULTD[s2] ^ MULT9[s3];
- state[1][col] = MULT9[s0] ^ MULTE[s1] ^ MULTB[s2] ^ MULTD[s3];
- state[2][col] = MULTD[s0] ^ MULT9[s1] ^ MULTE[s2] ^ MULTB[s3];
- state[3][col] = MULTB[s0] ^ MULTD[s1] ^ MULT9[s2] ^ MULTE[s3];
-
- }
-
- }
-
- // Inv shift rows
- state[1].unshift(state[1].pop());
- state[2].push(state[2].shift());
- state[2].push(state[2].shift());
- state[3].push(state[3].shift());
-
- // Inv sub bytes
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] = INVSBOX[state[row][col]];
- }
-
- // Add round key
- for (var row = 0; row < 4; row++) {
- for (var col = 0; col < 4; col++)
- state[row][col] ^= keyschedule[col][row];
- }
-
- // Set output
- for (var row = 0; row < AES._blocksize; row++) {
- for (var col = 0; col < 4; col++)
- c[offset + col * 4 + row] = state[row][col];
- }
-
- },
-
-
- /**
- * Private methods
- */
-
- _init: function (k) {
- keylength = k.length / 4;
- nrounds = keylength + 6;
- AES._keyexpansion(k);
- },
-
- // Generate a key schedule
- _keyexpansion: function (k) {
-
- keyschedule = [];
-
- for (var row = 0; row < keylength; row++) {
- keyschedule[row] = [
- k[row * 4],
- k[row * 4 + 1],
- k[row * 4 + 2],
- k[row * 4 + 3]
- ];
- }
-
- for (var row = keylength; row < AES._blocksize * (nrounds + 1); row++) {
-
- var temp = [
- keyschedule[row - 1][0],
- keyschedule[row - 1][1],
- keyschedule[row - 1][2],
- keyschedule[row - 1][3]
- ];
-
- if (row % keylength == 0) {
-
- // Rot word
- temp.push(temp.shift());
-
- // Sub word
- temp[0] = SBOX[temp[0]];
- temp[1] = SBOX[temp[1]];
- temp[2] = SBOX[temp[2]];
- temp[3] = SBOX[temp[3]];
-
- temp[0] ^= RCON[row / keylength];
-
- } else if (keylength > 6 && row % keylength == 4) {
-
- // Sub word
- temp[0] = SBOX[temp[0]];
- temp[1] = SBOX[temp[1]];
- temp[2] = SBOX[temp[2]];
- temp[3] = SBOX[temp[3]];
-
- }
-
- keyschedule[row] = [
- keyschedule[row - keylength][0] ^ temp[0],
- keyschedule[row - keylength][1] ^ temp[1],
- keyschedule[row - keylength][2] ^ temp[2],
- keyschedule[row - keylength][3] ^ temp[3]
- ];
-
- }
-
- }
-
-};
-
-})();
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
+(function(){
+
+// Shortcuts
+var C = Crypto,
+ util = C.util,
+ charenc = C.charenc,
+ UTF8 = charenc.UTF8;
+
+// Precomputed SBOX
+var SBOX = [ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
+ 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+ 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+ 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+ 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
+ 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+ 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
+ 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+ 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+ 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+ 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
+ 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+ 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
+ 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+ 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+ 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+ 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
+ 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+ 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
+ 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+ 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+ 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+ 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
+ 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+ 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
+ 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+ 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+ 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+ 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
+ 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+ 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
+ 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 ];
+
+// Compute inverse SBOX lookup table
+for (var INVSBOX = [], i = 0; i < 256; i++) INVSBOX[SBOX[i]] = i;
+
+// Compute mulitplication in GF(2^8) lookup tables
+var MULT2 = [],
+ MULT3 = [],
+ MULT9 = [],
+ MULTB = [],
+ MULTD = [],
+ MULTE = [];
+
+function xtime(a, b) {
+ for (var result = 0, i = 0; i < 8; i++) {
+ if (b & 1) result ^= a;
+ var hiBitSet = a & 0x80;
+ a = (a << 1) & 0xFF;
+ if (hiBitSet) a ^= 0x1b;
+ b >>>= 1;
+ }
+ return result;
+}
+
+for (var i = 0; i < 256; i++) {
+ MULT2[i] = xtime(i,2);
+ MULT3[i] = xtime(i,3);
+ MULT9[i] = xtime(i,9);
+ MULTB[i] = xtime(i,0xB);
+ MULTD[i] = xtime(i,0xD);
+ MULTE[i] = xtime(i,0xE);
+}
+
+// Precomputed RCon lookup
+var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+// Inner state
+var state = [[], [], [], []],
+ keylength,
+ nrounds,
+ keyschedule;
+
+var AES = C.AES = {
+
+ /**
+ * Public API
+ */
+
+ encrypt: function (message, password, options) {
+
+ options = options || {};
+
+ // Determine mode
+ var mode = options.mode || new C.mode.OFB;
+
+ // Allow mode to override options
+ if (mode.fixOptions) mode.fixOptions(options);
+
+ var
+
+ // Convert to bytes if message is a string
+ m = (
+ message.constructor == String ?
+ UTF8.stringToBytes(message) :
+ message
+ ),
+
+ // Generate random IV
+ iv = options.iv || util.randomBytes(AES._blocksize * 4),
+
+ // Generate key
+ k = (
+ password.constructor == String ?
+ // Derive key from passphrase
+ C.PBKDF2(password, iv, 32, { asBytes: true }) :
+ // else, assume byte array representing cryptographic key
+ password
+ );
+
+ // Encrypt
+ AES._init(k);
+ mode.encrypt(AES, m, iv);
+
+ // Return ciphertext
+ m = options.iv ? m : iv.concat(m);
+ return (options && options.asBytes) ? m : util.bytesToBase64(m);
+
+ },
+
+ decrypt: function (ciphertext, password, options) {
+
+ options = options || {};
+
+ // Determine mode
+ var mode = options.mode || new C.mode.OFB;
+
+ // Allow mode to override options
+ if (mode.fixOptions) mode.fixOptions(options);
+
+ var
+
+ // Convert to bytes if ciphertext is a string
+ c = (
+ ciphertext.constructor == String ?
+ util.base64ToBytes(ciphertext):
+ ciphertext
+ ),
+
+ // Separate IV and message
+ iv = options.iv || c.splice(0, AES._blocksize * 4),
+
+ // Generate key
+ k = (
+ password.constructor == String ?
+ // Derive key from passphrase
+ C.PBKDF2(password, iv, 32, { asBytes: true }) :
+ // else, assume byte array representing cryptographic key
+ password
+ );
+
+ // Decrypt
+ AES._init(k);
+ mode.decrypt(AES, c, iv);
+
+ // Return plaintext
+ return (options && options.asBytes) ? c : UTF8.bytesToString(c);
+
+ },
+
+
+ /**
+ * Package private methods and properties
+ */
+
+ _blocksize: 4,
+
+ _encryptblock: function (m, offset) {
+
+ // Set input
+ for (var row = 0; row < AES._blocksize; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] = m[offset + col * 4 + row];
+ }
+
+ // Add round key
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] ^= keyschedule[col][row];
+ }
+
+ for (var round = 1; round < nrounds; round++) {
+
+ // Sub bytes
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] = SBOX[state[row][col]];
+ }
+
+ // Shift rows
+ state[1].push(state[1].shift());
+ state[2].push(state[2].shift());
+ state[2].push(state[2].shift());
+ state[3].unshift(state[3].pop());
+
+ // Mix columns
+ for (var col = 0; col < 4; col++) {
+
+ var s0 = state[0][col],
+ s1 = state[1][col],
+ s2 = state[2][col],
+ s3 = state[3][col];
+
+ state[0][col] = MULT2[s0] ^ MULT3[s1] ^ s2 ^ s3;
+ state[1][col] = s0 ^ MULT2[s1] ^ MULT3[s2] ^ s3;
+ state[2][col] = s0 ^ s1 ^ MULT2[s2] ^ MULT3[s3];
+ state[3][col] = MULT3[s0] ^ s1 ^ s2 ^ MULT2[s3];
+
+ }
+
+ // Add round key
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] ^= keyschedule[round * 4 + col][row];
+ }
+
+ }
+
+ // Sub bytes
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] = SBOX[state[row][col]];
+ }
+
+ // Shift rows
+ state[1].push(state[1].shift());
+ state[2].push(state[2].shift());
+ state[2].push(state[2].shift());
+ state[3].unshift(state[3].pop());
+
+ // Add round key
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] ^= keyschedule[nrounds * 4 + col][row];
+ }
+
+ // Set output
+ for (var row = 0; row < AES._blocksize; row++) {
+ for (var col = 0; col < 4; col++)
+ m[offset + col * 4 + row] = state[row][col];
+ }
+
+ },
+
+ _decryptblock: function (c, offset) {
+
+ // Set input
+ for (var row = 0; row < AES._blocksize; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] = c[offset + col * 4 + row];
+ }
+
+ // Add round key
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] ^= keyschedule[nrounds * 4 + col][row];
+ }
+
+ for (var round = 1; round < nrounds; round++) {
+
+ // Inv shift rows
+ state[1].unshift(state[1].pop());
+ state[2].push(state[2].shift());
+ state[2].push(state[2].shift());
+ state[3].push(state[3].shift());
+
+ // Inv sub bytes
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] = INVSBOX[state[row][col]];
+ }
+
+ // Add round key
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] ^= keyschedule[(nrounds - round) * 4 + col][row];
+ }
+
+ // Inv mix columns
+ for (var col = 0; col < 4; col++) {
+
+ var s0 = state[0][col],
+ s1 = state[1][col],
+ s2 = state[2][col],
+ s3 = state[3][col];
+
+ state[0][col] = MULTE[s0] ^ MULTB[s1] ^ MULTD[s2] ^ MULT9[s3];
+ state[1][col] = MULT9[s0] ^ MULTE[s1] ^ MULTB[s2] ^ MULTD[s3];
+ state[2][col] = MULTD[s0] ^ MULT9[s1] ^ MULTE[s2] ^ MULTB[s3];
+ state[3][col] = MULTB[s0] ^ MULTD[s1] ^ MULT9[s2] ^ MULTE[s3];
+
+ }
+
+ }
+
+ // Inv shift rows
+ state[1].unshift(state[1].pop());
+ state[2].push(state[2].shift());
+ state[2].push(state[2].shift());
+ state[3].push(state[3].shift());
+
+ // Inv sub bytes
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] = INVSBOX[state[row][col]];
+ }
+
+ // Add round key
+ for (var row = 0; row < 4; row++) {
+ for (var col = 0; col < 4; col++)
+ state[row][col] ^= keyschedule[col][row];
+ }
+
+ // Set output
+ for (var row = 0; row < AES._blocksize; row++) {
+ for (var col = 0; col < 4; col++)
+ c[offset + col * 4 + row] = state[row][col];
+ }
+
+ },
+
+
+ /**
+ * Private methods
+ */
+
+ _init: function (k) {
+ keylength = k.length / 4;
+ nrounds = keylength + 6;
+ AES._keyexpansion(k);
+ },
+
+ // Generate a key schedule
+ _keyexpansion: function (k) {
+
+ keyschedule = [];
+
+ for (var row = 0; row < keylength; row++) {
+ keyschedule[row] = [
+ k[row * 4],
+ k[row * 4 + 1],
+ k[row * 4 + 2],
+ k[row * 4 + 3]
+ ];
+ }
+
+ for (var row = keylength; row < AES._blocksize * (nrounds + 1); row++) {
+
+ var temp = [
+ keyschedule[row - 1][0],
+ keyschedule[row - 1][1],
+ keyschedule[row - 1][2],
+ keyschedule[row - 1][3]
+ ];
+
+ if (row % keylength == 0) {
+
+ // Rot word
+ temp.push(temp.shift());
+
+ // Sub word
+ temp[0] = SBOX[temp[0]];
+ temp[1] = SBOX[temp[1]];
+ temp[2] = SBOX[temp[2]];
+ temp[3] = SBOX[temp[3]];
+
+ temp[0] ^= RCON[row / keylength];
+
+ } else if (keylength > 6 && row % keylength == 4) {
+
+ // Sub word
+ temp[0] = SBOX[temp[0]];
+ temp[1] = SBOX[temp[1]];
+ temp[2] = SBOX[temp[2]];
+ temp[3] = SBOX[temp[3]];
+
+ }
+
+ keyschedule[row] = [
+ keyschedule[row - keylength][0] ^ temp[0],
+ keyschedule[row - keylength][1] ^ temp[1],
+ keyschedule[row - keylength][2] ^ temp[2],
+ keyschedule[row - keylength][3] ^ temp[3]
+ ];
+
+ }
+
+ }
+
+};
+
+})();
diff --git a/tools/Crypto-JS v2.4.0/blockmodes/blockmodes-min.js b/tools/Crypto-JS v2.4.0/blockmodes/blockmodes-min.js
index 1866d2e..1150c20 100755
--- a/tools/Crypto-JS v2.4.0/blockmodes/blockmodes-min.js
+++ b/tools/Crypto-JS v2.4.0/blockmodes/blockmodes-min.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
(function(h){function l(c,a){var b=c._blocksize*4;return b-a.length%b}var j=h.pad={},g=function(c){for(var a=c.pop(),b=1;b0;d--)a.push(0)},unpad:function(){}};j.iso7816={pad:function(c,a){var b=l(c,a);for(a.push(128);b>1;b--)a.push(0)},unpad:function(c){for(;c.pop()!=128;);}};j.ansix923={pad:function(c,a){for(var b=l(c,a),d=1;d0; reqd--) {
- message.push(0x00);
- }
- }
- },
-
- unpad : function (message) {}
-};
-
-// ISO/IEC 7816-4 padding.
-//
-// Pads the plain text with an 0x80 byte followed by as many 0x00
-// bytes are required to complete the block.
-C_pad.iso7816 = {
- pad : function (cipher, message) {
- var reqd = _requiredPadding(cipher, message);
- message.push(0x80);
- for (; reqd > 1; reqd--) {
- message.push(0x00);
- }
- },
-
- unpad : function (message) {
- while (message.pop() != 0x80) {}
- }
-};
-
-// ANSI X.923 padding
-//
-// The final block is padded with zeros except for the last byte of the
-// last block which contains the number of padding bytes.
-C_pad.ansix923 = {
- pad : function (cipher, message) {
- var reqd = _requiredPadding(cipher, message);
- for (var i = 1; i < reqd; i++) {
- message.push(0x00);
- }
- message.push(reqd);
- },
-
- unpad : _unpadLength
-};
-
-// ISO 10126
-//
-// The final block is padded with random bytes except for the last
-// byte of the last block which contains the number of padding bytes.
-C_pad.iso10126 = {
- pad : function (cipher, message) {
- var reqd = _requiredPadding(cipher, message);
- for (var i = 1; i < reqd; i++) {
- message.push(Math.floor(Math.random() * 256));
- }
- message.push(reqd);
- },
-
- unpad : _unpadLength
-};
-
-// PKCS7 padding
-//
-// PKCS7 is described in RFC 5652. Padding is in whole bytes. The
-// value of each added byte is the number of bytes that are added,
-// i.e. N bytes, each of value N are added.
-C_pad.pkcs7 = {
- pad : function (cipher, message) {
- var reqd = _requiredPadding(cipher, message);
- for (var i = 0; i < reqd; i++) {
- message.push(reqd);
- }
- },
-
- unpad : _unpadLength
-};
-
-// Create mode namespace
-var C_mode = C.mode = {};
-
-/**
- * Mode base "class".
- */
-var Mode = C_mode.Mode = function (padding) {
- if (padding) {
- this._padding = padding;
- }
-};
-
-Mode.prototype = {
- encrypt: function (cipher, m, iv) {
- this._padding.pad(cipher, m);
- this._doEncrypt(cipher, m, iv);
- },
-
- decrypt: function (cipher, m, iv) {
- this._doDecrypt(cipher, m, iv);
- this._padding.unpad(m);
- },
-
- // Default padding
- _padding: C_pad.iso7816
-};
-
-
-/**
- * Electronic Code Book mode.
- *
- * ECB applies the cipher directly against each block of the input.
- *
- * ECB does not require an initialization vector.
- */
-var ECB = C_mode.ECB = function () {
- // Call parent constructor
- Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var ECB_prototype = ECB.prototype = new Mode;
-
-// Concrete steps for Mode template
-ECB_prototype._doEncrypt = function (cipher, m, iv) {
- var blockSizeInBytes = cipher._blocksize * 4;
- // Encrypt each block
- for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
- cipher._encryptblock(m, offset);
- }
-};
-ECB_prototype._doDecrypt = function (cipher, c, iv) {
- var blockSizeInBytes = cipher._blocksize * 4;
- // Decrypt each block
- for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
- cipher._decryptblock(c, offset);
- }
-};
-
-// ECB never uses an IV
-ECB_prototype.fixOptions = function (options) {
- options.iv = [];
-};
-
-
-/**
- * Cipher block chaining
- *
- * The first block is XORed with the IV. Subsequent blocks are XOR with the
- * previous cipher output.
- */
-var CBC = C_mode.CBC = function () {
- // Call parent constructor
- Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var CBC_prototype = CBC.prototype = new Mode;
-
-// Concrete steps for Mode template
-CBC_prototype._doEncrypt = function (cipher, m, iv) {
- var blockSizeInBytes = cipher._blocksize * 4;
-
- // Encrypt each block
- for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
- if (offset == 0) {
- // XOR first block using IV
- for (var i = 0; i < blockSizeInBytes; i++)
- m[i] ^= iv[i];
- } else {
- // XOR this block using previous crypted block
- for (var i = 0; i < blockSizeInBytes; i++)
- m[offset + i] ^= m[offset + i - blockSizeInBytes];
- }
- // Encrypt block
- cipher._encryptblock(m, offset);
- }
-};
-CBC_prototype._doDecrypt = function (cipher, c, iv) {
- var blockSizeInBytes = cipher._blocksize * 4;
-
- // At the start, the previously crypted block is the IV
- var prevCryptedBlock = iv;
-
- // Decrypt each block
- for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
- // Save this crypted block
- var thisCryptedBlock = c.slice(offset, offset + blockSizeInBytes);
- // Decrypt block
- cipher._decryptblock(c, offset);
- // XOR decrypted block using previous crypted block
- for (var i = 0; i < blockSizeInBytes; i++) {
- c[offset + i] ^= prevCryptedBlock[i];
- }
- prevCryptedBlock = thisCryptedBlock;
- }
-};
-
-
-/**
- * Cipher feed back
- *
- * The cipher output is XORed with the plain text to produce the cipher output,
- * which is then fed back into the cipher to produce a bit pattern to XOR the
- * next block with.
- *
- * This is a stream cipher mode and does not require padding.
- */
-var CFB = C_mode.CFB = function () {
- // Call parent constructor
- Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var CFB_prototype = CFB.prototype = new Mode;
-
-// Override padding
-CFB_prototype._padding = C_pad.NoPadding;
-
-// Concrete steps for Mode template
-CFB_prototype._doEncrypt = function (cipher, m, iv) {
- var blockSizeInBytes = cipher._blocksize * 4,
- keystream = iv.slice(0);
-
- // Encrypt each byte
- for (var i = 0; i < m.length; i++) {
-
- var j = i % blockSizeInBytes;
- if (j == 0) cipher._encryptblock(keystream, 0);
-
- m[i] ^= keystream[j];
- keystream[j] = m[i];
- }
-};
-CFB_prototype._doDecrypt = function (cipher, c, iv) {
- var blockSizeInBytes = cipher._blocksize * 4,
- keystream = iv.slice(0);
-
- // Encrypt each byte
- for (var i = 0; i < c.length; i++) {
-
- var j = i % blockSizeInBytes;
- if (j == 0) cipher._encryptblock(keystream, 0);
-
- var b = c[i];
- c[i] ^= keystream[j];
- keystream[j] = b;
- }
-};
-
-
-/**
- * Output feed back
- *
- * The cipher repeatedly encrypts its own output. The output is XORed with the
- * plain text to produce the cipher text.
- *
- * This is a stream cipher mode and does not require padding.
- */
-var OFB = C_mode.OFB = function () {
- // Call parent constructor
- Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var OFB_prototype = OFB.prototype = new Mode;
-
-// Override padding
-OFB_prototype._padding = C_pad.NoPadding;
-
-// Concrete steps for Mode template
-OFB_prototype._doEncrypt = function (cipher, m, iv) {
-
- var blockSizeInBytes = cipher._blocksize * 4,
- keystream = iv.slice(0);
-
- // Encrypt each byte
- for (var i = 0; i < m.length; i++) {
-
- // Generate keystream
- if (i % blockSizeInBytes == 0)
- cipher._encryptblock(keystream, 0);
-
- // Encrypt byte
- m[i] ^= keystream[i % blockSizeInBytes];
-
- }
-};
-OFB_prototype._doDecrypt = OFB_prototype._doEncrypt;
-
-/**
- * Counter
- * @author Gergely Risko
- *
- * After every block the last 4 bytes of the IV is increased by one
- * with carry and that IV is used for the next block.
- *
- * This is a stream cipher mode and does not require padding.
- */
-var CTR = C_mode.CTR = function () {
- // Call parent constructor
- Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var CTR_prototype = CTR.prototype = new Mode;
-
-// Override padding
-CTR_prototype._padding = C_pad.NoPadding;
-
-CTR_prototype._doEncrypt = function (cipher, m, iv) {
- var blockSizeInBytes = cipher._blocksize * 4;
-
- for (var i = 0; i < m.length;) {
- // do not lose iv
- var keystream = iv.slice(0);
-
- // Generate keystream for next block
- cipher._encryptblock(keystream, 0);
-
- // XOR keystream with block
- for (var j = 0; i < m.length && j < blockSizeInBytes; j++, i++) {
- m[i] ^= keystream[j];
- }
-
- // Increase IV
- if(++(iv[blockSizeInBytes-1]) == 256) {
- iv[blockSizeInBytes-1] = 0;
- if(++(iv[blockSizeInBytes-2]) == 256) {
- iv[blockSizeInBytes-2] = 0;
- if(++(iv[blockSizeInBytes-3]) == 256) {
- iv[blockSizeInBytes-3] = 0;
- ++(iv[blockSizeInBytes-4]);
- }
- }
- }
- }
-};
-CTR_prototype._doDecrypt = CTR_prototype._doEncrypt;
-
-})(Crypto);
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
+/*!
+ * Crypto-JS contribution from Simon Greatrix
+ */
+
+(function(C){
+
+// Create pad namespace
+var C_pad = C.pad = {};
+
+// Calculate the number of padding bytes required.
+function _requiredPadding(cipher, message) {
+ var blockSizeInBytes = cipher._blocksize * 4;
+ var reqd = blockSizeInBytes - message.length % blockSizeInBytes;
+ return reqd;
+};
+
+// Remove padding when the final byte gives the number of padding bytes.
+var _unpadLength = function (message) {
+ var pad = message.pop();
+ for (var i = 1; i < pad; i++) {
+ message.pop();
+ }
+ };
+
+// No-operation padding, used for stream ciphers
+C_pad.NoPadding = {
+ pad : function (cipher,message) {},
+ unpad : function (message) {}
+ };
+
+// Zero Padding.
+//
+// If the message is not an exact number of blocks, the final block is
+// completed with 0x00 bytes. There is no unpadding.
+C_pad.ZeroPadding = {
+ pad : function (cipher, message) {
+ var blockSizeInBytes = cipher._blocksize * 4;
+ var reqd = message.length % blockSizeInBytes;
+ if( reqd!=0 ) {
+ for(reqd = blockSizeInBytes - reqd; reqd>0; reqd--) {
+ message.push(0x00);
+ }
+ }
+ },
+
+ unpad : function (message) {}
+};
+
+// ISO/IEC 7816-4 padding.
+//
+// Pads the plain text with an 0x80 byte followed by as many 0x00
+// bytes are required to complete the block.
+C_pad.iso7816 = {
+ pad : function (cipher, message) {
+ var reqd = _requiredPadding(cipher, message);
+ message.push(0x80);
+ for (; reqd > 1; reqd--) {
+ message.push(0x00);
+ }
+ },
+
+ unpad : function (message) {
+ while (message.pop() != 0x80) {}
+ }
+};
+
+// ANSI X.923 padding
+//
+// The final block is padded with zeros except for the last byte of the
+// last block which contains the number of padding bytes.
+C_pad.ansix923 = {
+ pad : function (cipher, message) {
+ var reqd = _requiredPadding(cipher, message);
+ for (var i = 1; i < reqd; i++) {
+ message.push(0x00);
+ }
+ message.push(reqd);
+ },
+
+ unpad : _unpadLength
+};
+
+// ISO 10126
+//
+// The final block is padded with random bytes except for the last
+// byte of the last block which contains the number of padding bytes.
+C_pad.iso10126 = {
+ pad : function (cipher, message) {
+ var reqd = _requiredPadding(cipher, message);
+ for (var i = 1; i < reqd; i++) {
+ message.push(Math.floor(Math.random() * 256));
+ }
+ message.push(reqd);
+ },
+
+ unpad : _unpadLength
+};
+
+// PKCS7 padding
+//
+// PKCS7 is described in RFC 5652. Padding is in whole bytes. The
+// value of each added byte is the number of bytes that are added,
+// i.e. N bytes, each of value N are added.
+C_pad.pkcs7 = {
+ pad : function (cipher, message) {
+ var reqd = _requiredPadding(cipher, message);
+ for (var i = 0; i < reqd; i++) {
+ message.push(reqd);
+ }
+ },
+
+ unpad : _unpadLength
+};
+
+// Create mode namespace
+var C_mode = C.mode = {};
+
+/**
+ * Mode base "class".
+ */
+var Mode = C_mode.Mode = function (padding) {
+ if (padding) {
+ this._padding = padding;
+ }
+};
+
+Mode.prototype = {
+ encrypt: function (cipher, m, iv) {
+ this._padding.pad(cipher, m);
+ this._doEncrypt(cipher, m, iv);
+ },
+
+ decrypt: function (cipher, m, iv) {
+ this._doDecrypt(cipher, m, iv);
+ this._padding.unpad(m);
+ },
+
+ // Default padding
+ _padding: C_pad.iso7816
+};
+
+
+/**
+ * Electronic Code Book mode.
+ *
+ * ECB applies the cipher directly against each block of the input.
+ *
+ * ECB does not require an initialization vector.
+ */
+var ECB = C_mode.ECB = function () {
+ // Call parent constructor
+ Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var ECB_prototype = ECB.prototype = new Mode;
+
+// Concrete steps for Mode template
+ECB_prototype._doEncrypt = function (cipher, m, iv) {
+ var blockSizeInBytes = cipher._blocksize * 4;
+ // Encrypt each block
+ for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
+ cipher._encryptblock(m, offset);
+ }
+};
+ECB_prototype._doDecrypt = function (cipher, c, iv) {
+ var blockSizeInBytes = cipher._blocksize * 4;
+ // Decrypt each block
+ for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
+ cipher._decryptblock(c, offset);
+ }
+};
+
+// ECB never uses an IV
+ECB_prototype.fixOptions = function (options) {
+ options.iv = [];
+};
+
+
+/**
+ * Cipher block chaining
+ *
+ * The first block is XORed with the IV. Subsequent blocks are XOR with the
+ * previous cipher output.
+ */
+var CBC = C_mode.CBC = function () {
+ // Call parent constructor
+ Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var CBC_prototype = CBC.prototype = new Mode;
+
+// Concrete steps for Mode template
+CBC_prototype._doEncrypt = function (cipher, m, iv) {
+ var blockSizeInBytes = cipher._blocksize * 4;
+
+ // Encrypt each block
+ for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
+ if (offset == 0) {
+ // XOR first block using IV
+ for (var i = 0; i < blockSizeInBytes; i++)
+ m[i] ^= iv[i];
+ } else {
+ // XOR this block using previous crypted block
+ for (var i = 0; i < blockSizeInBytes; i++)
+ m[offset + i] ^= m[offset + i - blockSizeInBytes];
+ }
+ // Encrypt block
+ cipher._encryptblock(m, offset);
+ }
+};
+CBC_prototype._doDecrypt = function (cipher, c, iv) {
+ var blockSizeInBytes = cipher._blocksize * 4;
+
+ // At the start, the previously crypted block is the IV
+ var prevCryptedBlock = iv;
+
+ // Decrypt each block
+ for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
+ // Save this crypted block
+ var thisCryptedBlock = c.slice(offset, offset + blockSizeInBytes);
+ // Decrypt block
+ cipher._decryptblock(c, offset);
+ // XOR decrypted block using previous crypted block
+ for (var i = 0; i < blockSizeInBytes; i++) {
+ c[offset + i] ^= prevCryptedBlock[i];
+ }
+ prevCryptedBlock = thisCryptedBlock;
+ }
+};
+
+
+/**
+ * Cipher feed back
+ *
+ * The cipher output is XORed with the plain text to produce the cipher output,
+ * which is then fed back into the cipher to produce a bit pattern to XOR the
+ * next block with.
+ *
+ * This is a stream cipher mode and does not require padding.
+ */
+var CFB = C_mode.CFB = function () {
+ // Call parent constructor
+ Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var CFB_prototype = CFB.prototype = new Mode;
+
+// Override padding
+CFB_prototype._padding = C_pad.NoPadding;
+
+// Concrete steps for Mode template
+CFB_prototype._doEncrypt = function (cipher, m, iv) {
+ var blockSizeInBytes = cipher._blocksize * 4,
+ keystream = iv.slice(0);
+
+ // Encrypt each byte
+ for (var i = 0; i < m.length; i++) {
+
+ var j = i % blockSizeInBytes;
+ if (j == 0) cipher._encryptblock(keystream, 0);
+
+ m[i] ^= keystream[j];
+ keystream[j] = m[i];
+ }
+};
+CFB_prototype._doDecrypt = function (cipher, c, iv) {
+ var blockSizeInBytes = cipher._blocksize * 4,
+ keystream = iv.slice(0);
+
+ // Encrypt each byte
+ for (var i = 0; i < c.length; i++) {
+
+ var j = i % blockSizeInBytes;
+ if (j == 0) cipher._encryptblock(keystream, 0);
+
+ var b = c[i];
+ c[i] ^= keystream[j];
+ keystream[j] = b;
+ }
+};
+
+
+/**
+ * Output feed back
+ *
+ * The cipher repeatedly encrypts its own output. The output is XORed with the
+ * plain text to produce the cipher text.
+ *
+ * This is a stream cipher mode and does not require padding.
+ */
+var OFB = C_mode.OFB = function () {
+ // Call parent constructor
+ Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var OFB_prototype = OFB.prototype = new Mode;
+
+// Override padding
+OFB_prototype._padding = C_pad.NoPadding;
+
+// Concrete steps for Mode template
+OFB_prototype._doEncrypt = function (cipher, m, iv) {
+
+ var blockSizeInBytes = cipher._blocksize * 4,
+ keystream = iv.slice(0);
+
+ // Encrypt each byte
+ for (var i = 0; i < m.length; i++) {
+
+ // Generate keystream
+ if (i % blockSizeInBytes == 0)
+ cipher._encryptblock(keystream, 0);
+
+ // Encrypt byte
+ m[i] ^= keystream[i % blockSizeInBytes];
+
+ }
+};
+OFB_prototype._doDecrypt = OFB_prototype._doEncrypt;
+
+/**
+ * Counter
+ * @author Gergely Risko
+ *
+ * After every block the last 4 bytes of the IV is increased by one
+ * with carry and that IV is used for the next block.
+ *
+ * This is a stream cipher mode and does not require padding.
+ */
+var CTR = C_mode.CTR = function () {
+ // Call parent constructor
+ Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var CTR_prototype = CTR.prototype = new Mode;
+
+// Override padding
+CTR_prototype._padding = C_pad.NoPadding;
+
+CTR_prototype._doEncrypt = function (cipher, m, iv) {
+ var blockSizeInBytes = cipher._blocksize * 4;
+
+ for (var i = 0; i < m.length;) {
+ // do not lose iv
+ var keystream = iv.slice(0);
+
+ // Generate keystream for next block
+ cipher._encryptblock(keystream, 0);
+
+ // XOR keystream with block
+ for (var j = 0; i < m.length && j < blockSizeInBytes; j++, i++) {
+ m[i] ^= keystream[j];
+ }
+
+ // Increase IV
+ if(++(iv[blockSizeInBytes-1]) == 256) {
+ iv[blockSizeInBytes-1] = 0;
+ if(++(iv[blockSizeInBytes-2]) == 256) {
+ iv[blockSizeInBytes-2] = 0;
+ if(++(iv[blockSizeInBytes-3]) == 256) {
+ iv[blockSizeInBytes-3] = 0;
+ ++(iv[blockSizeInBytes-4]);
+ }
+ }
+ }
+ }
+};
+CTR_prototype._doDecrypt = CTR_prototype._doEncrypt;
+
+})(Crypto);
diff --git a/tools/Crypto-JS v2.4.0/crypto-md5-hmac/crypto-md5-hmac.js b/tools/Crypto-JS v2.4.0/crypto-md5-hmac/crypto-md5-hmac.js
index 71ebcf2..c87094f 100755
--- a/tools/Crypto-JS v2.4.0/crypto-md5-hmac/crypto-md5-hmac.js
+++ b/tools/Crypto-JS v2.4.0/crypto-md5-hmac/crypto-md5-hmac.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var n=window.Crypto={},o=n.util={rotl:function(h,i){return h<>>32-i},rotr:function(h,i){return h<<32-i|h>>>i},endian:function(h){if(h.constructor==Number)return o.rotl(h,8)&16711935|o.rotl(h,24)&4278255360;for(var i=0;i0;h--)i.push(Math.floor(Math.random()*256));return i},bytesToWords:function(h){for(var i=[],g=0,a=0;g>>5]|=h[g]<<24-
a%32;return i},wordsToBytes:function(h){for(var i=[],g=0;g>>5]>>>24-g%32&255);return i},bytesToHex:function(h){for(var i=[],g=0;g>>4).toString(16));i.push((h[g]&15).toString(16))}return i.join("")},hexToBytes:function(h){for(var i=[],g=0;g>>6*(3-b)&63)):i.push("=");return i.join("")},base64ToBytes:function(h){if(typeof atob=="function")return p.stringToBytes(atob(h));h=h.replace(/[^A-Z0-9+\/]/ig,"");for(var i=[],g=0,a=0;g>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-md5/crypto-md5.js b/tools/Crypto-JS v2.4.0/crypto-md5/crypto-md5.js
index f964a50..1d00820 100755
--- a/tools/Crypto-JS v2.4.0/crypto-md5/crypto-md5.js
+++ b/tools/Crypto-JS v2.4.0/crypto-md5/crypto-md5.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var n=window.Crypto={},o=n.util={rotl:function(g,i){return g<>>32-i},rotr:function(g,i){return g<<32-i|g>>>i},endian:function(g){if(g.constructor==Number)return o.rotl(g,8)&16711935|o.rotl(g,24)&4278255360;for(var i=0;i0;g--)i.push(Math.floor(Math.random()*256));return i},bytesToWords:function(g){for(var i=[],h=0,a=0;h>>5]|=g[h]<<24-
a%32;return i},wordsToBytes:function(g){for(var i=[],h=0;h>>5]>>>24-h%32&255);return i},bytesToHex:function(g){for(var i=[],h=0;h>>4).toString(16));i.push((g[h]&15).toString(16))}return i.join("")},hexToBytes:function(g){for(var i=[],h=0;h>>6*(3-b)&63)):i.push("=");return i.join("")},base64ToBytes:function(g){if(typeof atob=="function")return p.stringToBytes(atob(g));g=g.replace(/[^A-Z0-9+\/]/ig,"");for(var i=[],h=0,a=0;h>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-blockmodes-aes/crypto-sha1-hmac-pbkdf2-blockmodes-aes.js b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-blockmodes-aes/crypto-sha1-hmac-pbkdf2-blockmodes-aes.js
index 608a7ad..4287cea 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-blockmodes-aes/crypto-sha1-hmac-pbkdf2-blockmodes-aes.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-blockmodes-aes/crypto-sha1-hmac-pbkdf2-blockmodes-aes.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var n=window.Crypto={},q=n.util={rotl:function(f,j){return f<>>32-j},rotr:function(f,j){return f<<32-j|f>>>j},endian:function(f){if(f.constructor==Number)return q.rotl(f,8)&16711935|q.rotl(f,24)&4278255360;for(var j=0;j0;f--)j.push(Math.floor(Math.random()*256));return j},bytesToWords:function(f){for(var j=[],b=0,a=0;b>>5]|=f[b]<<24-
a%32;return j},wordsToBytes:function(f){for(var j=[],b=0;b>>5]>>>24-b%32&255);return j},bytesToHex:function(f){for(var j=[],b=0;b>>4).toString(16));j.push((f[b]&15).toString(16))}return j.join("")},hexToBytes:function(f){for(var j=[],b=0;b>>6*(3-e)&63)):j.push("=");return j.join("")},base64ToBytes:function(f){if(typeof atob=="function")return p.stringToBytes(atob(f));f=f.replace(/[^A-Z0-9+\/]/ig,"");for(var j=[],b=0,a=0;b>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-marc4/crypto-sha1-hmac-pbkdf2-marc4.js b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-marc4/crypto-sha1-hmac-pbkdf2-marc4.js
index 650d03f..7006067 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-marc4/crypto-sha1-hmac-pbkdf2-marc4.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-marc4/crypto-sha1-hmac-pbkdf2-marc4.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var h=window.Crypto={},k=h.util={rotl:function(b,d){return b<>>32-d},rotr:function(b,d){return b<<32-d|b>>>d},endian:function(b){if(b.constructor==Number)return k.rotl(b,8)&16711935|k.rotl(b,24)&4278255360;for(var d=0;d0;b--)d.push(Math.floor(Math.random()*256));return d},bytesToWords:function(b){for(var d=[],a=0,e=0;a>>5]|=b[a]<<24-
e%32;return d},wordsToBytes:function(b){for(var d=[],a=0;a>>5]>>>24-a%32&255);return d},bytesToHex:function(b){for(var d=[],a=0;a>>4).toString(16));d.push((b[a]&15).toString(16))}return d.join("")},hexToBytes:function(b){for(var d=[],a=0;a>>6*(3-c)&63)):d.push("=");return d.join("")},base64ToBytes:function(b){if(typeof atob=="function")return l.stringToBytes(atob(b));b=b.replace(/[^A-Z0-9+\/]/ig,"");for(var d=[],a=0,e=0;a>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-rabbit/crypto-sha1-hmac-pbkdf2-rabbit.js b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-rabbit/crypto-sha1-hmac-pbkdf2-rabbit.js
index 88d5aae..651dc5e 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-rabbit/crypto-sha1-hmac-pbkdf2-rabbit.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2-rabbit/crypto-sha1-hmac-pbkdf2-rabbit.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var i=window.Crypto={},j=i.util={rotl:function(b,c){return b<>>32-c},rotr:function(b,c){return b<<32-c|b>>>c},endian:function(b){if(b.constructor==Number)return j.rotl(b,8)&16711935|j.rotl(b,24)&4278255360;for(var c=0;c0;b--)c.push(Math.floor(Math.random()*256));return c},bytesToWords:function(b){for(var c=[],e=0,g=0;e>>5]|=b[e]<<24-
g%32;return c},wordsToBytes:function(b){for(var c=[],e=0;e>>5]>>>24-e%32&255);return c},bytesToHex:function(b){for(var c=[],e=0;e>>4).toString(16));c.push((b[e]&15).toString(16))}return c.join("")},hexToBytes:function(b){for(var c=[],e=0;e>>6*(3-a)&63)):c.push("=");return c.join("")},base64ToBytes:function(b){if(typeof atob=="function")return m.stringToBytes(atob(b));b=b.replace(/[^A-Z0-9+\/]/ig,"");for(var c=[],e=0,g=0;e>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2/crypto-sha1-hmac-pbkdf2.js b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2/crypto-sha1-hmac-pbkdf2.js
index 58c00ec..dcc018b 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2/crypto-sha1-hmac-pbkdf2.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2/crypto-sha1-hmac-pbkdf2.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var g=window.Crypto={},m=g.util={rotl:function(a,c){return a<>>32-c},rotr:function(a,c){return a<<32-c|a>>>c},endian:function(a){if(a.constructor==Number)return m.rotl(a,8)&16711935|m.rotl(a,24)&4278255360;for(var c=0;c0;a--)c.push(Math.floor(Math.random()*256));return c},bytesToWords:function(a){for(var c=[],b=0,d=0;b>>5]|=a[b]<<24-
d%32;return c},wordsToBytes:function(a){for(var c=[],b=0;b>>5]>>>24-b%32&255);return c},bytesToHex:function(a){for(var c=[],b=0;b>>4).toString(16));c.push((a[b]&15).toString(16))}return c.join("")},hexToBytes:function(a){for(var c=[],b=0;b>>6*(3-e)&63)):c.push("=");return c.join("")},base64ToBytes:function(a){if(typeof atob=="function")return k.stringToBytes(atob(a));a=a.replace(/[^A-Z0-9+\/]/ig,"");for(var c=[],b=0,d=0;b>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2async/crypto-sha1-hmac-pbkdf2async.js b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2async/crypto-sha1-hmac-pbkdf2async.js
index 8d416b0..397a848 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2async/crypto-sha1-hmac-pbkdf2async.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac-pbkdf2async/crypto-sha1-hmac-pbkdf2async.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var f=window.Crypto={},n=f.util={rotl:function(a,c){return a<>>32-c},rotr:function(a,c){return a<<32-c|a>>>c},endian:function(a){if(a.constructor==Number)return n.rotl(a,8)&16711935|n.rotl(a,24)&4278255360;for(var c=0;c0;a--)c.push(Math.floor(Math.random()*256));return c},bytesToWords:function(a){for(var c=[],b=0,d=0;b>>5]|=a[b]<<24-
d%32;return c},wordsToBytes:function(a){for(var c=[],b=0;b>>5]>>>24-b%32&255);return c},bytesToHex:function(a){for(var c=[],b=0;b>>4).toString(16));c.push((a[b]&15).toString(16))}return c.join("")},hexToBytes:function(a){for(var c=[],b=0;b>>6*(3-e)&63)):c.push("=");return c.join("")},base64ToBytes:function(a){if(typeof atob=="function")return l.stringToBytes(atob(a));a=a.replace(/[^A-Z0-9+\/]/ig,"");for(var c=[],b=0,d=0;b>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac/crypto-sha1-hmac.js b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac/crypto-sha1-hmac.js
index 6a5a49c..094a430 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha1-hmac/crypto-sha1-hmac.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha1-hmac/crypto-sha1-hmac.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var i=window.Crypto={},n=i.util={rotl:function(a,c){return a<>>32-c},rotr:function(a,c){return a<<32-c|a>>>c},endian:function(a){if(a.constructor==Number)return n.rotl(a,8)&16711935|n.rotl(a,24)&4278255360;for(var c=0;c0;a--)c.push(Math.floor(Math.random()*256));return c},bytesToWords:function(a){for(var c=[],b=0,d=0;b>>5]|=a[b]<<24-
d%32;return c},wordsToBytes:function(a){for(var c=[],b=0;b>>5]>>>24-b%32&255);return c},bytesToHex:function(a){for(var c=[],b=0;b>>4).toString(16));c.push((a[b]&15).toString(16))}return c.join("")},hexToBytes:function(a){for(var c=[],b=0;b>>6*(3-e)&63)):c.push("=");return c.join("")},base64ToBytes:function(a){if(typeof atob=="function")return j.stringToBytes(atob(a));a=a.replace(/[^A-Z0-9+\/]/ig,"");for(var c=[],b=0,d=0;b>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha1/crypto-sha1.js b/tools/Crypto-JS v2.4.0/crypto-sha1/crypto-sha1.js
index 7a99356..52ed1c1 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha1/crypto-sha1.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha1/crypto-sha1.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var k=window.Crypto={},l=k.util={rotl:function(a,c){return a<>>32-c},rotr:function(a,c){return a<<32-c|a>>>c},endian:function(a){if(a.constructor==Number)return l.rotl(a,8)&16711935|l.rotl(a,24)&4278255360;for(var c=0;c0;a--)c.push(Math.floor(Math.random()*256));return c},bytesToWords:function(a){for(var c=[],b=0,d=0;b>>5]|=a[b]<<24-
d%32;return c},wordsToBytes:function(a){for(var c=[],b=0;b>>5]>>>24-b%32&255);return c},bytesToHex:function(a){for(var c=[],b=0;b>>4).toString(16));c.push((a[b]&15).toString(16))}return c.join("")},hexToBytes:function(a){for(var c=[],b=0;b>>6*(3-e)&63)):c.push("=");return c.join("")},base64ToBytes:function(a){if(typeof atob=="function")return m.stringToBytes(atob(a));a=a.replace(/[^A-Z0-9+\/]/ig,"");for(var c=[],b=0,d=0;b>>
diff --git a/tools/Crypto-JS v2.4.0/crypto-sha256-hmac/crypto-sha256-hmac.js b/tools/Crypto-JS v2.4.0/crypto-sha256-hmac/crypto-sha256-hmac.js
index fefdcfb..73aaa61 100755
--- a/tools/Crypto-JS v2.4.0/crypto-sha256-hmac/crypto-sha256-hmac.js
+++ b/tools/Crypto-JS v2.4.0/crypto-sha256-hmac/crypto-sha256-hmac.js
@@ -1,9 +1,9 @@
-/*
- * Crypto-JS v2.4.0
- * http://code.google.com/p/crypto-js/
- * Copyright (c) 2011, Jeff Mott. All rights reserved.
- * http://code.google.com/p/crypto-js/wiki/License
- */
+/*
+ * Crypto-JS v2.4.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2011, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
if(typeof Crypto=="undefined"||!Crypto.util)(function(){var h=window.Crypto={},n=h.util={rotl:function(a,c){return a<>>32-c},rotr:function(a,c){return a<<32-c|a>>>c},endian:function(a){if(a.constructor==Number)return n.rotl(a,8)&16711935|n.rotl(a,24)&4278255360;for(var c=0;c0;a--)c.push(Math.floor(Math.random()*256));return c},bytesToWords:function(a){for(var c=[],b=0,f=0;b
-