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

Jump to bottom

Remove update button from config, hide dirty state when using local s… #43

Merged
merged 3 commits into from
May 10, 2021
Merged

Remove update button from config, hide dirty state when using local s… #43

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
685169c
Remove update button from config, hide dirty state when using local s…
j-or May 10, 2021
0807d30
Merge branch 'main' into feature/local_storage_mode
j-or May 10, 2021
90c72b6
Rename local storage prop
j-or May 10, 2021
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
17 changes: 12 additions & 5 deletions components/experiment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Button, Card, CardContent, CircularProgress, Grid, Snackbar, Typography } from '@material-ui/core'
import { Box, Button, Card, CardContent, Grid, Snackbar, Typography } from '@material-ui/core'
import Layout from './layout'
import OptimizerModel from './optimizer-model';
import OptimizerConfigurator from './optimizer-configurator';
Expand All @@ -11,7 +11,12 @@ import React, { useState, useEffect } from 'react';
import { ValueVariableType, CategoricalVariableType, OptimizerConfig, DataPointType } from '../types/common';
import LoadingExperiment from './loading-experiment';

export default function Experiment() {
type ExperimentProps = {
useLocalStorage: boolean
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Burde den ikke hedde noget i stil med allowSaveToServer?

}

export default function Experiment(props: ExperimentProps) {
const { useLocalStorage } = props
const classes = useStyles()
const { state: {
experiment
Expand Down Expand Up @@ -61,7 +66,7 @@ export default function Experiment() {

return (
<Layout>
<Card className={[classes.experimentContainer, isDirty ? classes.experimentContainerDirty : ''].join(' ')}>
<Card className={[classes.experimentContainer, isDirty && !useLocalStorage ? classes.experimentContainerDirty : ''].join(' ')}>
<CardContent>
<Grid container spacing={2}>
<Grid item xs={10}>
Expand All @@ -70,12 +75,14 @@ export default function Experiment() {
</Typography>
<Typography variant="h4" gutterBottom>
{/* Experiment {experiment.id} {isDirty && '(unsaved)'} [{experiment.results.rawResult || 'No results'}] */}
{experiment.info.name} {isDirty && '(unsaved)'}
{experiment.info.name} {isDirty && !useLocalStorage ? '(unsaved)' : ''}
</Typography>
</Grid>

<Grid item xs={2} className={classes.actionContainer}>
<Button variant="contained" className={isDirty ? classes.saveButtonDirty : ''} onClick={onSave} color="primary">Save</Button>
{!useLocalStorage &&
<Button variant="contained" className={isDirty ? classes.saveButtonDirty : ''} onClick={onSave} color="primary">Save</Button>
}
<Button variant="contained" className={classes.runButton} color="primary" onClick={onRun}>Run</Button>
</Grid>
<Grid item xs={3}>
Expand Down
106 changes: 53 additions & 53 deletions components/optimizer-configurator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,64 @@ type OptimizerConfiguratorProps = {
}

export default function OptimizerConfigurator(props: OptimizerConfiguratorProps) {
const { config } = props
const { register, handleSubmit, reset, watch, errors } = useForm<OptimizerConfig>();
const onSubmit = async (config: OptimizerConfig) => {
props.onConfigUpdated({...config, baseEstimator: props.config.baseEstimator, acqFunc: props.config.acqFunc})
const { config , onConfigUpdated} = props
const { register, handleSubmit, reset, watch, errors, getValues } = useForm<OptimizerConfig>()

const handleChange = () => {
onConfigUpdated(getValues() as OptimizerConfig)
}

return (
<Card>
<CardContent>
<form onSubmit={handleSubmit(onSubmit)}>
<Typography variant="h6" gutterBottom>Configure optimizer</Typography>

<TextField
disabled
fullWidth
margin="dense"
defaultValue={config.baseEstimator}
name="baseEstimator"
label="Base estimator"
inputRef={register}
/>
<TextField
disabled
fullWidth
margin="dense"
defaultValue={config.acqFunc}
name="acqFunc"
label="Acq func"
inputRef={register}
/>
<TextField
fullWidth
margin="dense"
defaultValue={config.initialPoints}
name="initialPoints"
label="N initial points"
inputRef={register}
/>
<TextField
fullWidth
margin="dense"
defaultValue={config.kappa}
name="kappa"
label="Kappa"
inputRef={register}
/>
<TextField
fullWidth
margin="dense"
defaultValue={config.xi}
name="xi"
label="Xi"
inputRef={register}
/>
<Box mt={1}>
<Button variant="outlined" type="submit">Update</Button>
</Box>
</form>
<Typography variant="h6" gutterBottom>Configure optimizer</Typography>
<TextField
disabled
fullWidth
margin="dense"
defaultValue={config.baseEstimator}
name="baseEstimator"
label="Base estimator"
inputRef={register}
onChange={handleChange}
/>
<TextField
disabled
fullWidth
margin="dense"
defaultValue={config.acqFunc}
name="acqFunc"
label="Acq func"
inputRef={register}
onChange={handleChange}
/>
<TextField
fullWidth
margin="dense"
defaultValue={config.initialPoints}
name="initialPoints"
label="N initial points"
inputRef={register}
onChange={handleChange}
/>
<TextField
fullWidth
margin="dense"
defaultValue={config.kappa}
name="kappa"
label="Kappa"
inputRef={register}
onChange={handleChange}
/>
<TextField
fullWidth
margin="dense"
defaultValue={config.xi}
name="xi"
label="Xi"
inputRef={register}
onChange={handleChange}
/>
</CardContent>
</Card>
)
Expand Down
10 changes: 5 additions & 5 deletions components/optimizer-model.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box, Button, Card, CardContent, IconButton, Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@material-ui/core'
import { CategoricalVariableType, ExperimentType, ValueVariableType } from '../types/common'
import { CategoricalVariableType, ValueVariableType } from '../types/common'
import DeleteIcon from '@material-ui/icons/Delete'
import { FC, useState } from 'react'
import VariableEditor from './variable-editor'
Expand Down Expand Up @@ -47,7 +47,7 @@ export default function OptimizerModel(props: OptimizerModelProps) {
<IconButton
disabled={disabled}
size="small"
onClick={() => {props.onDeleteValueVariable(valueVar)}}>
onClick={() => {onDeleteValueVariable(valueVar)}}>
<DeleteIcon color={disabled ? "inherit" : "primary"} fontSize="small"/>
</IconButton>
</TableCell>
Expand Down Expand Up @@ -84,7 +84,7 @@ export default function OptimizerModel(props: OptimizerModelProps) {
<IconButton
disabled={disabled}
size="small"
onClick={() => {props.onDeleteCategoricalVariable(catVar)}}>
onClick={() => {onDeleteCategoricalVariable(catVar)}}>
<DeleteIcon color={disabled ? "inherit" : "primary"} fontSize="small"/>
</IconButton>
</TableCell>
Expand All @@ -104,8 +104,8 @@ export default function OptimizerModel(props: OptimizerModelProps) {
{isAddOpen &&
<VariableEditor
isAddVariableDisabled={disabled}
addCategoricalVariable={(categoricalVariable: CategoricalVariableType) => props.addCategoricalVariable(categoricalVariable)}
addValueVariable={(valueVariable: ValueVariableType) => props.addValueVariable(valueVariable)}
addCategoricalVariable={(categoricalVariable: CategoricalVariableType) => addCategoricalVariable(categoricalVariable)}
addValueVariable={(valueVariable: ValueVariableType) => addValueVariable(valueVariable)}
close={() => setAddOpen(false)} />
}

Expand Down
2 changes: 1 addition & 1 deletion pages/experiment/[experimentid].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function ExperimentContainer() {
return (
<>
<ExperimentProvider experimentId={Array.isArray(experimentid) ? experimentid[0] : experimentid} useLocalStorage={state.useLocalStorage}>
<Experiment />
<Experiment useLocalStorage={state.useLocalStorage} />
{state.debug && <DebugExperiment />}
</ExperimentProvider>
</>
Expand Down