Skip to content
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

Split distribution chart in 2. Fix colours #1388

Merged
merged 7 commits into from
Nov 19, 2022
Merged

Split distribution chart in 2. Fix colours #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d5b811
Split distribution chart in 2. Fix colours
Hazelfire Nov 15, 2022
bfcaebf
Remove unneccesary code from MultiDistributionChart
Hazelfire Nov 16, 2022
7ca6e5d
Refactor DistributionChart to use MultiDistributionChart
Hazelfire Nov 16, 2022
c591f7b
Add multiplot summary tables
Hazelfire Nov 16, 2022
7851e1e
Respond to review comments
Hazelfire Nov 18, 2022
0936045
Fix summary tables not showing
Hazelfire Nov 18, 2022
8ccf5dc
less intrusive errors in SummaryTable
berekuk Nov 19, 2022
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
223 changes: 23 additions & 200 deletions packages/components/src/components/DistributionChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,214 +1,37 @@
import * as React from "react";
import * as yup from "yup";
import { SqDistribution } from "@quri/squiggle-lang";
import {
SqDistribution,
result,
SqDistributionError,
resultMap,
SqRecord,
environment,
SqDistributionTag,
} from "@quri/squiggle-lang";
import { Vega } from "react-vega";
import { ErrorAlert } from "./Alert";
import { useMeasure } from "react-use";

import {
buildVegaSpec,
distributionChartSpecSchema,
} from "../lib/distributionSpecBuilder";
import { NumberShower } from "./NumberShower";
import { Plot, parsePlot } from "../lib/plotParser";
import { flattenResult } from "../lib/utility";
import { hasMassBelowZero } from "../lib/distributionUtils";

export const distributionSettingsSchema = yup
.object({})
.shape({
showSummary: yup.boolean().required().default(false),
vegaActions: yup.boolean().required().default(false),
})
.concat(distributionChartSpecSchema);
MultiDistributionChart,
MultiDistributionChartProps,
} from "./MultiDistributionChart";

export type DistributionChartSettings = yup.InferType<
typeof distributionSettingsSchema
>;
export { DistributionChartSettings } from "./MultiDistributionChart";

export type DistributionChartProps = {
plot: Plot;
environment: environment;
chartHeight?: number;
settings: DistributionChartSettings;
export type DistributionChartProps = Omit<
MultiDistributionChartProps,
"plot"
> & {
distribution: SqDistribution;
};

export function defaultPlot(distribution: SqDistribution): Plot {
return { distributions: [{ name: "default", distribution }] };
}

export function makePlot(record: SqRecord): Plot | void {
const plotResult = parsePlot(record);
if (plotResult.tag === "Ok") {
return plotResult.value;
}
}

export const DistributionChart: React.FC<DistributionChartProps> = ({
plot,
distribution,
environment,
chartHeight,
settings,
}) => {
const [containerRef, containerMeasure] = useMeasure<HTMLDivElement>();
const shapes = flattenResult(
plot.distributions.map((x) =>
resultMap(x.distribution.pointSet(environment), (pointSet) => ({
name: x.name,
// color: x.color, // not supported yet
...pointSet.asShape(),
}))
)
);

if (shapes.tag === "Error") {
return (
<ErrorAlert heading="Distribution Error">
{shapes.value.toString()}
</ErrorAlert>
);
}

// if this is a sample set, include the samples
const samples: number[] = [];
for (const { distribution } of plot?.distributions) {
if (distribution.tag === SqDistributionTag.SampleSet) {
samples.push(...distribution.value());
}
}

const domain = shapes.value.flatMap((shape) =>
shape.discrete.concat(shape.continuous)
);

const spec = buildVegaSpec({
...settings,
minX: Number.isFinite(settings.minX)
? settings.minX
: Math.min(...domain.map((x) => x.x)),
maxX: Number.isFinite(settings.maxX)
? settings.maxX
: Math.max(...domain.map((x) => x.x)),
maxY: Math.max(...domain.map((x) => x.y)),
});

const vegaData = { data: shapes.value, samples };

return (
<div ref={containerRef}>
{
settings.logX && shapes.value.some(hasMassBelowZero) ? (
<ErrorAlert heading="Log Domain Error">
Cannot graph distribution with negative values on logarithmic scale.
</ErrorAlert>
) : containerMeasure.width ? (
<Vega
spec={spec}
data={vegaData}
width={containerMeasure.width - 22}
height={chartHeight}
actions={settings.vegaActions}
/>
) : null /* width can be 0 initially or when we're on the server side; that's fine, we don't want to pre-render charts with broken width */
}
<div className="flex justify-center">
{settings.showSummary && plot.distributions.length === 1 && (
<SummaryTable
distribution={plot.distributions[0].distribution}
environment={environment}
/>
)}
</div>
</div>
);
};

const TableHeadCell: React.FC<{ children: React.ReactNode }> = ({
children,
}) => (
<th className="border border-slate-200 bg-slate-50 py-1 px-2 text-slate-500 font-semibold">
{children}
</th>
);

const Cell: React.FC<{ children: React.ReactNode }> = ({ children }) => (
<td className="border border-slate-200 py-1 px-2 text-slate-900">
{children}
</td>
);

type SummaryTableProps = {
distribution: SqDistribution;
environment: environment;
};

const SummaryTable: React.FC<SummaryTableProps> = ({
distribution,
environment,
}) => {
const mean = distribution.mean(environment);
const stdev = distribution.stdev(environment);
const p5 = distribution.inv(environment, 0.05);
const p10 = distribution.inv(environment, 0.1);
const p25 = distribution.inv(environment, 0.25);
const p50 = distribution.inv(environment, 0.5);
const p75 = distribution.inv(environment, 0.75);
const p90 = distribution.inv(environment, 0.9);
const p95 = distribution.inv(environment, 0.95);

const hasResult = (x: result<number, SqDistributionError>): boolean =>
x.tag === "Ok";

const unwrapResult = (
x: result<number, SqDistributionError>
): React.ReactNode => {
if (x.tag === "Ok") {
return <NumberShower number={x.value} />;
} else {
return (
<ErrorAlert heading="Distribution Error">
{x.value.toString()}
</ErrorAlert>
);
}
};

return (
<table className="border border-collapse border-slate-400">
<thead className="bg-slate-50">
<tr>
<TableHeadCell>{"Mean"}</TableHeadCell>
{hasResult(stdev) && <TableHeadCell>{"Stdev"}</TableHeadCell>}
<TableHeadCell>{"5%"}</TableHeadCell>
<TableHeadCell>{"10%"}</TableHeadCell>
<TableHeadCell>{"25%"}</TableHeadCell>
<TableHeadCell>{"50%"}</TableHeadCell>
<TableHeadCell>{"75%"}</TableHeadCell>
<TableHeadCell>{"90%"}</TableHeadCell>
<TableHeadCell>{"95%"}</TableHeadCell>
</tr>
</thead>
<tbody>
<tr>
<Cell>{unwrapResult(mean)}</Cell>
{hasResult(stdev) && <Cell>{unwrapResult(stdev)}</Cell>}
<Cell>{unwrapResult(p5)}</Cell>
<Cell>{unwrapResult(p10)}</Cell>
<Cell>{unwrapResult(p25)}</Cell>
<Cell>{unwrapResult(p50)}</Cell>
<Cell>{unwrapResult(p75)}</Cell>
<Cell>{unwrapResult(p90)}</Cell>
<Cell>{unwrapResult(p95)}</Cell>
</tr>
</tbody>
</table>
<MultiDistributionChart
plot={{
distributions: [
{ name: "default", distribution: distribution, opacity: 1 },
],
showLegend: false,
colorScheme: "blues",
}}
environment={environment}
chartHeight={chartHeight}
settings={settings}
/>
);
};
3 changes: 1 addition & 2 deletions packages/components/src/components/FunctionChart1Dist.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import * as percentilesSpec from "../vega-specs/spec-percentiles.json";
import {
DistributionChart,
DistributionChartSettings,
defaultPlot,
} from "./DistributionChart";
import { NumberShower } from "./NumberShower";
import { ErrorAlert } from "./Alert";
Expand Down Expand Up @@ -179,7 +178,7 @@ export const FunctionChart1Dist: React.FC<FunctionChart1DistProps> = ({
mouseItem.tag === "Ok" &&
mouseItem.value.tag === SqValueTag.Distribution ? (
<DistributionChart
plot={defaultPlot(mouseItem.value.value)}
distribution={mouseItem.value.value}
environment={environment}
chartHeight={50}
settings={distributionChartSettings}
Expand Down
Loading