Skip to content

Commit 96e1ed8

Browse files
archmojarchmoj
committed
simplify tests only keep raw results
1 parent 7311583 commit 96e1ed8

File tree

7 files changed

+49
-231
lines changed

7 files changed

+49
-231
lines changed

‎test/jasmine/performance_tests/bar_test.js

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ var writeRawDataAsCSV = require('./assets/post_process').writeRawDataAsCSV;
88
var gd = createGraphDiv();
99

1010
var tests = [{
11-
n: 1000, averageCap: 75
11+
n: 1000
1212
}, {
13-
n: 2000, averageCap: 100
13+
n: 2000
1414
}, {
15-
n: 4000, averageCap: 150
15+
n: 4000
1616
}, {
17-
n: 8000, averageCap: 300
17+
n: 8000
1818
}, {
19-
n: 16000, averageCap: 600
19+
n: 16000
2020
}, {
21-
n: 32000, averageCap: 1200
21+
n: 32000
2222
}, {
23-
n: 64000, averageCap: 2400
23+
n: 64000
2424
}];
2525

2626
tests.forEach(function(spec, index) {
@@ -65,45 +65,19 @@ tests.forEach(function(spec, index) {
6565
delay(100)().then(done);
6666
});
6767

68-
var maxDelta = 0;
69-
var aveDelta = 0;
70-
7168
samples.forEach(function(t) {
7269
it('should graph bar traces | turn: ' + t, function() {
7370
var delta = endTime - startTime;
7471

7572
if(t === 0) {
76-
// console.log('________________________________');
77-
// console.log('number of points: ' + spec.n);
78-
// console.log('expected average (cap): ' + spec.averageCap + ' ms');
79-
8073
tests[index].raw = [];
8174
}
8275
tests[index].raw[t] = delta;
8376

84-
if(t > 0) { // we skip the first run which is slow
85-
maxDelta = Math.max(maxDelta, delta);
86-
aveDelta += delta / nTimes;
87-
}
88-
89-
// console.log('turn: ' + t + ' | ' + delta + ' ms');
90-
91-
if(t === nTimes) {
92-
tests[index].average = aveDelta;
93-
tests[index].maximum = maxDelta;
94-
95-
// console.log('max: ' + maxDelta);
96-
// console.log('ave: ' + aveDelta);
97-
98-
// expect(aveDelta).toBeLessThan(spec.averageCap);
99-
}
100-
10177
var nodes = d3SelectAll('g.trace.bars');
10278
expect(nodes.size()).toEqual(1);
10379

10480
if(t === nTimes && index === tests.length - 1) {
105-
// console.log(JSON.stringify(tests, null, 2));
106-
10781
writeRawDataAsCSV('bar', tests);
10882
}
10983
});

‎test/jasmine/performance_tests/box_test.js

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ var writeRawDataAsCSV = require('./assets/post_process').writeRawDataAsCSV;
88
var gd = createGraphDiv();
99

1010
var tests = [{
11-
n: 1000, averageCap: 75
11+
n: 1000
1212
}, {
13-
n: 2000, averageCap: 100
13+
n: 2000
1414
}, {
15-
n: 4000, averageCap: 150
15+
n: 4000
1616
}, {
17-
n: 8000, averageCap: 300
17+
n: 8000
1818
}, {
19-
n: 16000, averageCap: 600
19+
n: 16000
2020
}, {
21-
n: 32000, averageCap: 1200
21+
n: 32000
2222
}, {
23-
n: 64000, averageCap: 2400
23+
n: 64000
2424
}];
2525

2626
tests.forEach(function(spec, index) {
@@ -66,45 +66,19 @@ tests.forEach(function(spec, index) {
6666
delay(100)().then(done);
6767
});
6868

69-
var maxDelta = 0;
70-
var aveDelta = 0;
71-
7269
samples.forEach(function(t) {
7370
it('should graph box traces | turn: ' + t, function() {
7471
var delta = endTime - startTime;
7572

7673
if(t === 0) {
77-
// console.log('________________________________');
78-
// console.log('number of points: ' + spec.n);
79-
// console.log('expected average (cap): ' + spec.averageCap + ' ms');
80-
8174
tests[index].raw = [];
8275
}
8376
tests[index].raw[t] = delta;
8477

85-
if(t > 0) { // we skip the first run which is slow
86-
maxDelta = Math.max(maxDelta, delta);
87-
aveDelta += delta / nTimes;
88-
}
89-
90-
// console.log('turn: ' + t + ' | ' + delta + ' ms');
91-
92-
if(t === nTimes) {
93-
tests[index].average = aveDelta;
94-
tests[index].maximum = maxDelta;
95-
96-
// console.log('max: ' + maxDelta);
97-
// console.log('ave: ' + aveDelta);
98-
99-
// expect(aveDelta).toBeLessThan(spec.averageCap);
100-
}
101-
10278
var nodes = d3SelectAll('g.trace.boxes');
10379
expect(nodes.size()).toEqual(1);
10480

10581
if(t === nTimes && index === tests.length - 1) {
106-
// console.log(JSON.stringify(tests, null, 2));
107-
10882
writeRawDataAsCSV('box', tests);
10983
}
11084
});

‎test/jasmine/performance_tests/contour_test.js

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ var writeRawDataAsCSV = require('./assets/post_process').writeRawDataAsCSV;
88
var gd = createGraphDiv();
99

1010
var tests = [{
11-
nx: 50, ny: 20, averageCap: 100
11+
nx: 50, ny: 20
1212
}, {
13-
nx: 100, ny: 40, averageCap: 125
13+
nx: 100, ny: 40
1414
}, {
15-
nx: 200, ny: 80, averageCap: 250
15+
nx: 200, ny: 80
1616
}, {
17-
nx: 400, ny: 160, averageCap: 500
17+
nx: 400, ny: 160
1818
}, {
19-
nx: 800, ny: 320, averageCap: 1000
19+
nx: 800, ny: 320
2020
}, {
21-
nx: 1600, ny: 640, averageCap: 2000
21+
nx: 1600, ny: 640
2222
}, {
23-
nx: 3200, ny: 1280, averageCap: 4000
23+
nx: 3200, ny: 1280
2424
}];
2525

2626
tests.forEach(function(spec, index) {
@@ -76,45 +76,19 @@ tests.forEach(function(spec, index) {
7676
delay(100)().then(done);
7777
});
7878

79-
var maxDelta = 0;
80-
var aveDelta = 0;
81-
8279
samples.forEach(function(t) {
8380
it('should graph contour traces | turn: ' + t, function() {
8481
var delta = endTime - startTime;
8582

8683
if(t === 0) {
87-
// console.log('________________________________');
88-
// console.log('number of points: ' + spec.n);
89-
// console.log('expected average (cap): ' + spec.averageCap + ' ms');
90-
9184
tests[index].raw = [];
9285
}
9386
tests[index].raw[t] = delta;
9487

95-
if(t > 0) { // we skip the first run which is slow
96-
maxDelta = Math.max(maxDelta, delta);
97-
aveDelta += delta / nTimes;
98-
}
99-
100-
// console.log('turn: ' + t + ' | ' + delta + ' ms');
101-
102-
if(t === nTimes) {
103-
tests[index].average = aveDelta;
104-
tests[index].maximum = maxDelta;
105-
106-
// console.log('max: ' + maxDelta);
107-
// console.log('ave: ' + aveDelta);
108-
109-
// expect(aveDelta).toBeLessThan(spec.averageCap);
110-
}
111-
11288
var nodes = d3SelectAll('g.contourlayer');
11389
expect(nodes.size()).toEqual(1);
11490

11591
if(t === nTimes && index === tests.length - 1) {
116-
// console.log(JSON.stringify(tests, null, 2));
117-
11892
writeRawDataAsCSV('contour', tests);
11993
}
12094
});

‎test/jasmine/performance_tests/heatmap_test.js

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ var writeRawDataAsCSV = require('./assets/post_process').writeRawDataAsCSV;
88
var gd = createGraphDiv();
99

1010
var tests = [{
11-
nx: 50, ny: 20, averageCap: 75
11+
nx: 50, ny: 20
1212
}, {
13-
nx: 100, ny: 40, averageCap: 100
13+
nx: 100, ny: 40
1414
}, {
15-
nx: 200, ny: 80, averageCap: 150
15+
nx: 200, ny: 80
1616
}, {
17-
nx: 400, ny: 160, averageCap: 300
17+
nx: 400, ny: 160
1818
}, {
19-
nx: 800, ny: 320, averageCap: 600
19+
nx: 800, ny: 320
2020
}, {
21-
nx: 1600, ny: 640, averageCap: 1200
21+
nx: 1600, ny: 640
2222
}, {
23-
nx: 3200, ny: 1280, averageCap: 2400
23+
nx: 3200, ny: 1280
2424
}];
2525

2626
tests.forEach(function(spec, index) {
@@ -76,45 +76,19 @@ tests.forEach(function(spec, index) {
7676
delay(100)().then(done);
7777
});
7878

79-
var maxDelta = 0;
80-
var aveDelta = 0;
81-
8279
samples.forEach(function(t) {
8380
it('should graph heatmap traces | turn: ' + t, function() {
8481
var delta = endTime - startTime;
8582

8683
if(t === 0) {
87-
// console.log('________________________________');
88-
// console.log('number of points: ' + spec.n);
89-
// console.log('expected average (cap): ' + spec.averageCap + ' ms');
90-
9184
tests[index].raw = [];
9285
}
9386
tests[index].raw[t] = delta;
9487

95-
if(t > 0) { // we skip the first run which is slow
96-
maxDelta = Math.max(maxDelta, delta);
97-
aveDelta += delta / nTimes;
98-
}
99-
100-
// console.log('turn: ' + t + ' | ' + delta + ' ms');
101-
102-
if(t === nTimes) {
103-
tests[index].average = aveDelta;
104-
tests[index].maximum = maxDelta;
105-
106-
// console.log('max: ' + maxDelta);
107-
// console.log('ave: ' + aveDelta);
108-
109-
// expect(aveDelta).toBeLessThan(spec.averageCap);
110-
}
111-
11288
var nodes = d3SelectAll('g.heatmaplayer');
11389
expect(nodes.size()).toEqual(1);
11490

11591
if(t === nTimes && index === tests.length - 1) {
116-
// console.log(JSON.stringify(tests, null, 2));
117-
11892
writeRawDataAsCSV('heatmap', tests);
11993
}
12094
});

‎test/jasmine/performance_tests/histogram_test.js

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ var writeRawDataAsCSV = require('./assets/post_process').writeRawDataAsCSV;
88
var gd = createGraphDiv();
99

1010
var tests = [{
11-
n: 1000, averageCap: 75
11+
n: 1000
1212
}, {
13-
n: 2000, averageCap: 100
13+
n: 2000
1414
}, {
15-
n: 4000, averageCap: 150
15+
n: 4000
1616
}, {
17-
n: 8000, averageCap: 300
17+
n: 8000
1818
}, {
19-
n: 16000, averageCap: 600
19+
n: 16000
2020
}, {
21-
n: 32000, averageCap: 1200
21+
n: 32000
2222
}, {
23-
n: 64000, averageCap: 2400
23+
n: 64000
2424
}];
2525

2626
tests.forEach(function(spec, index) {
@@ -65,45 +65,19 @@ tests.forEach(function(spec, index) {
6565
delay(100)().then(done);
6666
});
6767

68-
var maxDelta = 0;
69-
var aveDelta = 0;
70-
7168
samples.forEach(function(t) {
7269
it('should graph histogram traces | turn: ' + t, function() {
7370
var delta = endTime - startTime;
7471

7572
if(t === 0) {
76-
// console.log('________________________________');
77-
// console.log('number of points: ' + spec.n);
78-
// console.log('expected average (cap): ' + spec.averageCap + ' ms');
79-
8073
tests[index].raw = [];
8174
}
8275
tests[index].raw[t] = delta;
8376

84-
if(t > 0) { // we skip the first run which is slow
85-
maxDelta = Math.max(maxDelta, delta);
86-
aveDelta += delta / nTimes;
87-
}
88-
89-
// console.log('turn: ' + t + ' | ' + delta + ' ms');
90-
91-
if(t === nTimes) {
92-
tests[index].average = aveDelta;
93-
tests[index].maximum = maxDelta;
94-
95-
// console.log('max: ' + maxDelta);
96-
// console.log('ave: ' + aveDelta);
97-
98-
// expect(aveDelta).toBeLessThan(spec.averageCap);
99-
}
100-
10177
var nodes = d3SelectAll('g.trace.bars');
10278
expect(nodes.size()).toEqual(1);
10379

10480
if(t === nTimes && index === tests.length - 1) {
105-
// console.log(JSON.stringify(tests, null, 2));
106-
10781
writeRawDataAsCSV('histogram', tests);
10882
}
10983
});

0 commit comments

Comments
 (0)