wassname/optuna-dashboard
1
0
Fork 0
mirror of https://github.com/wassname/optuna-dashboard.git synced 2026-09-09 11:28:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #81 from optuna/fix-sort-with-filter

Browse Source 
Fix less comparator of DataGrid
This commit is contained in:
Masashi Shibata
2021-04-10 03:18:25 +09:00
committed by GitHub
parent 51daba1e1b 29d5cb136d
commit b759bba048
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
optuna_dashboard/static/components/DataGrid.tsx
+2 -2
View File
@@ -51,7 +51,7 @@ interface DataGridColumn<T> {
field: keyof T
label: string
sortable?: boolean
less?: (i: number, j: number) => number
less?: (a: T, b: T) => number
filterable?: boolean
toCellValue?: (rowIndex: number) => string | React.ReactNode
padding?: "default" | "checkbox" | "none"
@@ -342,7 +342,7 @@ function stableSort<T>(
const stabilizedThis = array.map((el, index) => [el, index] as [T, number])
stabilizedThis.sort((a, b) => {
if (less) {
const result = order == "asc" ? -less(a[1], b[1]) : less(a[1], b[1])
const result = order == "asc" ? -less(a[0], b[0]) : less(a[0], b[0])
if (result !== 0) return result
} else {
const result = comparator(a[0], b[0])
optuna_dashboard/static/components/StudyDetail.tsx
+11 -11
View File
@@ -265,9 +265,9 @@ const TrialTable: FC<{ studyDetail: StudyDetail | null }> = ({
field: "values",
label: "Value",
sortable: true,
less: (i, j): number => {
const firstVal = trials[i].values?.[0]
const secondVal = trials[j].values?.[0]
less: (firstEl, secondEl): number => {
const firstVal = firstEl.values?.[0]
const secondVal = secondEl.values?.[0]
if (firstVal === secondVal) {
return 0
@@ -293,9 +293,9 @@ const TrialTable: FC<{ studyDetail: StudyDetail | null }> = ({
field: "values",
label: `Objective ${objectiveId}`,
sortable: true,
less: (i, j): number => {
const firstVal = trials[i].values?.[objectiveId]
const secondVal = trials[j].values?.[objectiveId]
less: (firstEl, secondEl): number => {
const firstVal = firstEl.values?.[objectiveId]
const secondVal = secondEl.values?.[objectiveId]
if (firstVal === secondVal) {
return 0
@@ -328,15 +328,15 @@ const TrialTable: FC<{ studyDetail: StudyDetail | null }> = ({
return null
},
sortable: true,
less: (i, j): number => {
const firstStartMs = trials[i].datetime_start?.getTime()
const firstCompleteMs = trials[i].datetime_complete?.getTime()
less: (firstEl, secondEl): number => {
const firstStartMs = firstEl.datetime_start?.getTime()
const firstCompleteMs = firstEl.datetime_complete?.getTime()
const firstDurationMs =
firstStartMs !== undefined && firstCompleteMs !== undefined
? firstCompleteMs - firstStartMs
: undefined
const secondStartMs = trials[j].datetime_start?.getTime()
const secondCompleteMs = trials[j].datetime_complete?.getTime()
const secondStartMs = secondEl.datetime_start?.getTime()
const secondCompleteMs = secondEl.datetime_complete?.getTime()
const secondDurationMs =
secondStartMs !== undefined && secondCompleteMs !== undefined
? secondCompleteMs - secondStartMs