diff --git a/melt.html b/melt.html index b602b63..d63afac 100644 --- a/melt.html +++ b/melt.html @@ -5,9 +5,9 @@ window.addEventListener( 'load', function () { addBoxes( 'First', 1, 0, 1, 0, - 'Last', 2, 0, 2, 0, - 'variable', -1000, 0, 3, 0, - 'value', -1000, 0, 4, 0, + 'Last', 2, 0, 2, 0, { w1 : 2, w2 : 2 }, + 'variable', -1000, 0, 4, 0, + 'value', -1000, 0, 5, 0, '', 0, 0, 0, 0, '3', 0, 3, 0, 4, '4', 0, 3, 0, 5, @@ -21,15 +21,15 @@ ); setColor( '#ffdddd' ); addBoxes( - 'SAT', 3, 0, 3, 1, - 'SAT', 3, 0, 3, 2, - 'SAT', 3, 0, 3, 3, - 'ACT', 4, 0, 3, 4, - 'ACT', 4, 0, 3, 5, - 'ACT', 4, 0, 3, 6, - 'GPA', 5, 0, 3, 7, - 'GPA', 5, 0, 3, 8, - 'GPA', 5, 0, 3, 9, + 'SAT', 4, 0, 4, 1, + 'SAT', 4, 0, 4, 2, + 'SAT', 4, 0, 4, 3, + 'ACT', 5, 0, 4, 4, + 'ACT', 5, 0, 4, 5, + 'ACT', 5, 0, 4, 6, + 'GPA', 6, 0, 4, 7, + 'GPA', 6, 0, 4, 8, + 'GPA', 6, 0, 4, 9, ); setColor( '#dddddd' ); addBoxes( @@ -45,33 +45,33 @@ ); setColor( '#dddddd' ); addBoxes( - 'Smith', 2, 1, 2, 1, - 'Sully', 2, 2, 2, 2, - 'Smart', 2, 3, 2, 3, - 'Smith', 2, 1, 2, 4, - 'Sully', 2, 2, 2, 5, - 'Smart', 2, 3, 2, 6, - 'Smith', 2, 1, 2, 7, - 'Sully', 2, 2, 2, 8, - 'Smart', 2, 3, 2, 9, + 'Smith', 2, 1, 2, 1, { w1 : 2, w2 : 2 }, + 'Sully', 2, 2, 2, 2, { w1 : 2, w2 : 2 }, + 'Smart', 2, 3, 2, 3, { w1 : 2, w2 : 2 }, + 'Smith', 2, 1, 2, 4, { w1 : 2, w2 : 2 }, + 'Sully', 2, 2, 2, 5, { w1 : 2, w2 : 2 }, + 'Smart', 2, 3, 2, 6, { w1 : 2, w2 : 2 }, + 'Smith', 2, 1, 2, 7, { w1 : 2, w2 : 2 }, + 'Sully', 2, 2, 2, 8, { w1 : 2, w2 : 2 }, + 'Smart', 2, 3, 2, 9, { w1 : 2, w2 : 2 }, ); setColor( '#ddddff' ); addBoxes( - '123', 3, 1, 4, 1, - '234', 3, 2, 4, 2, - '345', 3, 3, 4, 3 + '123', 4, 1, 5, 1, + '234', 4, 2, 5, 2, + '345', 4, 3, 5, 3 ); setColor( '#ddffdd' ); addBoxes( - '456', 4, 1, 4, 4, - '567', 4, 2, 4, 5, - '678', 4, 3, 4, 6 + '456', 5, 1, 5, 4, + '567', 5, 2, 5, 5, + '678', 5, 3, 5, 6 ); setColor( '#ffffdd' ); addBoxes( - '2.0', 5, 1, 4, 7, - '3.0', 5, 2, 4, 8, - '4.0', 5, 3, 4, 9 + '2.0', 6, 1, 5, 7, + '3.0', 6, 2, 5, 8, + '4.0', 6, 3, 5, 9 ); } ); diff --git a/pivot-table.html b/pivot-table.html index 2bc4886..51c8692 100644 --- a/pivot-table.html +++ b/pivot-table.html @@ -5,14 +5,14 @@ window.addEventListener( 'load', function () { addBoxes( 'First', 1, 0, 0, 2, - 'Last', 2, 0, 1, 2, - 'Customer', 3, 0, 1, 1, - 'Sale', 4, 0, 2, 0, { w2 : 2 }, + 'Last', 2, 0, 1, 2, { w1 : 2, w2 : 2 }, + 'Customer', 4, 0, 1, 1, { w1 : 2, w2 : 2 }, + 'Sale', 6, 0, 3, 0, { w2 : 4 }, '', 0, 0, -1000, 0, - '', -1000, 0, 2, 2, - '', -1000, 0, 3, 2, + '', -1000, 0, 3, 2, { w2 : 2 }, + '', -1000, 0, 5, 2, { w2 : 2 }, '', -1000, 0, 0, 0, - '', -1000, 0, 1, 0, + '', -1000, 0, 1, 0, { w2 : 2 }, '', -1000, 0, 0, 1, '0', 0, 1, -1000, 1, '1', 0, 2, -1000, 1, @@ -23,38 +23,38 @@ ); setColor( '#dddddd' ); addBoxes( - 'Abe', 1, 1, 0, 3, - 'Abe', 1, 2, 0, 3, - 'Abe', 1, 3, 0, 3, - 'Amy', 1, 4, 0, 4, - 'Amy', 1, 5, 0, 4, - 'Amy', 1, 6, 0, 4, + 'Amy', 1, 1, 0, 3, + 'Amy', 1, 2, 0, 3, + 'Amy', 1, 3, 0, 3, + 'Bob', 1, 4, 0, 4, + 'Bob', 1, 5, 0, 4, + 'Bob', 1, 6, 0, 4, ); addBoxes( - 'Axel', 2, 1, 1, 3, - 'Axel', 2, 2, 1, 3, - 'Axel', 2, 3, 1, 3, - 'Arnt', 2, 4, 1, 4, - 'Arnt', 2, 5, 1, 4, - 'Arnt', 2, 6, 1, 4, + 'Smith', 2, 1, 1, 3, { w1 : 2, w2 : 2 }, + 'Smith', 2, 2, 1, 3, { w1 : 2, w2 : 2 }, + 'Smith', 2, 3, 1, 3, { w1 : 2, w2 : 2 }, + 'Jones', 2, 4, 1, 4, { w1 : 2, w2 : 2 }, + 'Jones', 2, 5, 1, 4, { w1 : 2, w2 : 2 }, + 'Jones', 2, 6, 1, 4, { w1 : 2, w2 : 2 }, ); setColor( '#ddddff' ); addBoxes( - 'X Co.', 3, 1, 2, 1, - 'Y Inc.', 3, 2, 3, 1, - 'X Co.', 3, 3, 2, 1, - 'Y Inc.', 3, 4, 3, 1, - 'X Co.', 3, 5, 2, 1, - 'Y Inc.', 3, 6, 3, 1, + 'Facebook', 4, 1, 3, 1, { w1 : 2, w2 : 2 }, + 'Amazon', 4, 2, 5, 1, { w1 : 2, w2 : 2 }, + 'Facebook', 4, 3, 3, 1, { w1 : 2, w2 : 2 }, + 'Amazon', 4, 4, 5, 1, { w1 : 2, w2 : 2 }, + 'Facebook', 4, 5, 3, 1, { w1 : 2, w2 : 2 }, + 'Amazon', 4, 6, 5, 1, { w1 : 2, w2 : 2 }, ); setColor( '#ddffdd' ); addBoxes( - '39', 4, 1, 2, 3, - '68', 4, 2, 3, 3, - '10', 4, 3, 2, 3, - '93', 4, 4, 3, 4, - '85', 4, 5, 2, 4, - '0', 4, 6, 3, 4, + '39', 6, 1, 3, 3, { w2 : 2 }, + '68', 6, 2, 5, 3, { w2 : 2 }, + '10', 6, 3, 3, 3, { w2 : 2 }, + '93', 6, 4, 5, 4, { w2 : 2 }, + '85', 6, 5, 3, 4, { w2 : 2 }, + '20', 6, 6, 5, 4, { w2 : 2 }, ); } ); diff --git a/pivot.html b/pivot.html index db3feb8..f93d5ba 100644 --- a/pivot.html +++ b/pivot.html @@ -4,46 +4,46 @@ diff --git a/stack-0.html b/stack-0.html index e2f7d5e..187a386 100644 --- a/stack-0.html +++ b/stack-0.html @@ -4,56 +4,56 @@ diff --git a/stack-1.html b/stack-1.html index a49db44..db0707b 100644 --- a/stack-1.html +++ b/stack-1.html @@ -4,58 +4,58 @@