From ccb2aee3d212a07c2bc0fd725df9714e3d989474 Mon Sep 17 00:00:00 2001
From: Harman Waseer <2403hwaseer@gmail.com>
Date: Fri, 12 Mar 2021 14:08:14 +0530
Subject: [PATCH] Adapt Graph Contour to MultiObjective

---
 .../static/components/GraphContour.tsx        | 35 +++++++++++++++----
 .../static/components/StudyDetail.tsx         |  4 +--
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/optuna_dashboard/static/components/GraphContour.tsx b/optuna_dashboard/static/components/GraphContour.tsx
index 83873ec7..c3289d51 100644
--- a/optuna_dashboard/static/components/GraphContour.tsx
+++ b/optuna_dashboard/static/components/GraphContour.tsx
@@ -3,6 +3,7 @@ import React, { ChangeEvent, FC, useEffect, useState } from "react"
 import {
   Grid,
   FormControl,
+  FormLabel,
   InputLabel,
   MenuItem,
   Select,
@@ -21,8 +22,9 @@ const useStyles = makeStyles((theme: Theme) =>
 )
 
 export const GraphContour: FC<{
-  trials: Trial[]
-}> = ({ trials = [] }) => {
+  study: StudyDetail | null
+}> = ({ study = null }) => {
+  const trials: Trial[] = study !== null ? study.trials : []
   const filteredTrials = trials.filter(
     (t) => t.state === "Complete" || t.state === "Pruned"
   )
@@ -37,9 +39,16 @@ export const GraphContour: FC<{
   const paramnames = Array.from(paramNames)
 
   const classes = useStyles()
+  const [objectiveId, setObjectiveId] = useState<number>(0)
   const [xAxis, setXAxis] = useState<string>(paramnames[0])
   const [yAxis, setYAxis] = useState<string>(paramnames[1])
 
+  const handleObjectiveChange = (
+    event: React.ChangeEvent<{ value: unknown }>
+  ) => {
+    setObjectiveId(event.target.value as number)
+  }
+
   const handleXAxisChange = (e: ChangeEvent<{ value: unknown }>) => {
     setXAxis(e.target.value as string)
   }
@@ -49,15 +58,27 @@ export const GraphContour: FC<{
   }
 
   useEffect(() => {
-    if (trials != null) {
-      plotContour(trials, 0, xAxis, yAxis)
+    if (study !== null) {
+      plotContour(study, objectiveId, xAxis, yAxis)
     }
-  }, [trials, xAxis, yAxis])
+  }, [study, objectiveId, xAxis, yAxis])
 
   return (
     <Grid container direction="row">
       <Grid item xs={3}>
         <Grid container direction="column">
+          {study !== null && study.directions.length !== 1 ? (
+            <FormControl component="fieldset" className={classes.formControl}>
+              <FormLabel component="legend">Objective ID:</FormLabel>
+              <Select value={objectiveId} onChange={handleObjectiveChange}>
+                {study.directions.map((d, i) => (
+                  <MenuItem value={i} key={i}>
+                    {i}
+                  </MenuItem>
+                ))}
+              </Select>
+            </FormControl>
+          ) : null}
           <FormControl component="fieldset" className={classes.formControl}>
             <InputLabel id="parameter1">X Axis Parameter</InputLabel>
             <Select value={xAxis} onChange={handleXAxisChange}>
@@ -88,7 +109,7 @@ export const GraphContour: FC<{
 }
 
 const plotContour = (
-  trials: Trial[],
+  study: StudyDetail,
   objectiveId: number,
   xAxis: string,
   yAxis: string
@@ -105,6 +126,8 @@ const plotContour = (
     },
   }
 
+  const trials: Trial[] = study !== null ? study.trials : []
+
   if (trials.length === 0) {
     plotly.react(plotDomId, [], layout)
   }
diff --git a/optuna_dashboard/static/components/StudyDetail.tsx b/optuna_dashboard/static/components/StudyDetail.tsx
index bce33e5f..aeaad06d 100644
--- a/optuna_dashboard/static/components/StudyDetail.tsx
+++ b/optuna_dashboard/static/components/StudyDetail.tsx
@@ -204,10 +204,10 @@ export const StudyDetail: FC = () => {
               </CardContent>
             </Card>
           ) : null}
-          {studyDetail !== null && isSingleObjectiveStudy(studyDetail) ? (
+          {studyDetail !== null ? (
             <Card className={classes.card}>
               <CardContent>
-                <GraphContour trials={trials} />
+                <GraphContour study={studyDetail} />
               </CardContent>
             </Card>
           ) : null}