Skip to content

Fix clean2dArray for categorial x/y with extra items #4038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2019
Merged

Fix clean2dArray for categorial x/y with extra items #4038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/traces/heatmap/clean_2d_array.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ module.exports = function clean2dArray(zOld, trace, xa, ya) {
for(i = 0; i < zOld.length; i++) rowlen = Math.max(rowlen, zOld[i].length);
if(rowlen === 0) return false;
getCollen = function(zOld) { return zOld.length; };
old2new = function(zOld, i, j) { return zOld[j][i]; };
old2new = function(zOld, i, j) { return (zOld[j] || [])[i]; };
} else {
rowlen = zOld.length;
getCollen = function(zOld, i) { return zOld[i].length; };
old2new = function(zOld, i, j) { return zOld[i][j]; };
old2new = function(zOld, i, j) { return (zOld[i] || [])[j]; };
}

var padOld2new = function(zOld, i, j) {
Expand Down Expand Up @@ -58,9 +58,9 @@ module.exports = function clean2dArray(zOld, trace, xa, ya) {
var xMap = axisMapping(xa);
var yMap = axisMapping(ya);

if(ya && ya.type === 'category') rowlen = ya._categories.length;
var zNew = new Array(rowlen);

if(ya && ya.type === 'category') rowlen = ya._categories.length;
for(i = 0; i < rowlen; i++) {
if(xa && xa.type === 'category') {
collen = xa._categories.length;
Expand Down
78 changes: 77 additions & 1 deletion test/jasmine/tests/heatmap_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ var destroyGraphDiv = require('../assets/destroy_graph_div');
var supplyAllDefaults = require('../assets/supply_defaults');
var failTest = require('../assets/fail_test');


describe('heatmap supplyDefaults', function() {
'use strict';

Expand Down Expand Up @@ -542,6 +541,83 @@ describe('heatmap calc', function() {
expect(out.z[0][0]).toEqual(0);
});
});

describe('should clean z array linked to category x/y coordinates', function() {
var z = [
[1, 20, 30, 50, 1],
[20, 1, 60, 80, 30],
[30, 60, 1, -10, 20]
];

it('- base case', function() {
var out = _calc({
z: z,
x: ['a', 'b', 'c', 'd', 'f'],
y: ['A', 'B', 'C']
});
expect(out.z).toBeCloseTo2DArray([
[1, 20, 30, 50, 1],
[20, 1, 60, 80, 30],
[30, 60, 1, -10, 20]
]);
});

it('- with extra x items', function() {
var out = _calc({
z: z,
x: ['a', 'b', 'c', 'd', 'f', ''],
y: ['A', 'B', 'C']
});
expect(out.z).toBeCloseTo2DArray([
[1, 20, 30, 50, 1, undefined],
[20, 1, 60, 80, 30, undefined],
[30, 60, 1, -10, 20, undefined]
]);
});

it('- with extra y items', function() {
var out = _calc({
z: z,
x: ['a', 'b', 'c', 'd', 'f'],
y: ['A', 'B', 'C', '']
});
expect(out.z).toBeCloseTo2DArray([
[1, 20, 30, 50, 1],
[20, 1, 60, 80, 30],
[30, 60, 1, -10, 20],
new Array(5)
]);
});

it('- with extra x and y items', function() {
var out = _calc({
z: z,
x: ['a', 'b', 'c', 'd', 'f', ''],
y: ['A', 'B', 'C', '']
});
expect(out.z).toBeCloseTo2DArray([
[1, 20, 30, 50, 1, undefined],
[20, 1, 60, 80, 30, undefined],
[30, 60, 1, -10, 20, undefined],
new Array(6)
]);
});

it('- transposed, with extra x and y items', function() {
var out = _calc({
transpose: true,
z: z,
x: ['a', 'b', 'c', 'd', 'f', ''],
y: ['A', 'B', 'C', '']
});
expect(out.z).toBeCloseTo2DArray([
[1, 20, 30, undefined, undefined, undefined],
[20, 1, 60, undefined, undefined, undefined],
[30, 60, 1, undefined, undefined, undefined],
[50, 80, -10, undefined, undefined, undefined]
]);
});
});
});

describe('heatmap plot', function() {
Expand Down