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

fix: confusion matrix for binary classification #72

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix: confusion matrix for binary classification #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 6 additions & 19 deletions src/app/api.schema.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ export interface components {
test?: components["schemas"]["Scores"][];
crossValidation?: components["schemas"]["Scores"][];
};
extraConfig?: components["schemas"]["ModelExtraConfig"];
/**
* Format: date-time
* @description The date and time when the feature was created.
Expand Down Expand Up @@ -291,6 +290,7 @@ export interface components {
};
RegressionScores: {
yName: string;
folds?: number;
/** Format: float */
r2?: number;
/** Format: float */
Expand All @@ -311,6 +311,7 @@ export interface components {
BinaryClassificationScores: {
labels?: string[];
yName: string;
folds?: number;
/** Format: float */
accuracy?: number;
/** Format: float */
Expand All @@ -326,6 +327,7 @@ export interface components {
MulticlassClassificationScores: {
labels?: string[];
yName: string;
folds?: number;
/** Format: float */
accuracy?: number;
/** Format: float */
Expand All @@ -349,14 +351,6 @@ export interface components {
};
/** @enum {string} */
ModelType: "SKLEARN" | "TORCH_ONNX" | "TORCHSCRIPT" | "R_BNLEARN_DISCRETE" | "R_CARET" | "R_GBM" | "R_NAIVE_BAYES" | "R_PBPK" | "R_RF" | "R_RPART" | "R_SVM" | "R_TREE_CLASS" | "R_TREE_REGR" | "QSAR_TOOLBOX_CALCULATOR" | "QSAR_TOOLBOX_QSAR_MODEL" | "QSAR_TOOLBOX_PROFILER";
/** @description A JSON object containing extra configuration for the model */
ModelExtraConfig: {
torchConfig?: {
[key: string]: components["schemas"]["AnyValue"];
};
preprocessors?: components["schemas"]["Transformer"][];
featurizers?: components["schemas"]["Transformer"][];
};
/** @description A preprocessor for the model */
Transformer: {
/** Format: int64 */
Expand Down Expand Up @@ -416,8 +410,9 @@ export interface components {
/** Format: int64 */
id?: number;
method: components["schemas"]["DoaMethod"];
/** @description The doa calculated data */
data: components["schemas"]["LeverageDoa"] | components["schemas"]["BoundingBoxDoa"] | components["schemas"]["KernelBasedDoa"] | components["schemas"]["MeanVarDoa"] | components["schemas"]["MahalanobisDoa"] | components["schemas"]["CityBlockDoa"];
data: {
[key: string]: components["schemas"]["AnyValue"];
};
/**
* Format: date-time
* @description The date and time when the feature was created.
Expand Down Expand Up @@ -679,10 +674,6 @@ export interface components {
torchConfig?: {
[key: string]: components["schemas"]["AnyValue"];
} | null;
/** @description Additional configuration settings, optional */
extraConfig?: {
[key: string]: components["schemas"]["AnyValue"];
} | null;
/** @description Legacy additional information settings, optional */
legacyAdditionalInfo?: {
[key: string]: components["schemas"]["AnyValue"];
Expand All @@ -693,10 +684,6 @@ export interface components {
PredictionRequest: {
model: components["schemas"]["PredictionModel"];
dataset: components["schemas"]["Dataset"];
/** @description Optional configuration for additional settings. */
extraConfig?: {
[key: string]: components["schemas"]["AnyValue"];
};
};
PredictionResponse: {
predictions: components["schemas"]["AnyValue"][];
Expand Down
12 changes: 11 additions & 1 deletion src/app/dashboard/models/[modelId]/components/scores/BinaryClassificationScoreCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ interface BinaryClassificationScoreCardProps {
score: BinaryClassificationDto;
}

function transposeMatrix(matrix: number[][]) {
return matrix[0].map((col, i) => matrix.map((row) => row[i]));
}

export default function BinaryClassificationScoreCard({
score,
}: BinaryClassificationScoreCardProps) {
Expand Down Expand Up @@ -37,7 +41,13 @@ export default function BinaryClassificationScoreCard({
<b>matthewsCorrCoef</b>: {score!.matthewsCorrCoef}
</div>
<div className="my-2 text-sm">
<ConfusionMatrix matrix={[score!.confusionMatrix!]} classNames={[]} />
<ConfusionMatrix
matrix={[
score!.confusionMatrix!,
transposeMatrix(score!.confusionMatrix!),
]}
classNames={score!.labels}
/>
</div>
</CardBody>
</Card>
Expand Down
27 changes: 14 additions & 13 deletions src/app/dashboard/models/[modelId]/components/scores/ConfusionMatrix.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import CustomizedTreemapContent from '@/app/dashboard/models/[modelId]/component

interface ConfusionMatrixProps {
matrix: number[][][] | undefined;
classNames: string[];
classNames?: string[];
}

import React from 'react';
import { Treemap, ResponsiveContainer } from 'recharts';
import Heatmap from '@/app/dashboard/models/[modelId]/components/scores/Heatmap';

const data = [
Expand Down Expand Up @@ -61,17 +60,19 @@ export default function ConfusionMatrix({
<p className="mb-2">
<b>Confusion matrix</b>
</p>
{classNames.map((className, index) => (
<div key={index} className="max-w-[360px]">
<Heatmap
legend={className}
data={matrix[index]}
xLabels={xLabels}
yLabels={yLabels}
getColor={getCellColor}
/>
</div>
))}
{classNames?.map((className, index) => {
return (
<div key={index} className="max-w-[360px]">
<Heatmap
legend={className}
data={matrix[index]}
xLabels={xLabels}
yLabels={yLabels}
getColor={getCellColor}
/>
</div>
);
})}
</>
);
}
2 changes: 1 addition & 1 deletion src/app/dashboard/models/[modelId]/components/scores/MulticlassClassificationScoreCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function MulticlassClassificationScoreCard({
<div className="my-2 text-sm">
<ConfusionMatrix
matrix={score!.confusionMatrix}
classNames={score!.labels!}
classNames={score!.labels}
/>
</div>
</CardBody>
Expand Down
Loading