Skip to content

More indexToPoints #2162

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 2 commits into from
Nov 16, 2017
Merged

More indexToPoints #2162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
044ea96
add indexToPoints to sort transforms
etpinard Nov 15, 2017
8de50dc
add indexToPoints to groupby transforms
etpinard Nov 15, 2017
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
13 changes: 13 additions & 0 deletions src/transforms/groupby.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
var Lib = require('../lib');
var PlotSchema = require('../plot_api/plot_schema');
var Plots = require('../plots/plots');
var pointsAccessorFunction = require('./helpers').pointsAccessorFunction;

exports.moduleType = 'transform';

Expand Down Expand Up @@ -161,6 +162,7 @@ function transformOne(trace, state) {

var opts = state.transform;
var groups = trace.transforms[state.transformIndex].groups;
var originalPointsAccessor = pointsAccessorFunction(trace.transforms, opts);

if(!(Array.isArray(groups)) || groups.length === 0) {
return [trace];
Expand All @@ -184,14 +186,17 @@ function transformOne(trace, state) {

// An index to map group name --> expanded trace index
var indexLookup = {};
var indexCnts = {};

for(i = 0; i < groupNames.length; i++) {
groupName = groupNames[i];
indexLookup[groupName] = i;
indexCnts[groupName] = 0;

// Start with a deep extend that just copies array references.
newTrace = newData[i] = Lib.extendDeepNoArrays({}, trace);
newTrace._group = groupName;
newTrace.transforms[state.transformIndex]._indexToPoints = {};

var suppliedName = null;
if(groupNameObj) {
Expand Down Expand Up @@ -246,6 +251,14 @@ function transformOne(trace, state) {
}
}

for(j = 0; j < len; j++) {
newTrace = newData[indexLookup[groups[j]]];

var indexToPoints = newTrace.transforms[state.transformIndex]._indexToPoints;
indexToPoints[indexCnts[groups[j]]] = originalPointsAccessor(j);
indexCnts[groups[j]]++;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat idea!

}

for(i = 0; i < groupNames.length; i++) {
groupName = groupNames[i];
newTrace = newData[i];
Expand Down
3 changes: 3 additions & 0 deletions test/jasmine/tests/transform_groupby_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ describe('groupby', function() {
expect(gd._fullData.length).toEqual(2);
expect(gd._fullData[0].x).toEqual([1, -1, 0, 3]);
expect(gd._fullData[0].y).toEqual([1, 2, 1, 1]);
expect(gd._fullData[0].transforms[0]._indexToPoints).toEqual({0: [0], 1: [1], 2: [3], 3: [6]});
expect(gd._fullData[1].x).toEqual([-2, 1, 2]);
expect(gd._fullData[1].y).toEqual([3, 2, 3]);
expect(gd._fullData[1].transforms[0]._indexToPoints).toEqual({0: [2], 1: [4], 2: [5]});

assertDims([4, 3]);

Expand Down Expand Up @@ -460,6 +462,7 @@ describe('groupby', function() {
expect(gd._fullData[0].y).toEqual([0, 1, 3, 6]);
expect(gd._fullData[0].marker.line.width).toEqual([4, 2, 2, 3]);


expect(gd._fullData[1].ids).toEqual(['r', 'y', 'u']);
expect(gd._fullData[1].x).toEqual([-2, 1, 2]);
expect(gd._fullData[1].y).toEqual([2, 5, 4]);
Expand Down