From 63e6cf4bb36be874f0a46bc9d0620df3b2b8619e Mon Sep 17 00:00:00 2001 From: SheetJS Date: Sat, 16 Jan 2016 01:37:17 -0500 Subject: [PATCH] version bump 1.0.4: adjusting tolerance --- .travis.yml | 5 ++++- LICENSE | 2 +- dist/LICENSE | 2 +- dist/frac.js | 4 ++-- dist/frac.min.js | 3 +-- dist/frac.min.map | 2 +- frac.flow.js | 4 ++-- frac.js | 4 ++-- frac.md | 6 +++--- frac.py | 2 +- index.html | 2 +- misc/spin.sh | 2 +- misc/strip_sourcemap.sh | 2 +- package.json | 2 +- 14 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2853f70..15812b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,12 @@ language: node_js node_js: - - "iojs" + - "5.0" + - "4.2" + - "0.12" - "0.10" - "0.8" before_install: + - "npm install -g npm@next" - "npm install -g mocha" - "npm install blanket" - "npm install coveralls mocha-lcov-reporter" diff --git a/LICENSE b/LICENSE index 9f00b94..d99d93d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2012-2015 SheetJS +Copyright (C) 2012-present SheetJS Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/dist/LICENSE b/dist/LICENSE index 9f00b94..d99d93d 100644 --- a/dist/LICENSE +++ b/dist/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2012-2015 SheetJS +Copyright (C) 2012-present SheetJS Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/dist/frac.js b/dist/frac.js index 27a2330..9510e51 100644 --- a/dist/frac.js +++ b/dist/frac.js @@ -1,4 +1,4 @@ -/* frac.js (C) 2012-2015 SheetJS -- http://sheetjs.com */ +/* frac.js (C) 2012-present SheetJS -- http://sheetjs.com */ var frac = function(x, D, mixed) { var n1 = Math.floor(x), d1 = 1; var n2 = n1+1, d2 = 1; @@ -28,7 +28,7 @@ frac.cont = function cont(x, D, mixed) { A = Math.floor(B); P = A * P_1 + P_2; Q = A * Q_1 + Q_2; - if((B - A) < 0.0000000005) break; + if((B - A) < 0.000000005) break; B = 1 / (B - A); P_2 = P_1; P_1 = P; Q_2 = Q_1; Q_1 = Q; diff --git a/dist/frac.min.js b/dist/frac.min.js index cf06dcf..db508da 100644 --- a/dist/frac.min.js +++ b/dist/frac.min.js @@ -1,2 +1 @@ -/* frac.js (C) 2012-2015 SheetJS -- http://sheetjs.com */ -var frac=function(x,D,mixed){var n1=Math.floor(x),d1=1;var n2=n1+1,d2=1;if(x!==n1)while(d1<=D&&d2<=D){var m=(n1+n2)/(d1+d2);if(x===m){if(d1+d2<=D){d1+=d2;n1+=n2;d2=D+1}else if(d1>d2)d2=D+1;else d1=D+1;break}else if(xD){d1=d2;n1=n2}if(!mixed)return[0,n1,d1];var q=Math.floor(n1/d1);return[q,n1-q*d1,d1]};frac.cont=function cont(x,D,mixed){var sgn=x<0?-1:1;var B=x*sgn;var P_2=0,P_1=1,P=0;var Q_2=1,Q_1=0,Q=0;var A=Math.floor(B);while(Q_1D){if(Q_1>D){Q=Q_2;P=P_2}else{Q=Q_1;P=P_1}}if(!mixed)return[0,sgn*P,Q];var q=Math.floor(sgn*P/Q);return[q,sgn*P-q*Q,Q]};if(typeof module!=="undefined"&&typeof DO_NOT_EXPORT_FRAC==="undefined")module.exports=frac; +var frac=function(x,D,mixed){var n1=Math.floor(x),d1=1;var n2=n1+1,d2=1;if(x!==n1)while(d1<=D&&d2<=D){var m=(n1+n2)/(d1+d2);if(x===m){if(d1+d2<=D){d1+=d2;n1+=n2;d2=D+1}else if(d1>d2)d2=D+1;else d1=D+1;break}else if(xD){d1=d2;n1=n2}if(!mixed)return[0,n1,d1];var q=Math.floor(n1/d1);return[q,n1-q*d1,d1]};frac.cont=function cont(x,D,mixed){var sgn=x<0?-1:1;var B=x*sgn;var P_2=0,P_1=1,P=0;var Q_2=1,Q_1=0,Q=0;var A=Math.floor(B);while(Q_1D){if(Q_1>D){Q=Q_2;P=P_2}else{Q=Q_1;P=P_1}}if(!mixed)return[0,sgn*P,Q];var q=Math.floor(sgn*P/Q);return[q,sgn*P-q*Q,Q]};if(typeof module!=="undefined"&&typeof DO_NOT_EXPORT_FRAC==="undefined")module.exports=frac; diff --git a/dist/frac.min.map b/dist/frac.min.map index ae6bfaf..92894fe 100644 --- a/dist/frac.min.map +++ b/dist/frac.min.map @@ -1 +1 @@ -{"version":3,"file":"dist/frac.min.js","sources":["frac.js"],"names":["frac","x","D","mixed","n1","Math","floor","d1","n2","d2","m","q","cont","sgn","B","P_2","P_1","P","Q_2","Q_1","Q","A","module","DO_NOT_EXPORT_FRAC","exports"],"mappings":";AACA,GAAIA,MAAO,SAASC,EAAGC,EAAGC,OACxB,GAAIC,IAAKC,KAAKC,MAAML,GAAIM,GAAK,CAC7B,IAAIC,IAAKJ,GAAG,EAAGK,GAAK,CACpB,IAAGR,IAAMG,GAAI,MAAMG,IAAML,GAAKO,IAAMP,EAAG,CACrC,GAAIQ,IAAKN,GAAKI,KAAOD,GAAKE,GAC1B,IAAGR,IAAMS,EAAG,CACV,GAAGH,GAAKE,IAAMP,EAAG,CAAEK,IAAIE,EAAIL,KAAII,EAAIC,IAAGP,EAAE,MACnC,IAAGK,GAAKE,GAAIA,GAAGP,EAAE,MACjBK,IAAGL,EAAE,CACV,WAEG,IAAGD,EAAIS,EAAG,CAAEF,GAAKJ,GAAGI,EAAIC,IAAKF,GAAGE,OAChC,CAAEL,GAAKA,GAAGI,EAAID,IAAKA,GAAGE,IAE7B,GAAGF,GAAKL,EAAG,CAAEK,GAAKE,EAAIL,IAAKI,GAC3B,IAAIL,MAAO,OAAQ,EAAGC,GAAIG,GAC1B,IAAII,GAAIN,KAAKC,MAAMF,GAAGG,GACtB,QAAQI,EAAGP,GAAKO,EAAEJ,GAAIA,IAExBP,MAAKY,KAAO,QAASA,MAAKX,EAAGC,EAAGC,OAC9B,GAAIU,KAAMZ,EAAI,GAAK,EAAI,CACvB,IAAIa,GAAIb,EAAIY,GACZ,IAAIE,KAAM,EAAGC,IAAM,EAAGC,EAAI,CAC1B,IAAIC,KAAM,EAAGC,IAAM,EAAGC,EAAI,CAC1B,IAAIC,GAAIhB,KAAKC,MAAMQ,EACnB,OAAMK,IAAMjB,EAAG,CACbmB,EAAIhB,KAAKC,MAAMQ,EACfG,GAAII,EAAIL,IAAMD,GACdK,GAAIC,EAAIF,IAAMD,GACd,IAAIJ,EAAIO,EAAK,MAAc,KAC3BP,GAAI,GAAKA,EAAIO,EACbN,KAAMC,GAAKA,KAAMC,CACjBC,KAAMC,GAAKA,KAAMC,EAEnB,GAAGA,EAAIlB,EAAG,CAAE,GAAGiB,IAAMjB,EAAG,CAAEkB,EAAIF,GAAKD,GAAIF,QAAY,CAAEK,EAAID,GAAKF,GAAID,KAClE,IAAIb,MAAO,OAAQ,EAAGU,IAAMI,EAAGG,EAC/B,IAAIT,GAAIN,KAAKC,MAAMO,IAAMI,EAAEG,EAC3B,QAAQT,EAAGE,IAAII,EAAIN,EAAES,EAAGA,GAE1B,UAAUE,UAAW,mBAAsBC,sBAAuB,YAAaD,OAAOE,QAAUxB"} \ No newline at end of file +{"version":3,"file":"dist/frac.min.js","sources":["frac.js"],"names":["frac","x","D","mixed","n1","Math","floor","d1","n2","d2","m","q","cont","sgn","B","P_2","P_1","P","Q_2","Q_1","Q","A","module","DO_NOT_EXPORT_FRAC","exports"],"mappings":"AACA,GAAIA,MAAO,SAASC,EAAGC,EAAGC,OACxB,GAAIC,IAAKC,KAAKC,MAAML,GAAIM,GAAK,CAC7B,IAAIC,IAAKJ,GAAG,EAAGK,GAAK,CACpB,IAAGR,IAAMG,GAAI,MAAMG,IAAML,GAAKO,IAAMP,EAAG,CACrC,GAAIQ,IAAKN,GAAKI,KAAOD,GAAKE,GAC1B,IAAGR,IAAMS,EAAG,CACV,GAAGH,GAAKE,IAAMP,EAAG,CAAEK,IAAIE,EAAIL,KAAII,EAAIC,IAAGP,EAAE,MACnC,IAAGK,GAAKE,GAAIA,GAAGP,EAAE,MACjBK,IAAGL,EAAE,CACV,WAEG,IAAGD,EAAIS,EAAG,CAAEF,GAAKJ,GAAGI,EAAIC,IAAKF,GAAGE,OAChC,CAAEL,GAAKA,GAAGI,EAAID,IAAKA,GAAGE,IAE7B,GAAGF,GAAKL,EAAG,CAAEK,GAAKE,EAAIL,IAAKI,GAC3B,IAAIL,MAAO,OAAQ,EAAGC,GAAIG,GAC1B,IAAII,GAAIN,KAAKC,MAAMF,GAAGG,GACtB,QAAQI,EAAGP,GAAKO,EAAEJ,GAAIA,IAExBP,MAAKY,KAAO,QAASA,MAAKX,EAAGC,EAAGC,OAC9B,GAAIU,KAAMZ,EAAI,GAAK,EAAI,CACvB,IAAIa,GAAIb,EAAIY,GACZ,IAAIE,KAAM,EAAGC,IAAM,EAAGC,EAAI,CAC1B,IAAIC,KAAM,EAAGC,IAAM,EAAGC,EAAI,CAC1B,IAAIC,GAAIhB,KAAKC,MAAMQ,EACnB,OAAMK,IAAMjB,EAAG,CACbmB,EAAIhB,KAAKC,MAAMQ,EACfG,GAAII,EAAIL,IAAMD,GACdK,GAAIC,EAAIF,IAAMD,GACd,IAAIJ,EAAIO,EAAK,KAAa,KAC1BP,GAAI,GAAKA,EAAIO,EACbN,KAAMC,GAAKA,KAAMC,CACjBC,KAAMC,GAAKA,KAAMC,EAEnB,GAAGA,EAAIlB,EAAG,CAAE,GAAGiB,IAAMjB,EAAG,CAAEkB,EAAIF,GAAKD,GAAIF,QAAY,CAAEK,EAAID,GAAKF,GAAID,KAClE,IAAIb,MAAO,OAAQ,EAAGU,IAAMI,EAAGG,EAC/B,IAAIT,GAAIN,KAAKC,MAAMO,IAAMI,EAAEG,EAC3B,QAAQT,EAAGE,IAAII,EAAIN,EAAES,EAAGA,GAE1B,UAAUE,UAAW,mBAAsBC,sBAAuB,YAAaD,OAAOE,QAAUxB"} \ No newline at end of file diff --git a/frac.flow.js b/frac.flow.js index 234aff9..aacbf10 100644 --- a/frac.flow.js +++ b/frac.flow.js @@ -1,4 +1,4 @@ -/* frac.js (C) 2012-2015 SheetJS -- http://sheetjs.com */ +/* frac.js (C) 2012-present SheetJS -- http://sheetjs.com */ var frac = function(x/*:number*/, D/*:number*/, mixed/*:?boolean*/)/*:Array*/ { var n1 = Math.floor(x), d1 = 1; var n2 = n1+1, d2 = 1; @@ -28,7 +28,7 @@ frac.cont = function cont(x/*:number*/, D/*:number*/, mixed/*:?boolean*/)/*:Arra A = Math.floor(B); P = A * P_1 + P_2; Q = A * Q_1 + Q_2; - if((B - A) < 0.0000000005) break; + if((B - A) < 0.000000005) break; B = 1 / (B - A); P_2 = P_1; P_1 = P; Q_2 = Q_1; Q_1 = Q; diff --git a/frac.js b/frac.js index 27a2330..9510e51 100644 --- a/frac.js +++ b/frac.js @@ -1,4 +1,4 @@ -/* frac.js (C) 2012-2015 SheetJS -- http://sheetjs.com */ +/* frac.js (C) 2012-present SheetJS -- http://sheetjs.com */ var frac = function(x, D, mixed) { var n1 = Math.floor(x), d1 = 1; var n2 = n1+1, d2 = 1; @@ -28,7 +28,7 @@ frac.cont = function cont(x, D, mixed) { A = Math.floor(B); P = A * P_1 + P_2; Q = A * Q_1 + Q_2; - if((B - A) < 0.0000000005) break; + if((B - A) < 0.000000005) break; B = 1 / (B - A); P_2 = P_1; P_1 = P; Q_2 = Q_1; Q_1 = Q; diff --git a/frac.md b/frac.md index ce6abd5..410183b 100644 --- a/frac.md +++ b/frac.md @@ -22,7 +22,7 @@ fractions. Some interpret `a b/c` as `sgn(a) * [abs(a) + b/c]`. To replicate that behavior, pass the absolute value to frac and prepend a "-" if negative. ```js>frac.flow.js -/* frac.js (C) 2012-2015 SheetJS -- http://sheetjs.com */ +/* frac.js (C) 2012-present SheetJS -- http://sheetjs.com */ var frac = function(x/*:number*/, D/*:number*/, mixed/*:?boolean*/)/*:Array*/ { ``` @@ -135,7 +135,7 @@ for the range `B>=2**32`. > b_{k+1} = (b_{k} - a_{k})^{-1} ``` - if((B - A) < 0.0000000005) break; + if((B - A) < 0.000000005) break; ``` At the end of each iteration, advance `k` by one step: @@ -239,7 +239,7 @@ xltestfiles.forEach(function(x) { ```json>package.json { "name": "frac", - "version": "1.0.2", + "version": "1.0.4", "author": "SheetJS", "description": "Rational approximation with bounded denominator", "keywords": [ "math", "fraction", "rational", "approximation" ], diff --git a/frac.py b/frac.py index 49771d7..4625d2b 100644 --- a/frac.py +++ b/frac.py @@ -1,4 +1,4 @@ -# frac.py (C) 2015 SheetJS -- http://sheetjs.com +# frac.py (C) 2015-present SheetJS -- http://sheetjs.com # vim: set fileencoding=utf-8 : """ Rational approximations to numbers diff --git a/index.html b/index.html index b596064..2b149e1 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + diff --git a/misc/spin.sh b/misc/spin.sh index d57fe41..471dfee 100755 --- a/misc/spin.sh +++ b/misc/spin.sh @@ -1,6 +1,6 @@ #!/bin/bash # spin.sh -- show a spinner (for coverage test) -# Copyright (C) 2014-2015 SheetJS +# Copyright (C) 2014-present SheetJS wpid=$1 delay=1 diff --git a/misc/strip_sourcemap.sh b/misc/strip_sourcemap.sh index c331104..9100d1b 100755 --- a/misc/strip_sourcemap.sh +++ b/misc/strip_sourcemap.sh @@ -1,6 +1,6 @@ #!/bin/bash # strip_sourcemap.sh -- strip sourcemaps from a JS file (missing from uglifyjs) -# Copyright (C) 2014-2015 SheetJS +# Copyright (C) 2014-present SheetJS if [ $# -gt 0 ]; then if [ -e "$1" ]; then diff --git a/package.json b/package.json index c9831fd..67bbcf8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "frac", - "version": "1.0.2", + "version": "1.0.4", "author": "SheetJS", "description": "Rational approximation with bounded denominator", "keywords": [ "math", "fraction", "rational", "approximation" ],