diff --git a/stackgl_modules/index.js b/stackgl_modules/index.js index e94cf7edb7b..30d9a9a65a3 100644 --- a/stackgl_modules/index.js +++ b/stackgl_modules/index.js @@ -35174,7 +35174,7 @@ var robustSum = _glvis_("robust-sum") var robustScale = _glvis_("robust-scale") var compress = _glvis_("robust-compress") -var NUM_EXPANDED = 4 +var NUM_EXPANDED = 6 function determinant_2(sum, scale, prod, compress) { return function robustDeterminant2(m) { @@ -35188,10 +35188,24 @@ function determinant_3(sum, scale, prod, compress) { } } +function determinant_4(sum, scale, prod, compress) { + return function robustDeterminant4(m) { + return compress(sum(sum(scale(sum(scale(sum(prod(m[2][2], m[3][3]), prod(-m[2][3], m[3][2])), m[1][1]), sum(scale(sum(prod(m[2][1], m[3][3]), prod(-m[2][3], m[3][1])), -m[1][2]), scale(sum(prod(m[2][1], m[3][2]), prod(-m[2][2], m[3][1])), m[1][3]))), m[0][0]), scale(sum(scale(sum(prod(m[2][2], m[3][3]), prod(-m[2][3], m[3][2])), m[1][0]), sum(scale(sum(prod(m[2][0], m[3][3]), prod(-m[2][3], m[3][0])), -m[1][2]), scale(sum(prod(m[2][0], m[3][2]), prod(-m[2][2], m[3][0])), m[1][3]))), -m[0][1])), sum(scale(sum(scale(sum(prod(m[2][1], m[3][3]), prod(-m[2][3], m[3][1])), m[1][0]), sum(scale(sum(prod(m[2][0], m[3][3]), prod(-m[2][3], m[3][0])), -m[1][1]), scale(sum(prod(m[2][0], m[3][1]), prod(-m[2][1], m[3][0])), m[1][3]))), m[0][2]), scale(sum(scale(sum(prod(m[2][1], m[3][2]), prod(-m[2][2], m[3][1])), m[1][0]), sum(scale(sum(prod(m[2][0], m[3][2]), prod(-m[2][2], m[3][0])), -m[1][1]), scale(sum(prod(m[2][0], m[3][1]), prod(-m[2][1], m[3][0])), m[1][2]))), -m[0][3])))) + } +} + +function determinant_5(sum, scale, prod, compress) { + return function robustDeterminant5(m) { + return compress(sum(sum(scale(sum(sum(scale(sum(scale(sum(prod(m[3][3], m[4][4]), prod(-m[3][4], m[4][3])), m[2][2]), sum(scale(sum(prod(m[3][2], m[4][4]), prod(-m[3][4], m[4][2])), -m[2][3]), scale(sum(prod(m[3][2], m[4][3]), prod(-m[3][3], m[4][2])), m[2][4]))), m[1][1]), scale(sum(scale(sum(prod(m[3][3], m[4][4]), prod(-m[3][4], m[4][3])), m[2][1]), sum(scale(sum(prod(m[3][1], m[4][4]), prod(-m[3][4], m[4][1])), -m[2][3]), scale(sum(prod(m[3][1], m[4][3]), prod(-m[3][3], m[4][1])), m[2][4]))), -m[1][2])), sum(scale(sum(scale(sum(prod(m[3][2], m[4][4]), prod(-m[3][4], m[4][2])), m[2][1]), sum(scale(sum(prod(m[3][1], m[4][4]), prod(-m[3][4], m[4][1])), -m[2][2]), scale(sum(prod(m[3][1], m[4][2]), prod(-m[3][2], m[4][1])), m[2][4]))), m[1][3]), scale(sum(scale(sum(prod(m[3][2], m[4][3]), prod(-m[3][3], m[4][2])), m[2][1]), sum(scale(sum(prod(m[3][1], m[4][3]), prod(-m[3][3], m[4][1])), -m[2][2]), scale(sum(prod(m[3][1], m[4][2]), prod(-m[3][2], m[4][1])), m[2][3]))), -m[1][4]))), m[0][0]), scale(sum(sum(scale(sum(scale(sum(prod(m[3][3], m[4][4]), prod(-m[3][4], m[4][3])), m[2][2]), sum(scale(sum(prod(m[3][2], m[4][4]), prod(-m[3][4], m[4][2])), -m[2][3]), scale(sum(prod(m[3][2], m[4][3]), prod(-m[3][3], m[4][2])), m[2][4]))), m[1][0]), scale(sum(scale(sum(prod(m[3][3], m[4][4]), prod(-m[3][4], m[4][3])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][4]), prod(-m[3][4], m[4][0])), -m[2][3]), scale(sum(prod(m[3][0], m[4][3]), prod(-m[3][3], m[4][0])), m[2][4]))), -m[1][2])), sum(scale(sum(scale(sum(prod(m[3][2], m[4][4]), prod(-m[3][4], m[4][2])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][4]), prod(-m[3][4], m[4][0])), -m[2][2]), scale(sum(prod(m[3][0], m[4][2]), prod(-m[3][2], m[4][0])), m[2][4]))), m[1][3]), scale(sum(scale(sum(prod(m[3][2], m[4][3]), prod(-m[3][3], m[4][2])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][3]), prod(-m[3][3], m[4][0])), -m[2][2]), scale(sum(prod(m[3][0], m[4][2]), prod(-m[3][2], m[4][0])), m[2][3]))), -m[1][4]))), -m[0][1])), sum(scale(sum(sum(scale(sum(scale(sum(prod(m[3][3], m[4][4]), prod(-m[3][4], m[4][3])), m[2][1]), sum(scale(sum(prod(m[3][1], m[4][4]), prod(-m[3][4], m[4][1])), -m[2][3]), scale(sum(prod(m[3][1], m[4][3]), prod(-m[3][3], m[4][1])), m[2][4]))), m[1][0]), scale(sum(scale(sum(prod(m[3][3], m[4][4]), prod(-m[3][4], m[4][3])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][4]), prod(-m[3][4], m[4][0])), -m[2][3]), scale(sum(prod(m[3][0], m[4][3]), prod(-m[3][3], m[4][0])), m[2][4]))), -m[1][1])), sum(scale(sum(scale(sum(prod(m[3][1], m[4][4]), prod(-m[3][4], m[4][1])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][4]), prod(-m[3][4], m[4][0])), -m[2][1]), scale(sum(prod(m[3][0], m[4][1]), prod(-m[3][1], m[4][0])), m[2][4]))), m[1][3]), scale(sum(scale(sum(prod(m[3][1], m[4][3]), prod(-m[3][3], m[4][1])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][3]), prod(-m[3][3], m[4][0])), -m[2][1]), scale(sum(prod(m[3][0], m[4][1]), prod(-m[3][1], m[4][0])), m[2][3]))), -m[1][4]))), m[0][2]), sum(scale(sum(sum(scale(sum(scale(sum(prod(m[3][2], m[4][4]), prod(-m[3][4], m[4][2])), m[2][1]), sum(scale(sum(prod(m[3][1], m[4][4]), prod(-m[3][4], m[4][1])), -m[2][2]), scale(sum(prod(m[3][1], m[4][2]), prod(-m[3][2], m[4][1])), m[2][4]))), m[1][0]), scale(sum(scale(sum(prod(m[3][2], m[4][4]), prod(-m[3][4], m[4][2])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][4]), prod(-m[3][4], m[4][0])), -m[2][2]), scale(sum(prod(m[3][0], m[4][2]), prod(-m[3][2], m[4][0])), m[2][4]))), -m[1][1])), sum(scale(sum(scale(sum(prod(m[3][1], m[4][4]), prod(-m[3][4], m[4][1])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][4]), prod(-m[3][4], m[4][0])), -m[2][1]), scale(sum(prod(m[3][0], m[4][1]), prod(-m[3][1], m[4][0])), m[2][4]))), m[1][2]), scale(sum(scale(sum(prod(m[3][1], m[4][2]), prod(-m[3][2], m[4][1])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][2]), prod(-m[3][2], m[4][0])), -m[2][1]), scale(sum(prod(m[3][0], m[4][1]), prod(-m[3][1], m[4][0])), m[2][2]))), -m[1][4]))), -m[0][3]), scale(sum(sum(scale(sum(scale(sum(prod(m[3][2], m[4][3]), prod(-m[3][3], m[4][2])), m[2][1]), sum(scale(sum(prod(m[3][1], m[4][3]), prod(-m[3][3], m[4][1])), -m[2][2]), scale(sum(prod(m[3][1], m[4][2]), prod(-m[3][2], m[4][1])), m[2][3]))), m[1][0]), scale(sum(scale(sum(prod(m[3][2], m[4][3]), prod(-m[3][3], m[4][2])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][3]), prod(-m[3][3], m[4][0])), -m[2][2]), scale(sum(prod(m[3][0], m[4][2]), prod(-m[3][2], m[4][0])), m[2][3]))), -m[1][1])), sum(scale(sum(scale(sum(prod(m[3][1], m[4][3]), prod(-m[3][3], m[4][1])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][3]), prod(-m[3][3], m[4][0])), -m[2][1]), scale(sum(prod(m[3][0], m[4][1]), prod(-m[3][1], m[4][0])), m[2][3]))), m[1][2]), scale(sum(scale(sum(prod(m[3][1], m[4][2]), prod(-m[3][2], m[4][1])), m[2][0]), sum(scale(sum(prod(m[3][0], m[4][2]), prod(-m[3][2], m[4][0])), -m[2][1]), scale(sum(prod(m[3][0], m[4][1]), prod(-m[3][1], m[4][0])), m[2][2]))), -m[1][3]))), m[0][4]))))) + } +} + function compileDeterminant(n) { var fn = n === 2 ? determinant_2 : - n === 3 ? determinant_3 : undefined + n === 3 ? determinant_3 : + n === 4 ? determinant_4 : + n === 5 ? determinant_5 : undefined return fn(robustSum, robustScale, twoProduct, compress) } @@ -35200,7 +35214,7 @@ var CACHE = [ function robustDeterminant1(m) { return [m[0][0]] } ] -function proc(det0, det1, det2, det3, CACHE, gen) { +function proc(det0, det1, det2, det3, det4, det5, CACHE, gen) { return function robustDeterminant(m) { switch (m.length) { case 0: @@ -35211,6 +35225,10 @@ function proc(det0, det1, det2, det3, CACHE, gen) { return det2(m) case 3: return det3(m) + case 4: + return det4(m) + case 5: + return det5(m) } var det = CACHE[m.length] if (!det) det = CACHE[m.length] = gen(m.length) @@ -35454,13 +35472,16 @@ generateInSphereTest() var determinant = _glvis_("robust-determinant") -var NUM_EXPAND = 3 +var NUM_EXPAND = 6 function generateSolver(n) { var fn = - n === 2 ? solve2d : solve3d + n === 2 ? solve2d : + n === 3 ? solve3d : + n === 4 ? solve4d : + n === 5 ? solve5d : solve6d - if(n < NUM_EXPAND) { + if(n < 6) { return fn(determinant[n]) } return fn(determinant) @@ -35486,18 +35507,38 @@ function solve3d(det) { } } +function solve4d(det) { + return function robustLinearSolve4d(A, b) { + return [det([[+b[0], +A[0][1], +A[0][2], +A[0][3]], [+b[1], +A[1][1], +A[1][2], +A[1][3]], [+b[2], +A[2][1], +A[2][2], +A[2][3]], [+b[3], +A[3][1], +A[3][2], +A[3][3]]]), det([[+A[0][0], +b[0], +A[0][2], +A[0][3]], [+A[1][0], +b[1], +A[1][2], +A[1][3]], [+A[2][0], +b[2], +A[2][2], +A[2][3]], [+A[3][0], +b[3], +A[3][2], +A[3][3]]]), det([[+A[0][0], +A[0][1], +b[0], +A[0][3]], [+A[1][0], +A[1][1], +b[1], +A[1][3]], [+A[2][0], +A[2][1], +b[2], +A[2][3]], [+A[3][0], +A[3][1], +b[3], +A[3][3]]]), det([[+A[0][0], +A[0][1], +A[0][2], +b[0]], [+A[1][0], +A[1][1], +A[1][2], +b[1]], [+A[2][0], +A[2][1], +A[2][2], +b[2]], [+A[3][0], +A[3][1], +A[3][2], +b[3]]]), det(A)] + } +} + +function solve5d(det) { + return function robustLinearSolve5d(A, b) { + return [det([[+b[0], +A[0][1], +A[0][2], +A[0][3], +A[0][4]], [+b[1], +A[1][1], +A[1][2], +A[1][3], +A[1][4]], [+b[2], +A[2][1], +A[2][2], +A[2][3], +A[2][4]], [+b[3], +A[3][1], +A[3][2], +A[3][3], +A[3][4]], [+b[4], +A[4][1], +A[4][2], +A[4][3], +A[4][4]]]), det([[+A[0][0], +b[0], +A[0][2], +A[0][3], +A[0][4]], [+A[1][0], +b[1], +A[1][2], +A[1][3], +A[1][4]], [+A[2][0], +b[2], +A[2][2], +A[2][3], +A[2][4]], [+A[3][0], +b[3], +A[3][2], +A[3][3], +A[3][4]], [+A[4][0], +b[4], +A[4][2], +A[4][3], +A[4][4]]]), det([[+A[0][0], +A[0][1], +b[0], +A[0][3], +A[0][4]], [+A[1][0], +A[1][1], +b[1], +A[1][3], +A[1][4]], [+A[2][0], +A[2][1], +b[2], +A[2][3], +A[2][4]], [+A[3][0], +A[3][1], +b[3], +A[3][3], +A[3][4]], [+A[4][0], +A[4][1], +b[4], +A[4][3], +A[4][4]]]), det([[+A[0][0], +A[0][1], +A[0][2], +b[0], +A[0][4]], [+A[1][0], +A[1][1], +A[1][2], +b[1], +A[1][4]], [+A[2][0], +A[2][1], +A[2][2], +b[2], +A[2][4]], [+A[3][0], +A[3][1], +A[3][2], +b[3], +A[3][4]], [+A[4][0], +A[4][1], +A[4][2], +b[4], +A[4][4]]]), det([[+A[0][0], +A[0][1], +A[0][2], +A[0][3], +b[0]], [+A[1][0], +A[1][1], +A[1][2], +A[1][3], +b[1]], [+A[2][0], +A[2][1], +A[2][2], +A[2][3], +b[2]], [+A[3][0], +A[3][1], +A[3][2], +A[3][3], +b[3]], [+A[4][0], +A[4][1], +A[4][2], +A[4][3], +b[4]]]), det(A)] + } +} + +function solve6d(det) { + return function robustLinearSolve6d(A, b) { + return [det([[+b[0], +A[0][1], +A[0][2], +A[0][3], +A[0][4], +A[0][5]], [+b[1], +A[1][1], +A[1][2], +A[1][3], +A[1][4], +A[1][5]], [+b[2], +A[2][1], +A[2][2], +A[2][3], +A[2][4], +A[2][5]], [+b[3], +A[3][1], +A[3][2], +A[3][3], +A[3][4], +A[3][5]], [+b[4], +A[4][1], +A[4][2], +A[4][3], +A[4][4], +A[4][5]], [+b[5], +A[5][1], +A[5][2], +A[5][3], +A[5][4], +A[5][5]]]), det([[+A[0][0], +b[0], +A[0][2], +A[0][3], +A[0][4], +A[0][5]], [+A[1][0], +b[1], +A[1][2], +A[1][3], +A[1][4], +A[1][5]], [+A[2][0], +b[2], +A[2][2], +A[2][3], +A[2][4], +A[2][5]], [+A[3][0], +b[3], +A[3][2], +A[3][3], +A[3][4], +A[3][5]], [+A[4][0], +b[4], +A[4][2], +A[4][3], +A[4][4], +A[4][5]], [+A[5][0], +b[5], +A[5][2], +A[5][3], +A[5][4], +A[5][5]]]), det([[+A[0][0], +A[0][1], +b[0], +A[0][3], +A[0][4], +A[0][5]], [+A[1][0], +A[1][1], +b[1], +A[1][3], +A[1][4], +A[1][5]], [+A[2][0], +A[2][1], +b[2], +A[2][3], +A[2][4], +A[2][5]], [+A[3][0], +A[3][1], +b[3], +A[3][3], +A[3][4], +A[3][5]], [+A[4][0], +A[4][1], +b[4], +A[4][3], +A[4][4], +A[4][5]], [+A[5][0], +A[5][1], +b[5], +A[5][3], +A[5][4], +A[5][5]]]), det([[+A[0][0], +A[0][1], +A[0][2], +b[0], +A[0][4], +A[0][5]], [+A[1][0], +A[1][1], +A[1][2], +b[1], +A[1][4], +A[1][5]], [+A[2][0], +A[2][1], +A[2][2], +b[2], +A[2][4], +A[2][5]], [+A[3][0], +A[3][1], +A[3][2], +b[3], +A[3][4], +A[3][5]], [+A[4][0], +A[4][1], +A[4][2], +b[4], +A[4][4], +A[4][5]], [+A[5][0], +A[5][1], +A[5][2], +b[5], +A[5][4], +A[5][5]]]), det([[+A[0][0], +A[0][1], +A[0][2], +A[0][3], +b[0], +A[0][5]], [+A[1][0], +A[1][1], +A[1][2], +A[1][3], +b[1], +A[1][5]], [+A[2][0], +A[2][1], +A[2][2], +A[2][3], +b[2], +A[2][5]], [+A[3][0], +A[3][1], +A[3][2], +A[3][3], +b[3], +A[3][5]], [+A[4][0], +A[4][1], +A[4][2], +A[4][3], +b[4], +A[4][5]], [+A[5][0], +A[5][1], +A[5][2], +A[5][3], +b[5], +A[5][5]]]), det([[+A[0][0], +A[0][1], +A[0][2], +A[0][3], +A[0][4], +b[0]], [+A[1][0], +A[1][1], +A[1][2], +A[1][3], +A[1][4], +b[1]], [+A[2][0], +A[2][1], +A[2][2], +A[2][3], +A[2][4], +b[2]], [+A[3][0], +A[3][1], +A[3][2], +A[3][3], +A[3][4], +b[3]], [+A[4][0], +A[4][1], +A[4][2], +A[4][3], +A[4][4], +b[4]], [+A[5][0], +A[5][1], +A[5][2], +A[5][3], +A[5][4], +b[5]]]), det(A)] + } +} + var CACHE = [ robustLinearSolve0d, robustLinearSolve1d ] -function proc(s0, s1, s2, s3, CACHE, g) { +function proc(s0, s1, s2, s3, s4, s5, CACHE, g) { return function dispatchLinearSolve(A, b) { switch (A.length) { case 0: return s0(A, b); case 1: return s1(A, b); case 2: return s2(A, b); case 3: return s3(A, b); + case 4: return s4(A, b); + case 5: return s5(A, b); } var s = CACHE[A.length]; if (!s) s = CACHE[A.length] = g(A.length); @@ -35506,7 +35547,7 @@ function proc(s0, s1, s2, s3, CACHE, g) { } function generateDispatch() { - while(CACHE.length <= NUM_EXPAND) { + while(CACHE.length < NUM_EXPAND) { CACHE.push(generateSolver(CACHE.length)) } module.exports = proc.apply(undefined, CACHE.concat([CACHE, generateSolver])) diff --git a/stackgl_modules/package-lock.json b/stackgl_modules/package-lock.json index eb2b05f73e6..aff8f430141 100644 --- a/stackgl_modules/package-lock.json +++ b/stackgl_modules/package-lock.json @@ -35,9 +35,9 @@ "ndarray-pack": "plotly/ndarray-pack#v1.3.0", "ndarray-sort": "plotly/ndarray-sort#v1.1.0", "right-now": "^1.0.0", - "robust-determinant": "plotly/robust-determinant#v1.2.1", + "robust-determinant": "plotly/robust-determinant#v1.2.2", "robust-in-sphere": "1.2.1", - "robust-linear-solve": "plotly/robust-linear-solve#v1.1.1", + "robust-linear-solve": "plotly/robust-linear-solve#v1.1.2", "robust-orientation": "1.2.1", "simplicial-complex-contour": "plotly/simplicial-complex-contour#v1.1.0", "surface-nets": "plotly/surface-nets#v1.1.1", @@ -1577,8 +1577,8 @@ "integrity": "sha1-TPYsSzGNgwhRYBK7jBF1Lzkymxs=" }, "node_modules/robust-determinant": { - "version": "1.2.1", - "resolved": "git+ssh://git@github.com/plotly/robust-determinant.git#7cb499bb02411de80ae1a90e54893e46af82ca5e", + "version": "1.2.2", + "resolved": "git+ssh://git@github.com/plotly/robust-determinant.git#0414d049016d32d18f7dae934cb7d5968e00504a", "license": "MIT", "dependencies": { "robust-compress": "^1.0.0", @@ -1608,8 +1608,8 @@ } }, "node_modules/robust-linear-solve": { - "version": "1.1.1", - "resolved": "git+ssh://git@github.com/plotly/robust-linear-solve.git#90ad6de2ce011a1e0b53d9e9f6bf8d117053c492", + "version": "1.1.2", + "resolved": "git+ssh://git@github.com/plotly/robust-linear-solve.git#c9deb96692f9b9c1479bc92a40e0cc985480ecef", "license": "MIT", "dependencies": { "robust-determinant": "^1.1.0" @@ -3434,8 +3434,8 @@ "integrity": "sha1-TPYsSzGNgwhRYBK7jBF1Lzkymxs=" }, "robust-determinant": { - "version": "git+ssh://git@github.com/plotly/robust-determinant.git#7cb499bb02411de80ae1a90e54893e46af82ca5e", - "from": "robust-determinant@plotly/robust-determinant#v1.2.1", + "version": "git+ssh://git@github.com/plotly/robust-determinant.git#0414d049016d32d18f7dae934cb7d5968e00504a", + "from": "robust-determinant@plotly/robust-determinant#v1.2.2", "requires": { "robust-compress": "^1.0.0", "robust-scale": "^1.0.0", @@ -3464,8 +3464,8 @@ } }, "robust-linear-solve": { - "version": "git+ssh://git@github.com/plotly/robust-linear-solve.git#90ad6de2ce011a1e0b53d9e9f6bf8d117053c492", - "from": "robust-linear-solve@plotly/robust-linear-solve#v1.1.1", + "version": "git+ssh://git@github.com/plotly/robust-linear-solve.git#c9deb96692f9b9c1479bc92a40e0cc985480ecef", + "from": "robust-linear-solve@plotly/robust-linear-solve#v1.1.2", "requires": { "robust-determinant": "^1.1.0" } diff --git a/stackgl_modules/package.json b/stackgl_modules/package.json index 5673f0865c9..1217a0e9724 100644 --- a/stackgl_modules/package.json +++ b/stackgl_modules/package.json @@ -39,9 +39,9 @@ "ndarray-pack": "plotly/ndarray-pack#v1.3.0", "ndarray-sort": "plotly/ndarray-sort#v1.1.0", "right-now": "^1.0.0", - "robust-determinant": "plotly/robust-determinant#v1.2.1", + "robust-determinant": "plotly/robust-determinant#v1.2.2", "robust-in-sphere": "1.2.1", - "robust-linear-solve": "plotly/robust-linear-solve#v1.1.1", + "robust-linear-solve": "plotly/robust-linear-solve#v1.1.2", "robust-orientation": "1.2.1", "simplicial-complex-contour": "plotly/simplicial-complex-contour#v1.1.0", "surface-nets": "plotly/surface-nets#v1.1.1", diff --git a/test/image/baselines/z-date_axes-ticklabelstep.png b/test/image/baselines/date_axes-ticklabelstep.png similarity index 100% rename from test/image/baselines/z-date_axes-ticklabelstep.png rename to test/image/baselines/date_axes-ticklabelstep.png diff --git a/test/image/baselines/gl3d_alphahull5.png b/test/image/baselines/gl3d_alphahull5.png new file mode 100644 index 00000000000..a4eaf098e3c Binary files /dev/null and b/test/image/baselines/gl3d_alphahull5.png differ diff --git a/test/image/baselines/z-legend-row-group-height.png b/test/image/baselines/legend-row-group-height.png similarity index 100% rename from test/image/baselines/z-legend-row-group-height.png rename to test/image/baselines/legend-row-group-height.png diff --git a/test/image/baselines/pattern_bars.png b/test/image/baselines/pattern_bars.png index 3ec295b5941..521ae7c689f 100644 Binary files a/test/image/baselines/pattern_bars.png and b/test/image/baselines/pattern_bars.png differ diff --git a/test/image/baselines/pattern_fgcolor_overlay_fillmode.png b/test/image/baselines/pattern_fgcolor_overlay_fillmode.png index af59862d58a..6c6b5fbb821 100644 Binary files a/test/image/baselines/pattern_fgcolor_overlay_fillmode.png and b/test/image/baselines/pattern_fgcolor_overlay_fillmode.png differ diff --git a/test/image/baselines/z-pie_negative_values.png b/test/image/baselines/pie_negative_values.png similarity index 100% rename from test/image/baselines/z-pie_negative_values.png rename to test/image/baselines/pie_negative_values.png diff --git a/test/image/baselines/pie_textpad_radial.png b/test/image/baselines/pie_textpad_radial.png index 20733b24acc..236b381d089 100644 Binary files a/test/image/baselines/pie_textpad_radial.png and b/test/image/baselines/pie_textpad_radial.png differ diff --git a/test/image/baselines/z-scatter_fill_pattern.png b/test/image/baselines/scatter_fill_pattern.png similarity index 100% rename from test/image/baselines/z-scatter_fill_pattern.png rename to test/image/baselines/scatter_fill_pattern.png diff --git a/test/image/baselines/sunburst_packages_colorscale_novalue.png b/test/image/baselines/sunburst_packages_colorscale_novalue.png index 2f09e9246aa..bcc8b6d907e 100644 Binary files a/test/image/baselines/sunburst_packages_colorscale_novalue.png and b/test/image/baselines/sunburst_packages_colorscale_novalue.png differ diff --git a/test/image/mocks/z-date_axes-ticklabelstep.json b/test/image/mocks/date_axes-ticklabelstep.json similarity index 100% rename from test/image/mocks/z-date_axes-ticklabelstep.json rename to test/image/mocks/date_axes-ticklabelstep.json diff --git a/test/image/mocks/gl3d_alphahull5.json b/test/image/mocks/gl3d_alphahull5.json new file mode 100644 index 00000000000..fa9793cdcdb --- /dev/null +++ b/test/image/mocks/gl3d_alphahull5.json @@ -0,0 +1,332 @@ +{ + "data": [ + { + "type": "mesh3d", + "alphahull": 5, + "flatshading": true, + "lighting": { + "facenormalsepsilon": 0 + }, + "color": "white", + "x": [ + 0.689484, + 0.476483, + 0.58677, + 1.068768, + 1.43806, + 1.483567, + 1.163844, + 1.491083, + 1.970356, + 1.961689, + 1.823355, + 1.868743, + 1.437345, + 1.248269, + 1.108745, + 1.670774, + 1.503391, + 1.406028, + 1.97107, + 1.853437, + 1.361601, + 1.139926, + 1.949556, + 2.323108, + 2.558936, + 2.650508, + 2.431305, + 2.026224, + 1.971259, + 1.168452, + 1.342775, + 1.129037, + 0.871781, + 0.855148, + 0.395625, + 1.051331, + 1.309558, + 1.876837, + 2.620561, + 2.508878, + 2.646833, + 2.448341, + 1.610501, + 1.925691, + 1.9184, + 1.910517, + 2.450736, + 2.381144, + 2.1596, + 2.379856, + 2.254824, + 2.32, + 1.698536, + 1.527831, + 1.530377, + 1.67204, + 1.534793, + 1.886021, + 2.062097, + 2.128729, + 2.057646, + 2.155564, + 2.698137, + 3.066121, + 3.925938, + 4.240422, + 3.907132, + 3.750647, + 2.918651, + 2.980647, + 2.992436, + 2.71034, + 2.693541, + 2.361263, + 1.897547, + 2.345557, + 2.007566, + 1.599818, + 1.182395, + 1.469907, + 1.460792, + 1.11318, + 0.879555, + 1.351152, + 1.392628, + 1.926062, + 1.211311, + 0.913065, + 1.363192, + 2.032102, + 1.738637, + 1.249448, + 0.610179, + 0.853197, + 0.794531, + 0.635271, + 0.545627, + 0.137978, + 0.552325, + 0.417952 + ], + "y": [ + -0.014459, + 0.162624, + 0.102149, + 0.678668, + 0.683633, + 0.140479, + 0.125522, + 0.31764, + 0.389628, + 0.144644, + 0.309693, + 0.171245, + 0.781093, + 0.429151, + 0.233132, + -0.080785, + -0.179939, + 0.025858, + 0.309369, + 0.65834, + 0.443953, + 1.295734, + 1.032481, + 0.66557, + 0.22719, + 0.817791, + 1.189158, + 1.167509, + 0.499964, + 0.683057, + 0.672141, + 0.183479, + 0.06947, + 0.587134, + 0.606762, + 0.804046, + 0.67245, + 0.506276, + 0.556901, + 0.445584, + 0.160679, + -0.003327, + 0.031129, + -0.412504, + -0.344678, + -0.246417, + -0.725501, + -1.214003, + -1.524586, + -1.845657, + -1.268736, + -1.171255, + -1.233225, + -1.374688, + -1.35563, + -1.146433, + -1.167195, + -0.864813, + -0.488551, + 0.153843, + 0.302593, + 0.568636, + 0.182249, + 0.56296, + 0.252966, + -0.220912, + -0.328587, + -0.193345, + -0.238123, + 0.261956, + 0.081961, + -0.49059, + -0.259896, + -0.187197, + -0.032457, + 0.049672, + 0.12171, + -0.105825, + -0.745416, + -0.795117, + -0.45044, + -0.514758, + -0.639992, + -0.329654, + -0.215191, + -0.37535, + -1.208597, + -1.064432, + -1.33837, + -1.405084, + -1.456743, + -1.299677, + -1.236958, + -0.482796, + -0.346327, + -0.689043, + -0.840409, + -1.16441, + -1.242295, + -1.794645 + ], + "z": [ + 0.428751, + 0.449488, + 0.769481, + 1.023915, + 0.752397, + 1.389489, + 1.098527, + 0.760376, + 0.631279, + 0.254462, + 0.151225, + -0.160235, + -0.56967, + -0.795403, + -0.744953, + -0.820339, + -0.791839, + -0.96783, + -0.65142, + -0.66108, + -0.126488, + 0.114152, + 0.417303, + 0.615544, + 0.385185, + 0.186861, + -0.0858, + -0.120976, + -0.035002, + -0.309909, + -0.208439, + -0.485355, + -0.734185, + -0.574637, + -1.004597, + -1.250838, + -1.174746, + -1.376205, + -1.528117, + -1.501028, + -1.605397, + -1.875326, + -2.069439, + -2.138976, + -2.29942, + -2.245133, + -2.82832, + -2.812268, + -2.873087, + -2.758474, + -3.020816, + -3.604322, + -3.369023, + -3.394583, + -3.29579, + -3.038195, + -3.646896, + -3.52345, + -3.273344, + -3.081451, + -2.701675, + -2.718267, + -2.875416, + -2.909034, + -3.011479, + -2.79574, + -2.430246, + -2.166711, + -2.143549, + -2.218529, + -2.173249, + -1.838208, + -1.613949, + -1.208869, + -0.792615, + -1.164745, + -1.080368, + -1.08692, + -0.878417, + -0.562867, + -0.599801, + -0.508419, + -0.672436, + -0.829762, + -0.596751, + -0.554818, + -0.556275, + -0.494078, + -0.238343, + -0.335621, + 0.028875, + 0.10227, + 0.31525, + 0.164532, + -0.462431, + -0.492473, + -0.344744, + -0.537114, + -0.476395, + -0.288381 + ] + } + ], + "layout": { + "scene": { + "bgcolor": "lightblue" + }, + "margin": { + "t": 25, + "b": 25, + "l": 25, + "r": 25 + }, + "width": 500, + "height": 500 + } +} diff --git a/test/image/mocks/z-legend-row-group-height.json b/test/image/mocks/legend-row-group-height.json similarity index 100% rename from test/image/mocks/z-legend-row-group-height.json rename to test/image/mocks/legend-row-group-height.json diff --git a/test/image/mocks/z-pie_negative_values.json b/test/image/mocks/pie_negative_values.json similarity index 100% rename from test/image/mocks/z-pie_negative_values.json rename to test/image/mocks/pie_negative_values.json diff --git a/test/image/mocks/z-scatter_fill_pattern.json b/test/image/mocks/scatter_fill_pattern.json similarity index 100% rename from test/image/mocks/z-scatter_fill_pattern.json rename to test/image/mocks/scatter_fill_pattern.json