Skip to content

Commit

Permalink
Replace underscore with lodash (used in some unit tests)
Browse files Browse the repository at this point in the history
  • Loading branch information
@josdejong
josdejong committed Sep 6, 2020
1 parent 40fba6e commit 1ce9acd
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 91 deletions.
12 changes: 3 additions & 9 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -57,6 +57,7 @@
"karma-mocha": "2.0.1",
"karma-mocha-reporter": "2.2.5",
"karma-webpack": "4.0.2",
"lodash": "4.17.20",
"math-expression-evaluator": "1.2.22",
"mkdirp": "1.0.4",
"mocha": "8.1.3",
Expand All @@ -71,7 +72,6 @@
"standard": "14.3.4",
"sylvester": "0.0.21",
"uglify-js": "3.10.3",
"underscore": "1.11.0",
"webpack": "4.44.1",
"zeros": "1.0.0"
},
Expand Down
5 changes: 3 additions & 2 deletions test/unit-tests/function/probability/multinomial.test.js
View file
@@ -1,6 +1,7 @@
import assert from 'assert'
import { isEqual } from 'lodash'
import math from '../../../../src/bundleAny'
import _ from 'underscore'

const multinomial = math.multinomial

describe('multinomial', function () {
Expand All @@ -11,7 +12,7 @@ describe('multinomial', function () {
})

it('should calculate the multinomial of n items taken k at a time with BigNumbers', function () {
assert.strictEqual(_.isEqual(multinomial([math.bignumber(3), math.bignumber(4), math.bignumber(5)]), math.bignumber(27720)), true)
assert.strictEqual(isEqual(multinomial([math.bignumber(3), math.bignumber(4), math.bignumber(5)]), math.bignumber(27720)), true)
assert.deepStrictEqual(multinomial([math.bignumber(10), math.bignumber(1), math.bignumber(2)]), math.bignumber(858))
})

Expand Down
122 changes: 61 additions & 61 deletions test/unit-tests/function/probability/pickRandom.test.js
View file
@@ -1,6 +1,6 @@
import assert from 'assert'
import { filter, times } from 'lodash'
import math from '../../../../src/bundleAny'
import _ from 'underscore'

const math2 = math.create({ randomSeed: 'test2' })
const pickRandom = math2.pickRandom
Expand Down Expand Up @@ -122,23 +122,23 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push(pickRandom(possibles))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)
})

Expand All @@ -147,23 +147,23 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push(pickRandom(possibles))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)
})

Expand All @@ -173,25 +173,25 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push.apply(picked, pickRandom(possibles, number))
})

assert.strictEqual(picked.length, 2000)

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)
})

Expand All @@ -201,25 +201,25 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push.apply(picked, pickRandom(possibles, number))
})

assert.strictEqual(picked.length, 3000)

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)
})

Expand All @@ -229,23 +229,23 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push(pickRandom(possibles, weights))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.1)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round((count) / picked.length, 1), 0.4)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.3)
})

Expand All @@ -255,23 +255,23 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push(pickRandom(possibles, weights))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.1)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round((count) / picked.length, 1), 0.4)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.3)
})

Expand All @@ -282,42 +282,42 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push.apply(picked, pickRandom(possibles, number, weights))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.1)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round((count) / picked.length, 1), 0.4)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.3)

_.times(1000, function () {
times(1000, function () {
picked.push.apply(picked, pickRandom(possibles, weights, number))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.1)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round((count) / picked.length, 1), 0.4)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.3)
})

Expand All @@ -328,42 +328,42 @@ describe('pickRandom', function () {
const picked = []
let count

_.times(1000, function () {
times(1000, function () {
picked.push.apply(picked, pickRandom(possibles, number, weights))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.1)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round((count) / picked.length, 1), 0.4)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.3)

_.times(1000, function () {
times(1000, function () {
picked.push.apply(picked, pickRandom(possibles, weights, number))
})

count = _.filter(picked, function (val) { return val === 11 }).length
count = filter(picked, function (val) { return val === 11 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.1)

count = _.filter(picked, function (val) { return val === 22 }).length
count = filter(picked, function (val) { return val === 22 }).length
assert.strictEqual(math.round((count) / picked.length, 1), 0.4)

count = _.filter(picked, function (val) { return val === 33 }).length
count = filter(picked, function (val) { return val === 33 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0)

count = _.filter(picked, function (val) { return val === 44 }).length
count = filter(picked, function (val) { return val === 44 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.2)

count = _.filter(picked, function (val) { return val === 55 }).length
count = filter(picked, function (val) { return val === 55 }).length
assert.strictEqual(math.round(count / picked.length, 1), 0.3)
})

Expand Down

0 comments on commit 1ce9acd

Please sign in to comment.