Commit 478ea275 authored by Marius Isken's avatar Marius Isken
Browse files

wip

parent d48a928d
...@@ -183,7 +183,7 @@ class Rundirs(BaraddurRequestHandler): ...@@ -183,7 +183,7 @@ class Rundirs(BaraddurRequestHandler):
self.get() self.get()
class Misfit(BaraddurRequestHandler): class Summary(BaraddurRequestHandler):
@gen.coroutine @gen.coroutine
def get(self): def get(self):
...@@ -192,7 +192,7 @@ class Misfit(BaraddurRequestHandler): ...@@ -192,7 +192,7 @@ class Misfit(BaraddurRequestHandler):
problem=self.config.problem) problem=self.config.problem)
class Status(BaraddurRequestHandler): class Misfit(BaraddurRequestHandler):
class MisfitsPlot(BaraddurBokehHandler): class MisfitsPlot(BaraddurBokehHandler):
...@@ -206,6 +206,8 @@ class Status(BaraddurRequestHandler): ...@@ -206,6 +206,8 @@ class Status(BaraddurRequestHandler):
self.update_misfits() self.update_misfits()
plot = figure(webgl=True, plot = figure(webgl=True,
responsive=True,
plot_height=300,
x_axis_label='Iteration #', x_axis_label='Iteration #',
y_axis_label='Misfit') y_axis_label='Misfit')
plot.scatter('niter', 'target_mean', plot.scatter('niter', 'target_mean',
...@@ -226,7 +228,7 @@ class Status(BaraddurRequestHandler): ...@@ -226,7 +228,7 @@ class Status(BaraddurRequestHandler):
@gen.coroutine @gen.coroutine
def get(self): def get(self):
self.render('status.html', self.render('misfit.html',
pages=pages, pages=pages,
misfit_plot=autoload_server( misfit_plot=autoload_server(
None, None,
...@@ -254,6 +256,7 @@ class Parameters(BaraddurRequestHandler): ...@@ -254,6 +256,7 @@ class Parameters(BaraddurRequestHandler):
plots = [] plots = []
for par in problem.parameters: for par in problem.parameters:
fig = figure(webgl=True, fig = figure(webgl=True,
responsive=True,
x_axis_label='Iteration #', x_axis_label='Iteration #',
y_axis_label='%s [%s]' % (par.label, par.unit)) y_axis_label='%s [%s]' % (par.label, par.unit))
fig.scatter('niter', par.name, fig.scatter('niter', par.name,
...@@ -332,7 +335,7 @@ class Targets(BaraddurRequestHandler): ...@@ -332,7 +335,7 @@ class Targets(BaraddurRequestHandler):
pages = OrderedDict([ pages = OrderedDict([
('Rundirs', Rundirs), ('Rundirs', Rundirs),
('Summary', Misfit), ('Summary', Misfit),
('Misfit', Status), ('Misfit', Misfit),
('Parameters', Parameters), ('Parameters', Parameters),
# ('Targets', Targets), # ('Targets', Targets),
]) ])
......
...@@ -12,5 +12,7 @@ ...@@ -12,5 +12,7 @@
</header> </header>
<h2 class="content-subhead">Global misfit</h3> <h2 class="content-subhead">Global misfit</h3>
<p>Evolution of global misfit.</p> <p>Evolution of global misfit.</p>
<div class="pure-u-1">
{% raw misfit_plot %} {% raw misfit_plot %}
</div>
{% end %} {% end %}
...@@ -11,5 +11,7 @@ ...@@ -11,5 +11,7 @@
<p><span style="font-family: monospace;">{{ problem.__class__.__name__ }}</span> | <span style="font-family: monospace;">{{ problem.base_source.__class__.__name__ }}</span></p> <p><span style="font-family: monospace;">{{ problem.__class__.__name__ }}</span> | <span style="font-family: monospace;">{{ problem.base_source.__class__.__name__ }}</span></p>
</header> </header>
<h2 class="content-subhead">Parameter Plots</h3> <h2 class="content-subhead">Parameter Plots</h3>
{% raw parameter_plot %} <div class="pure-u-1">
{% raw parameter_plot %}
</div>
{% end %} {% end %}
...@@ -12,9 +12,11 @@ ...@@ -12,9 +12,11 @@
</header> </header>
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1 pure-u-md-1 pure-u-lg-1-1"> <div class="pure-u-1 pure-u-md-1 pure-u-lg-1-1">
<h2 class="content-subhead">Contributors</h3> <h2 class="content-subhead">Contributors</h3>
<p>Contributions of each target to the solution</p> <p>Contributions of each target to the solution</p>
{% raw contribution_plot %} <div class="pure-u-1">
{% raw contribution_plot %}
</div>
</div> </div>
<div class="pure-u-1 pure-u-md-1 pure-u-lg-1-1"> <div class="pure-u-1 pure-u-md-1 pure-u-lg-1-1">
<h2 class="content-subhead">Targets</h3> <h2 class="content-subhead">Targets</h3>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment