From: Ian Coleman Date: Thu, 12 Sep 2019 05:04:09 +0000 (+1000) Subject: Change levenshtein library to fixed version 2.0.6 X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=079635cba1587d1b68ebe02bc0a1af38f09d16be Change levenshtein library to fixed version 2.0.6 --- diff --git a/src/js/levenshtein.js b/src/js/levenshtein.js index 3051ec5..a57b8fb 100644 --- a/src/js/levenshtein.js +++ b/src/js/levenshtein.js @@ -1,38 +1,17 @@ +// source +// https://github.com/hiddentao/fast-levenshtein/blob/2.0.6/levenshtein.js (function() { 'use strict'; - /** - * Extend an Object with another Object's properties. - * - * The source objects are specified as additional arguments. - * - * @param dst Object the object to extend. - * - * @return Object the final object. - */ - var _extend = function(dst) { - var sources = Array.prototype.slice.call(arguments, 1); - for (var i=0; i tmp) { - nextCol = tmp; - } - // deletion - tmp = prevRow[j + 1] + 1; - if (nextCol > tmp) { - nextCol = tmp; - } + // substution + strCmp = 0 === collator.compare(str1.charAt(i), String.fromCharCode(str2Char[j])); - // copy current col value into previous (in preparation for next iteration) - prevRow[j] = curCol; - } + nextCol = prevRow[j] + (strCmp ? 0 : 1); - // copy last col value into previous (in preparation for next iteration) - prevRow[j] = nextCol; - } + // insertion + tmp = curCol + 1; + if (nextCol > tmp) { + nextCol = tmp; + } + // deletion + tmp = prevRow[j + 1] + 1; + if (nextCol > tmp) { + nextCol = tmp; + } - return nextCol; - }, + // copy current col value into previous (in preparation for next iteration) + prevRow[j] = curCol; + } - /** - * Asynchronously calculate levenshtein distance of the two strings. - * - * @param str1 String the first string. - * @param str2 String the second string. - * @param cb Function callback function with signature: function(Error err, int distance) - * @param [options] Object additional options. - * @param [options.progress] Function progress callback with signature: function(percentComplete) - */ - getAsync: function(str1, str2, cb, options) { - options = _extend({}, { - progress: null - }, options); + // copy last col value into previous (in preparation for next iteration) + prevRow[j] = nextCol; + } + } + else { + // calculate current row distance from previous row without collator + for (i = 0; i < str1Len; ++i) { + nextCol = i + 1; - // base cases - if (str1 === str2) return cb(null, 0); - if (str1.length === 0) return cb(null, str2.length); - if (str2.length === 0) return cb(null, str1.length); + for (j = 0; j < str2Len; ++j) { + curCol = nextCol; - // two rows - var prevRow = new Array(str2.length + 1), - curCol, nextCol, - i, j, tmp, - startTime, currentTime; + // substution + strCmp = str1.charCodeAt(i) === str2Char[j]; - // initialise previous row - for (i=0; i tmp) { + nextCol = tmp; } - // else if we have more left to do - else { - nextCol = i + 1; - j = 0; + // deletion + tmp = prevRow[j + 1] + 1; + if (nextCol > tmp) { + nextCol = tmp; } - } - - // calculation - curCol = nextCol; - // substution - nextCol = prevRow[j] + ( (str1.charAt(i) === str2.charAt(j)) ? 0 : 1 ); - // insertion - tmp = curCol + 1; - if (nextCol > tmp) { - nextCol = tmp; - } - // deletion - tmp = prevRow[j + 1] + 1; - if (nextCol > tmp) { - nextCol = tmp; + // copy current col value into previous (in preparation for next iteration) + prevRow[j] = curCol; } - // copy current into previous (in preparation for next iteration) - prevRow[j] = curCol; - - // get current time - currentTime = new Date().valueOf(); + // copy last col value into previous (in preparation for next iteration) + prevRow[j] = nextCol; } - - // send a progress update? - if (null !== options.progress) { - try { - options.progress.call(null, (i * 100.0/ str1.length)); - } catch (err) { - return cb('Progress callback: ' + err.toString()); - } - } - - // next iteration - _defer(__calculate); - }; - - __calculate(); + } + return nextCol; } };