Skip to content

Commit

Permalink
🐛 fix bug with ESS multitrace
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wytamma
Wytamma committed Dec 3, 2021
1 parent 94d4636 commit 73d499b
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion backend/beastiary/webapp-dist/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><title>Beastiary</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/css/login.4b7f13da.css" rel="prefetch"><link href="/css/login~main-dashboard.49552835.css" rel="prefetch"><link href="/css/login~main~main-dashboard.87cb79bc.css" rel="prefetch"><link href="/css/main-dashboard.80656d6a.css" rel="prefetch"><link href="/css/main.38cd41ea.css" rel="prefetch"><link href="/css/main~main-dashboard.27813474.css" rel="prefetch"><link href="/js/login.baabd1f0.js" rel="prefetch"><link href="/js/login~main-dashboard.3ae3e551.js" rel="prefetch"><link href="/js/login~main~main-dashboard.3a1f6d10.js" rel="prefetch"><link href="/js/main-dashboard.ae3a4bc7.js" rel="prefetch"><link href="/js/main.5b647d5f.js" rel="prefetch"><link href="/js/main~main-dashboard.a45a3a07.js" rel="prefetch"><link href="/js/reset-password.fe1c5ee2.js" rel="prefetch"><link href="/js/start.4abc32f1.js" rel="prefetch"><link href="/css/chunk-vendors.5b404c1b.css" rel="preload" as="style"><link href="/js/app.0f28bdae.js" rel="preload" as="script"><link href="/js/chunk-vendors.9a0991d8.js" rel="preload" as="script"><link href="/css/chunk-vendors.5b404c1b.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="frontend"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but Beastiary doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.9a0991d8.js"></script><script src="/js/app.0f28bdae.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><title>Beastiary</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/css/login.4b7f13da.css" rel="prefetch"><link href="/css/login~main-dashboard.49552835.css" rel="prefetch"><link href="/css/login~main~main-dashboard.87cb79bc.css" rel="prefetch"><link href="/css/main-dashboard.80656d6a.css" rel="prefetch"><link href="/css/main.38cd41ea.css" rel="prefetch"><link href="/css/main~main-dashboard.27813474.css" rel="prefetch"><link href="/js/login.baabd1f0.js" rel="prefetch"><link href="/js/login~main-dashboard.3ae3e551.js" rel="prefetch"><link href="/js/login~main~main-dashboard.3a1f6d10.js" rel="prefetch"><link href="/js/main-dashboard.50219e30.js" rel="prefetch"><link href="/js/main.5b647d5f.js" rel="prefetch"><link href="/js/main~main-dashboard.a45a3a07.js" rel="prefetch"><link href="/js/reset-password.fe1c5ee2.js" rel="prefetch"><link href="/js/start.4abc32f1.js" rel="prefetch"><link href="/css/chunk-vendors.5b404c1b.css" rel="preload" as="style"><link href="/js/app.cc72d1ac.js" rel="preload" as="script"><link href="/js/chunk-vendors.9a0991d8.js" rel="preload" as="script"><link href="/css/chunk-vendors.5b404c1b.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="frontend"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but Beastiary doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.9a0991d8.js"></script><script src="/js/app.cc72d1ac.js"></script></body></html>
4 changes: 2 additions & 2 deletions .../beastiary/webapp-dist/js/app.0f28bdae.js → .../beastiary/webapp-dist/js/app.cc72d1ac.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...stiary/webapp-dist/js/app.0f28bdae.js.map → ...stiary/webapp-dist/js/app.cc72d1ac.js.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...webapp-dist/js/main-dashboard.ae3a4bc7.js → ...webapp-dist/js/main-dashboard.50219e30.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...pp-dist/js/main-dashboard.ae3a4bc7.js.map → ...pp-dist/js/main-dashboard.50219e30.js.map
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions ...ifest.3e2c84abe16ba299a0ecc861e2447a1e.js → ...ifest.164ae56c48d06d0522ad83d95bbdba62.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/css/login~main~main-dashboard.87cb79bc.css"
},
{
"revision": "5300f62bbdbec3af62ab",
"revision": "6e00593a5302154d65eb",
"url": "/css/main-dashboard.80656d6a.css"
},
{
Expand All @@ -28,12 +28,12 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/css/main~main-dashboard.27813474.css"
},
{
"revision": "b398d6d4d41a85cc2e71c677f5801b35",
"revision": "1bb989b7719194ba8684aa07f4427dfb",
"url": "/index.html"
},
{
"revision": "7b0c078aecd8ac566df3",
"url": "/js/app.0f28bdae.js"
"revision": "e55e8b4ba6ad83b582db",
"url": "/js/app.cc72d1ac.js"
},
{
"revision": "efb27178083e9bac70b9",
Expand All @@ -52,8 +52,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/js/login~main~main-dashboard.3a1f6d10.js"
},
{
"revision": "5300f62bbdbec3af62ab",
"url": "/js/main-dashboard.ae3a4bc7.js"
"revision": "6e00593a5302154d65eb",
"url": "/js/main-dashboard.50219e30.js"
},
{
"revision": "09569e0861c321d2ddcc",
Expand Down
2 changes: 1 addition & 1 deletion backend/beastiary/webapp-dist/service-worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");

importScripts(
"/precache-manifest.3e2c84abe16ba299a0ecc861e2447a1e.js"
"/precache-manifest.164ae56c48d06d0522ad83d95bbdba62.js"
);

workbox.core.setCacheNameDetails({prefix: "frontend"});
Expand Down
2 changes: 1 addition & 1 deletion backend/pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "beastiary"
version = "1.3"
version = "1.3.1"
description = ""
authors = ["Wytamma Wirth <[email protected]>"]
readme = "PYPI-README.md"
Expand Down
22 changes: 12 additions & 10 deletions frontend/src/components/data/graphs/ESS.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class CumulativeESS extends Vue {
pad: 0,
},
shapes: [
{
type: 'line',
xref: 'paper',
Expand All @@ -64,8 +64,8 @@ export default class CumulativeESS extends Vue {
line: {
color: '#4CAF50',
dash: 'dot',
width: 3
}
width: 3,
},
},
{
Expand All @@ -78,10 +78,10 @@ export default class CumulativeESS extends Vue {
line: {
color: '#ff9800',
dash: 'dot',
width: 3
}
width: 3,
},
},
]
],
// height: 400,
};
}
Expand Down Expand Up @@ -127,14 +127,15 @@ export default class CumulativeESS extends Vue {
hovertemplate: '%{y}',
showlegend: true,
});
break;
}
}
}
return data;
}
public CumESSdata: {state:number, value:number}[] = [];
public CumESSdata: Array<{state: number, value: number}> = [];
public actions = [
{ message: 'CumESS', func: (data, burnIn, k) => {
Expand All @@ -143,7 +144,7 @@ export default class CumulativeESS extends Vue {
data.length * (burnIn / 100),
);
const _CumESSdata: {state:number, value:number}[] = [];
const cumESSdata: Array<{state: number, value: number}> = [];
for (let index = k; index < dataWithBurnIn.length; index += k) {
const values: Array<number | null> = dataWithBurnIn.slice(
0, index,
Expand Down Expand Up @@ -188,9 +189,9 @@ export default class CumulativeESS extends Vue {
if (ACT !== 0) {
ESS = (stepSize * nSmaples) / ACT;
}
_CumESSdata[index] = {state: dataWithBurnIn[index].state, value: ESS};
cumESSdata[index] = {state: dataWithBurnIn[index].state, value: ESS};
}
return _CumESSdata;
return cumESSdata;
}}];
// @ts-ignore
Expand All @@ -209,6 +210,7 @@ export default class CumulativeESS extends Vue {
this.worker.postMessage('CumESS', [data, burnIn, 50]) // compute ESS in worker
.then((res) => this.CumESSdata = res)
.catch(console.error);
break;
}
}
}
Expand Down

0 comments on commit 73d499b

Please sign in to comment.