Merge ab2a18f into 1c868c1

package.json

@@ -44,6 +44,7 @@
     "positional-notation": "^2.0.0",
     "pow-arbitrary-precision": "^2.1.0",
     "ramda": "^0.19.1",
+    "string-translate": "^1.1.1",
     "times-arbitrary-precision": "^1.1.0",
     "to-decimal-arbitrary-precision": "^1.0.2"
   }

src/R.js

@@ -5,13 +5,13 @@
 module.exports = Object.freeze({
   __: require('ramda/src/__'),
   addIndex: require('ramda/src/addIndex'),
+  adjust: require('ramda/src/adjust'),
   curryN: require('ramda/src/curryN'),
   identical: require('ramda/src/identical'),
   identity: require('ramda/src/identity'),
   indexOf: require('ramda/src/indexOf'),
   invoker: require('ramda/src/invoker'),
   join: require('ramda/src/join'),
-  nth: require('ramda/src/nth'),
   map: require('ramda/src/map'),
   memoize: require('ramda/src/memoize'),
   pipe: require('ramda/src/pipe'),

src/U.js

@@ -0,0 +1,26 @@
+/*jshint node:true */
+
+'use strict';
+
+var R = require('./R');
+
+var add = R.invoker(1, 'plus');
+
+module.exports = Object.freeze({
+  add: add,
+
+  indexOfSymbol: R.memoize(function(symbols) {
+    return R.memoize(R.indexOf(R.__, symbols));
+  }),
+
+  joinWithoutSep: R.join(''),
+  joinWithDot: R.join('.'),
+
+  splitByDot: R.split('.'),
+
+  sum: function(big) {
+    return R.reduce(add, big('0'));
+  },
+
+  toString: R.invoker(0, 'toString')
+});

src/algorithm.js

@@ -0,0 +1,18 @@
+/*jshint node:true */
+
+'use strict';
+
+var toBigFactory = require('to-decimal-arbitrary-precision');
+
+var R = require('./R');
+var U = require('./U');
+
+var toDecimalRaw = R.curryN(5, function(mapper, big, symbols, base, n) {
+  return R.pipe(
+    R.map(U.indexOfSymbol(symbols)),
+    R.addIndex(R.map)(mapper(big, base)),
+    U.sum(big)
+  )(n);
+});
+
+module.exports = toDecimalRaw;

src/fracMapper.js

@@ -0,0 +1,11 @@
+/*jshint node:true */
+
+'use strict';
+
+var posNotation = require('positional-notation');
+
+var R = require('./R');
+
+module.exports = R.curryN(4, function(big, base, val, index) {
+  return posNotation.raw(big, base, [-index - 1, val]);
+});

src/index.js

@@ -6,51 +6,34 @@ var posNotation = require('positional-notation');
 var toBigFactory = require('to-decimal-arbitrary-precision');
 
 var R = require('./R');
+var U = require('./U');
+var toDecimalAlg = require('./algorithm');
+var fracMapper = require('./fracMapper');
+var translate = require('./translate');
 
-var defaultB = toBigFactory(require('./Big'));
+var defaultBig = toBigFactory(require('./Big'));
 var defaultSymbols = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-var joinWithoutSep = R.join('');
-var splitWithoutSep = R.split('');
-var toString = R.invoker(0, 'toString');
-var add = R.invoker(1, 'plus');
 
-var indexOfSymbol = R.memoize(function(symbols) {
-  return R.memoize(R.indexOf(R.__, symbols));
-});
-
-var nthSymbol = R.memoize(function(symbols) {
-  return R.memoize(R.nth(R.__, symbols));
-});
-
-var postprocess = R.memoize(function(symbols) {
-  return R.identical(symbols, defaultSymbols) ?
-    R.identity :
-    R.pipe(
-      R.map(nthSymbol(symbols)),
-      joinWithoutSep,
-      toString
-    );
-});
-
-var toDecimalRaw = R.curryN(4, function(b, symbols, base, n) {
+var toDecimalRaw = R.curryN(4, function(big, symbols, base, n) {
   return R.pipe(
-    toString,
-    R.reverse,
-    R.map(indexOfSymbol(symbols)),
-    R.addIndex(R.map)(posNotation.mapper(b, base)),
-    R.reduce(add, b(0)),
-    toString,
-    postprocess(symbols)
+    U.toString,
+    U.splitByDot,
+    R.adjust(R.reverse, 0),
+    R.adjust(toDecimalAlg(posNotation.mapper, big, symbols, base), 0),
+    R.adjust(toDecimalAlg(fracMapper, big, symbols, base), 1),
+    U.sum(big),
+    U.toString,
+    translate(defaultSymbols, symbols)
   )(n);
 });
 
-var toDecimal = toDecimalRaw(defaultB, defaultSymbols);
+var toDecimal = toDecimalRaw(defaultBig, defaultSymbols);
 
 toDecimal.big = toDecimalRaw(R.__, defaultSymbols);
-toDecimal.symbols = toDecimalRaw(defaultB);
+toDecimal.symbols = toDecimalRaw(defaultBig);
 toDecimal.raw = toDecimalRaw;
 
 toDecimal.defaultSymbols = defaultSymbols;
-toDecimal.defaultB = defaultB;
+toDecimal.defaultBig = defaultBig;
 
 module.exports = toDecimal;

src/translate.js

@@ -0,0 +1,11 @@
+/*jshint node:true */
+
+'use strict';
+
+var tr = require('string-translate');
+
+var R = require('./R');
+
+module.exports = R.memoize(function(defaultSymbols, symbols) {
+  return R.identical(defaultSymbols, symbols) ? R.identity : tr(defaultSymbols, symbols);
+});

test/integer-base-converter.js

@@ -19,4 +19,12 @@ describe('integer-base-converter', function() {
       .should.be.exactly(other.convert('Gf', 60, 10).toString())
       .and.exactly(b60To10('Gf'));
   });
+
+  it.skip('yields the same results for fractionals from base 60', function() {
+    var b60To10 = fn(60);
+
+    '3.14159'
+      .should.be.exactly(other.convert('3.8ThQO', 60, 10).toString())
+      .and.exactly(b60To10('3.8ThQO'));
+  });
 });

test/spec.js

@@ -39,7 +39,23 @@ describe('base conversion', function() {
       .should.be.exactly('#678364#6#34#634#634#63467#7364#63#34#3464#74#');
   });
 
-  it.skip('non-integer from base 9', function() {
-    fn(9, '11.08').should.be.exactly('10.10');
+  it('non-integer from binary', function() {
+    fn.symbols('⓿①②③④⑤⑥⑦⑧⑨', 2, '①⓿⓿①.①⓿①')
+      .should.be.exactly('⑨.⑥②⑤');
+  });
+
+  it('non-integer from base 60', function() {
+    fn(60, '3.8ThQO')
+      .should.be.exactly('3.14159');
+  });
+
+  it('non-integer from base 9', function() {
+    fn(9, '11.08')
+      .should.be.exactly('10.098765432098766');
+  });
+
+  it('non-integer from non-integer base 3.145', function() {
+    fn(3.145, '100.01')
+      .should.be.exactly('9.992126756390263');
   });
 });