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.

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

Group comparison view: update boxplot info in clinical tab #4924

Merged
merged 4 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions src/pages/groupComparison/ClinicalNumericalDataVisualisation.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import BoxScatterPlot, {
IBaseBoxScatterPlotPoint,
IBoxScatterPlotData,
IBoxScatterPlotProps,
toBoxPlotData,
toDataDescriptive,
} from 'shared/components/plots/BoxScatterPlot';
import { IBoxScatterPlotPoint } from 'shared/components/plots/PlotsTabUtils';
import React from 'react';
import { computed, makeObservable } from 'mobx';
import { SummaryStatisticsTable } from './SummaryStatisticsTable';
import { DescriptiveDataTable } from './SummaryStatisticsTable';

export enum ClinicalNumericalVisualisationType {
Plot = 'Plot',
Expand Down Expand Up @@ -43,9 +46,17 @@ export class ClinicalNumericalDataVisualisation extends React.Component<
this.props.excludeLimitValuesFromBoxPlot,
this.props.logScale
);
const dataDescription = toDataDescriptive(
this.props.data,
this.props.logScale
);
const groupLabels = this.props.data.map(d => d.label);
return (
<SummaryStatisticsTable data={groupStats} labels={groupLabels} />
<DescriptiveDataTable
dataBoxplot={groupStats}
labels={groupLabels}
descriptiveData={dataDescription}
/>
);
}

Expand Down
4 changes: 4 additions & 0 deletions src/pages/groupComparison/GroupComparisonUtils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ import {
import { GroupComparisonMutation } from 'shared/model/GroupComparisonMutation';
import { getTwoTailedPValue } from 'shared/lib/calculation/FisherExactTestCalculator';
import { calculateQValues } from 'shared/lib/calculation/BenjaminiHochbergFDRCalculator';
import {
IBaseBoxScatterPlotPoint,
IBoxScatterPlotData,
} from 'shared/components/plots/BoxScatterPlot';

type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;

Expand Down
109 changes: 108 additions & 1 deletion src/pages/groupComparison/SummaryStatisticsTable.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,31 @@
import { FunctionComponent } from 'react';
import _ from 'lodash';
import * as React from 'react';
import {
BoxModel,
IBoxScatterPlotData,
} from 'shared/components/plots/BoxScatterPlot';

type SummaryStatisticsTableProps = { data: any[]; labels: string[] };
type SummaryStatisticsTableProps = {
data: BoxModel[];
labels: string[];
};

type DescriptiveDataTableProps = {
descriptiveData: DataDescriptiveValues[];
dataBoxplot: BoxModel[];
labels: string[];
};

type DataDescriptiveValues = {
mad: number;
stdDeviation: number;
median: number;
mean: number;
count: number;
maximum: number;
minimum: number;
};

export const SummaryStatisticsTable: FunctionComponent<SummaryStatisticsTableProps> = (
props: SummaryStatisticsTableProps
Expand Down Expand Up @@ -53,3 +76,87 @@ export const SummaryStatisticsTable: FunctionComponent<SummaryStatisticsTablePro
</table>
);
};

export const DescriptiveDataTable: FunctionComponent<DescriptiveDataTableProps> = (
props: DescriptiveDataTableProps
) => {
const headers =
props.labels.length === 1 ? (
<th colSpan={2}>{props.labels[0]}</th>
) : (
[<th />, props.labels.map(label => <th colSpan={1}>{label}</th>)]
);
return (
<div>
<h3>Data description</h3>
<table
className="table table-striped"
style={{ minWidth: '400px' }}
>
<thead>
<tr>{headers}</tr>
</thead>
<tbody>
<tr>
<td>Count</td>
{props.descriptiveData.map((d, index) => (
<td key={index}>{d.count}</td>
))}
</tr>
<tr>
<td>Minimum</td>
{props.descriptiveData.map((d, index) => {
return <td key={index}>{_.round(d.minimum, 2)}</td>;
})}
</tr>
<tr>
<td>Maximum</td>
{props.descriptiveData.map((d, index) => {
return <td key={index}>{_.round(d.maximum, 2)}</td>;
})}
</tr>
<tr>
<td>Mean</td>
{props.descriptiveData.map((d, index) => {
return <td key={index}>{_.round(d.mean, 2)}</td>;
})}
</tr>
<tr>
<td>Standard Deviation</td>
{props.descriptiveData.map((d, index) => {
return (
<td key={index}>
{_.round(d.stdDeviation, 2)}
</td>
);
})}
</tr>
<tr>
<td>Median</td>
{props.descriptiveData.map((d, index) => {
return <td key={index}>{_.round(d.median, 2)}</td>;
})}
</tr>
<tr>
<td>Mean Absolute Deviation</td>
{props.descriptiveData.map((d, index) => {
return <td key={index}>{_.round(d.mad, 2)}</td>;
})}
</tr>
<tr>
<td>25% (q1)</td>
{props.dataBoxplot.map((d, index) => (
<td key={index}>{_.round(d.q1, 2)}</td>
))}
</tr>
<tr>
<td>75% (q3)</td>
{props.dataBoxplot.map((d, index) => (
<td key={index}>{_.round(d.q3, 2)}</td>
))}
</tr>
</tbody>
</table>
</div>
);
};
68 changes: 66 additions & 2 deletions src/shared/components/plots/BoxScatterPlot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export interface IBoxScatterPlotProps<D extends IBaseBoxScatterPlotPoint> {
qValue?: number | null;
}

type BoxModel = {
export type BoxModel = {
min: number;
max: number;
median: number;
Expand Down Expand Up @@ -957,7 +957,7 @@ export function toBoxPlotData<D extends IBaseBoxScatterPlotPoint>(
data: IBoxScatterPlotData<D>[],
boxCalculationFilter?: (d: D) => boolean,
excludeLimitValuesFromBoxPlot?: any,
logScale?: any,
logScale?: IAxisLogScaleParams,
calcBoxSizes?: (box: BoxModel, i: number) => void
) {
// when limit values are shown in the legend, exclude
Expand Down Expand Up @@ -1014,3 +1014,67 @@ export function toBoxPlotData<D extends IBaseBoxScatterPlotPoint>(
);
});
}

export function toDataDescriptive<D extends IBaseBoxScatterPlotPoint>(
data: IBoxScatterPlotData<D>[],
logScale?: IAxisLogScaleParams
) {
return data.map(d => {
const scatterValues = d.data.map(x =>
logScale ? logScale.fLogScale(x.value, 0) : x.value
);
const count = scatterValues.length;
// Calculate minimum and maximum
const minimum = Math.min(...scatterValues);
const maximum = Math.max(...scatterValues);
const mean = _.mean(scatterValues);

// Calculate standard deviation
const squaredDifferences = scatterValues.map((val: number) => {
const difference = val - mean;
return difference * difference;
});
const variance =
squaredDifferences.reduce(
(sum: number, val: number) => sum + val,
0
) / scatterValues.length;
const stdDeviation = Math.sqrt(variance);

// Calculate median
const scatterValuesSorted = scatterValues
.slice()
.sort((a: number, b: number) => a - b);
const mid = Math.floor(scatterValuesSorted.length / 2);
const median =
scatterValuesSorted.length % 2 !== 0
? scatterValuesSorted[mid]
: (scatterValuesSorted[mid - 1] + scatterValuesSorted[mid]) / 2;

// Calculate median absolute deviation (MAD)
const absoluteDeviations = scatterValues.map(val =>
Math.abs(val - median)
);
const absoluteDeviationsSorted = absoluteDeviations
.slice()
.sort((a, b) => a - b);
const madMid = Math.floor(absoluteDeviationsSorted.length / 2);
const mad =
absoluteDeviationsSorted.length % 2 !== 0
? absoluteDeviationsSorted[madMid]
: (absoluteDeviationsSorted[madMid - 1] +
absoluteDeviationsSorted[madMid]) /
2;

// Return an object with the descriptive statistics
return {
count,
minimum,
maximum,
mean,
stdDeviation,
median,
mad,
};
});
}