Merge pull request #50 from MathisBurger/feature/benulli-calculations

[RELEASE v1.6.0]

Author: MathisBurger

README.md

@@ -36,3 +36,4 @@ svelte => 3.44.0<br>
 svelte/kit => 1.0.0-next.195<br>
 prettier => 2.2.1<br>
 typescript => 4.0.0<br>
+compiler => ES2020

SECURITY.md

@@ -0,0 +1,26 @@
+# Security Policy
+
+## Supported Versions
+
+Just because MathOnWeb does not save any data about you and your user behaviour,
+there are no real security issues. Nevertheless, there may some risks that can have an
+effect. There are only security updates for the latest version of MathOnWeb. So if you are
+using the public instance your security level is always up to date.
+If you hosted the application yourself, you can validate if your current version is still secure.
+
+| Version | Secure             |
+| ------- | ------------------ |
+| 1.6.0   | :white_check_mark: |
+| 1.5.3   | :white_check_mark: |
+| 1.4.0   | :white_check_mark: |
+| 1.3.5   | :white_check_mark: |
+| 1.3.0   | :white_check_mark: |
+| 1.2.0   | :white_check_mark: |
+| < 1.1.2 | :x:                |
+
+## Reporting a Vulnerability
+
+If you found a security risk, just create a new issue and explain how you found the risk
+and how I can recreate it. After that it will be fixed as soon as possible in the next update.
+You should also test this risk in different versions of the application, so I am able to specify which
+versions of the software are safe.

package.json

@@ -1,6 +1,6 @@
 {
-	"name": "~TODO~",
-	"version": "0.0.1",
+	"name": "mathonweb",
+	"version": "1.6.0",
 	"scripts": {
 		"dev": "svelte-kit dev",
 		"build": "svelte-kit build && node src/fix-typos.js",

src/lib/defaults-provider.ts

@@ -1,3 +1,4 @@
+import type { Benulli } from '$src/typings/benulli';
 import type { GeoLayerParameter, GeoLayerCoordinate } from '$src/typings/geo-layer';
 import type { NCR } from '$src/typings/ncr';
 import type { Triangle } from '$src/typings/triangle';
@@ -9,6 +10,7 @@ interface DefaultsProviderInterface {
 	getGeoLayerCoordinateDefault(): GeoLayerCoordinate;
 	getDefaultTriangle(): Triangle;
 	getDefaultNCR(): NCR;
+	getDefaultBenulliChain(): Benulli;
 }
 
 // Provides some functions to generate default values.
@@ -64,4 +66,12 @@ export class DefaultsProvider implements DefaultsProviderInterface {
 	getDefaultNCR(): NCR {
 		return { n: 0, k: 0 };
 	}
+
+	/**
+	 * Returns the default benulli chain.
+	 * @returns The generated benulli chain
+	 */
+	getDefaultBenulliChain(): Benulli {
+		return { n: 0, p: 0, k: 0 };
+	}
 }

src/lib/solve-function.ts

@@ -91,7 +91,7 @@ function getVariable(func: string): string | null {
  * @returns The result of the eval calculation
  */
 function calculate(func: string, variable: number, variable_letter: string): number {
-	return eval(func.replaceAll(variable_letter, '' + variable));
+	return eval(func.replace(variable_letter, '' + variable));
 }
 
 export default solveFunction;

src/lib/stochastics/benulli-input.svelte

@@ -0,0 +1,23 @@
+<script lang="ts">
+	import type { Benulli } from '$src/typings/benulli';
+	export let input: Benulli;
+</script>
+
+<div class="benulli-input">
+	<div class="benulli-input-container">
+		<p>n:</p>
+		<input type="number" class="ncr-input-field" bind:value={input.n} />
+	</div>
+	<div class="benulli-input-container">
+		<p>p:</p>
+		<input type="number" class="ncr-input-field" bind:value={input.p} />
+	</div>
+	<div class="benulli-input-container">
+		<p>k:</p>
+		<input type="number" class="ncr-input-field" bind:value={input.k} />
+	</div>
+</div>
+
+<style lang="scss">
+	@import '../../styles/benulli.scss';
+</style>

src/lib/stochastics/benulli.ts

@@ -0,0 +1,16 @@
+import type { Benulli } from '$src/typings/benulli';
+import { calculateNCr } from './ncr-calculator';
+
+/**
+ * Calculates the result of a binomial benulli chain.
+ *
+ * @param chain The benulli chain that should be calculated
+ * @returns The result of the calculation
+ */
+export function calculateBenulliChain(chain: Benulli): number {
+	return (
+		calculateNCr({ n: chain.n, k: chain.k }) *
+		chain.p ** chain.k *
+		(1 - chain.p) ** (chain.n - chain.k)
+	);
+}

src/routes/stochastics/benulli-calculator.svelte

@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { DefaultsProvider } from '$lib/defaults-provider';
+
+	import { calculateBenulliChain } from '$lib/stochastics/benulli';
+
+	import BenulliInput from '$lib/stochastics/benulli-input.svelte';
+	import type { Benulli } from '$src/typings/benulli';
+
+	let benulliData: Benulli = new DefaultsProvider().getDefaultBenulliChain();
+</script>
+
+<div class="centered">
+	<div class="container">
+		<BenulliInput bind:input={benulliData} />
+		<div class="result-form">
+			{calculateBenulliChain(benulliData)}
+		</div>
+	</div>
+</div>
+
+<style lang="scss">
+	@import '../../styles/general.scss';
+</style>

src/routes/stochastics/index.svelte

@@ -13,6 +13,11 @@
 			name: $_('stochastics.ncr-calculator.title'),
 			description: $_('stochastics.ncr-calculator.description'),
 			route: '/stochastics/ncr-calculator'
+		},
+		{
+			name: $_('stochastics.benulli-calculator.title'),
+			description: $_('stochastics.benulli-calculator.description'),
+			route: '/stochastics/benulli-calculator'
 		}
 	];
 </script>

src/styles/benulli.scss

@@ -0,0 +1,26 @@
+.benulli-input {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	gap: 10px;
+}
+
+.benulli-input-container {
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-start;
+	align-items: center;
+}
+
+.benulli-input-container p {
+	color: var(--text-color);
+	font-size: 1.3em;
+}
+
+.benulli-input-container input {
+	width: 50px;
+	height: 50px;
+	outline: none;
+	border: none;
+}