Skip to content

Add constraint null checking in graph components #972

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

Closed
wants to merge 2 commits into from
Closed

Add constraint null checking in graph components #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42df4b3
Add constraint null checking in graph components
hrntsm Sep 26, 2024
e0a28e4
Fix null checking in GraphTimeline component
hrntsm Sep 26, 2024
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
5 changes: 4 additions & 1 deletion optuna_dashboard/ts/components/GraphContour.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,10 @@ const plotContour = (

filteredTrials.forEach((trial, i) => {
if (xAxis.values[i] && yAxis.values[i] && trial.values) {
if (trial.constraints.every((c) => c <= 0)) {
if (
trial.constraints === null ||
trial.constraints.every((c) => c <= 0)
) {
feasibleXY.add(xValues.length)
}
const xValue = xAxis.values[i] as string | number
Expand Down
2 changes: 1 addition & 1 deletion optuna_dashboard/ts/components/GraphParetoFront.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ const plotParetoFront = (
const feasibleTrials: Trial[] = []
const infeasibleTrials: Trial[] = []
filteredTrials.forEach((t) => {
if (t.constraints.every((c) => c <= 0)) {
if (t.constraints === null || t.constraints.every((c) => c <= 0)) {
feasibleTrials.push(t)
} else {
infeasibleTrials.push(t)
Expand Down
3 changes: 2 additions & 1 deletion optuna_dashboard/ts/components/GraphRank.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ const getRankPlotInfo = (
yValues.push(yValue)
const zValue = trial.values[objectiveId]
zValues.push(zValue)
const feasibility = trial.constraints.every((c) => c <= 0)
const feasibility =
trial.constraints === null || trial.constraints.every((c) => c <= 0)
isFeasible.push(feasibility)
hovertext.push(makeHovertext(trial))
}
Expand Down
8 changes: 4 additions & 4 deletions optuna_dashboard/ts/components/GraphTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@ const plotTimeline = (
continue
}
if (state === "Complete") {
const feasibleTrials = bars.filter((t) =>
t.constraints.every((c) => c <= 0)
const feasibleTrials = bars.filter(
(t) => t.constraints === null || t.constraints.every((c) => c <= 0)
)
const infeasibleTrials = bars.filter((t) =>
t.constraints.some((c) => c > 0)
const infeasibleTrials = bars.filter(
(t) => t.constraints !== null && t.constraints.some((c) => c > 0)
)
if (feasibleTrials.length > 0) {
traces.push(makeTrace(feasibleTrials, "Complete", color))
Expand Down
2 changes: 1 addition & 1 deletion tslib/react/src/components/PlotHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ const plotHistory = (
const feasibleTrials: Optuna.Trial[] = []
const infeasibleTrials: Optuna.Trial[] = []
for (const t of h.trials) {
if (t.constraints.every((c) => c <= 0)) {
if (t.constraints === null || t.constraints.every((c) => c <= 0)) {
feasibleTrials.push(t)
} else {
infeasibleTrials.push(t)
Expand Down
2 changes: 1 addition & 1 deletion tslib/react/src/components/PlotSlice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ const plotSlice = (
const infeasibleTrials: Optuna.Trial[] = []
// biome-ignore lint/complexity/noForEach: <explanation>
trials.forEach((t) => {
if (t.constraints.every((c) => c <= 0)) {
if (t.constraints === null || t.constraints.every((c) => c <= 0)) {
feasibleTrials.push(t)
} else {
infeasibleTrials.push(t)
Expand Down