Skip to content
This repository has been archived by the owner on Jul 15, 2022. It is now read-only.

Commit

Permalink
remove the render prefix from render function names. (#59)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tafsiri
tafsiri committed Mar 6, 2019
1 parent 3a385f8 commit 535d16e
Show file tree
Hide file tree
Showing 20 changed files with 100 additions and 100 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tensorflow/tfjs-vis",
"version": "1.0.0",
"version": "1.0.1",
"description": "Utilities for in browser visualization with TensorFlow.js",
"repository": "https://github.com/tensorflow/tfjs-vis",
"license": "Apache-2.0",
Expand Down
32 changes: 16 additions & 16 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@
* =============================================================================
*/

import {renderBarchart} from './render/barchart';
import {renderConfusionMatrix} from './render/confusion_matrix';
import {renderHeatmap} from './render/heatmap';
import {renderHistogram} from './render/histogram';
import {renderLinechart} from './render/linechart';
import {renderScatterplot} from './render/scatterplot';
import {renderTable} from './render/table';
import {barchart} from './render/barchart';
import {confusionMatrix} from './render/confusion_matrix';
import {heatmap} from './render/heatmap';
import {histogram} from './render/histogram';
import {linechart} from './render/linechart';
import {scatterplot} from './render/scatterplot';
import {table} from './render/table';
import {fitCallbacks, history} from './show/history';
import {layer, modelSummary} from './show/model';
import {showPerClassAccuracy} from './show/quality';
import {valuesDistribution} from './show/tensor';
import {accuracy, confusionMatrix, perClassAccuracy} from './util/math';
import {accuracy, confusionMatrix as metricsConfusionMatrix, perClassAccuracy} from './util/math';

const render = {
barchart: renderBarchart,
table: renderTable,
histogram: renderHistogram,
linechart: renderLinechart,
scatterplot: renderScatterplot,
confusionMatrix: renderConfusionMatrix,
heatmap: renderHeatmap,
barchart,
table,
histogram,
linechart,
scatterplot,
confusionMatrix,
heatmap,
};

const metrics = {
accuracy,
perClassAccuracy,
confusionMatrix,
confusionMatrix: metricsConfusionMatrix,
};

const show = {
Expand Down
2 changes: 1 addition & 1 deletion src/render/barchart.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import {getDrawArea, nextFrame, shallowEquals} from './render_utils';
*
*/
/** @doc {heading: 'Charts', namespace: 'render'} */
export async function renderBarchart(
export async function barchart(
container: Drawable, data: Array<{index: number; value: number;}>,
opts: VisOptions = {}): Promise<void> {
const drawArea = getDrawArea(container);
Expand Down
16 changes: 8 additions & 8 deletions src/render/barchart_test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* =============================================================================
*/

import {renderBarchart} from './barchart';
import {barchart} from './barchart';

describe('renderBarChart', () => {
let pixelRatio: number;
Expand All @@ -33,7 +33,7 @@ describe('renderBarChart', () => {
];

const container = document.getElementById('container') as HTMLElement;
await renderBarchart(container, data);
await barchart(container, data);

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});
Expand All @@ -47,10 +47,10 @@ describe('renderBarChart', () => {

const container = document.getElementById('container') as HTMLElement;

await renderBarchart(container, data);
await barchart(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);

await renderBarchart(container, data);
await barchart(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});

Expand All @@ -63,7 +63,7 @@ describe('renderBarChart', () => {

const container = document.getElementById('container') as HTMLElement;

await renderBarchart(container, data);
await barchart(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);

data = [
Expand All @@ -72,7 +72,7 @@ describe('renderBarChart', () => {
{index: 2, value: 150},
];

await renderBarchart(container, data);
await barchart(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});

Expand All @@ -84,7 +84,7 @@ describe('renderBarChart', () => {
];

const container = document.getElementById('container') as HTMLElement;
await renderBarchart(container, data, {width: 400});
await barchart(container, data, {width: 400});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
expect(document.querySelectorAll('canvas').length).toBe(1);
Expand All @@ -99,7 +99,7 @@ describe('renderBarChart', () => {
];

const container = document.getElementById('container') as HTMLElement;
await renderBarchart(container, data, {height: 200});
await barchart(container, data, {height: 200});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
expect(document.querySelectorAll('canvas').length).toBe(1);
Expand Down
2 changes: 1 addition & 1 deletion src/render/confusion_matrix.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ import {getDrawArea} from './render_utils';
*
*/
/** @doc {heading: 'Charts', namespace: 'render'} */
export async function renderConfusionMatrix(
export async function confusionMatrix(
container: Drawable, data: ConfusionMatrixData,
opts: VisOptions&
{shadeDiagonal?: boolean, showTextOverlay?: boolean} = {}): Promise<void> {
Expand Down
16 changes: 8 additions & 8 deletions src/render/confusion_matrix_test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import {ConfusionMatrixData} from '../types';

import {renderConfusionMatrix} from './confusion_matrix';
import {confusionMatrix} from './confusion_matrix';

describe('renderConfusionMatrix', () => {
let pixelRatio: number;
Expand All @@ -34,7 +34,7 @@ describe('renderConfusionMatrix', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderConfusionMatrix(container, data);
await confusionMatrix(container, data);

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});
Expand All @@ -46,7 +46,7 @@ describe('renderConfusionMatrix', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderConfusionMatrix(container, data, {shadeDiagonal: true});
await confusionMatrix(container, data, {shadeDiagonal: true});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});
Expand All @@ -58,7 +58,7 @@ describe('renderConfusionMatrix', () => {

const container = document.getElementById('container') as HTMLElement;

await renderConfusionMatrix(container, data);
await confusionMatrix(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});

Expand All @@ -70,15 +70,15 @@ describe('renderConfusionMatrix', () => {

const container = document.getElementById('container') as HTMLElement;

await renderConfusionMatrix(container, data);
await confusionMatrix(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);

data = {
values: [[43, 2, 8], [1, 7, 2], [3, 3, 20]],
tickLabels: ['cheese', 'pig', 'font'],
};

await renderConfusionMatrix(container, data);
await confusionMatrix(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});

Expand All @@ -89,7 +89,7 @@ describe('renderConfusionMatrix', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderConfusionMatrix(container, data, {width: 400});
await confusionMatrix(container, data, {width: 400});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
expect(document.querySelectorAll('canvas').length).toBe(1);
Expand All @@ -103,7 +103,7 @@ describe('renderConfusionMatrix', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderConfusionMatrix(container, data, {height: 200});
await confusionMatrix(container, data, {height: 200});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
expect(document.querySelectorAll('canvas').length).toBe(1);
Expand Down
2 changes: 1 addition & 1 deletion src/render/heatmap.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ import {getDrawArea} from './render_utils';
*
*/
/** @doc {heading: 'Charts', namespace: 'render'} */
export async function renderHeatmap(
export async function heatmap(
container: Drawable, data: HeatmapData,
opts: HeatmapOptions = {}): Promise<void> {
const options = Object.assign({}, defaultOpts, opts);
Expand Down
22 changes: 11 additions & 11 deletions src/render/heatmap_test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import * as tf from '@tensorflow/tfjs';

import {HeatmapData} from '../types';

import {renderHeatmap} from './heatmap';
import {heatmap} from './heatmap';

describe('renderHeatmap', () => {
let pixelRatio: number;
Expand All @@ -35,7 +35,7 @@ describe('renderHeatmap', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderHeatmap(container, data);
await heatmap(container, data);

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});
Expand All @@ -47,7 +47,7 @@ describe('renderHeatmap', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderHeatmap(container, data);
await heatmap(container, data);

expect(document.querySelectorAll('.vega-embed').length).toBe(1);

Expand All @@ -65,7 +65,7 @@ describe('renderHeatmap', () => {
let threw = false;
try {
// @ts-ignore — passing in the wrong datatype
await renderHeatmap(data, container);
await heatmap(data, container);
} catch (e) {
threw = true;
} finally {
Expand All @@ -80,7 +80,7 @@ describe('renderHeatmap', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderHeatmap(container, data, {colorMap: 'greyscale'});
await heatmap(container, data, {colorMap: 'greyscale'});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});
Expand All @@ -91,7 +91,7 @@ describe('renderHeatmap', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderHeatmap(container, data, {domain: [0, 30]});
await heatmap(container, data, {domain: [0, 30]});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});
Expand All @@ -104,7 +104,7 @@ describe('renderHeatmap', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderHeatmap(container, data);
await heatmap(container, data);

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});
Expand All @@ -116,14 +116,14 @@ describe('renderHeatmap', () => {

const container = document.getElementById('container') as HTMLElement;

await renderHeatmap(container, data);
await heatmap(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);

data = {
values: [[43, 2, 8], [1, 7, 2], [3, 3, 20]],
};

await renderHeatmap(container, data);
await heatmap(container, data);
expect(document.querySelectorAll('.vega-embed').length).toBe(1);
});

Expand All @@ -133,7 +133,7 @@ describe('renderHeatmap', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderHeatmap(container, data, {width: 400});
await heatmap(container, data, {width: 400});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
expect(document.querySelectorAll('canvas').length).toBe(1);
Expand All @@ -146,7 +146,7 @@ describe('renderHeatmap', () => {
};

const container = document.getElementById('container') as HTMLElement;
await renderHeatmap(container, data, {height: 200});
await heatmap(container, data, {height: 200});

expect(document.querySelectorAll('.vega-embed').length).toBe(1);
expect(document.querySelectorAll('canvas').length).toBe(1);
Expand Down
6 changes: 3 additions & 3 deletions src/render/histogram.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {HistogramOpts, HistogramStats, TypedArray} from '../types';
import {subSurface} from '../util/dom';
import {arrayStats} from '../util/math';

import {renderTable} from './table';
import {table} from './table';

const defaultOpts = {
maxBins: 12,
Expand Down Expand Up @@ -69,7 +69,7 @@ const defaultOpts = {
*
*/
/** @doc {heading: 'Charts', namespace: 'render'} */
export async function renderHistogram(
export async function histogram(
container: HTMLElement, data: Array<{value: number}>|number[]|TypedArray,
opts: HistogramOpts = {}) {
const values = prepareData(data);
Expand Down Expand Up @@ -209,7 +209,7 @@ function renderStats(
vals.push(`${format(stats.numInfs)} ${infPct}`);
}

renderTable(container, {headers, values: [vals]}, opts);
table(container, {headers, values: [vals]}, opts);
}

/**
Expand Down
Loading

0 comments on commit 535d16e

Please sign in to comment.