Merge remote-tracking branch 'origin/master' into feature/1091

This commit is contained in:
Roman Galochkin 2020-02-26 13:38:36 +03:00
commit fee4f1f97c
5 changed files with 13 additions and 1 deletions

View File

@ -56,6 +56,13 @@ module ModelForm = {
</h1> </h1>
<p> {model.description |> ReasonReact.string} </p> <p> {model.description |> ReasonReact.string} </p>
<p> {model.author |> ReasonReact.string} </p> <p> {model.author |> ReasonReact.string} </p>
<ForetoldComponents.Link
href={
"https://github.com/foretold-app/estiband/blob/master/src/models/"
++ model.fileName
}>
{"Model Code" |> ReasonReact.string}
</ForetoldComponents.Link>
{Combo.inputTypeValuePairs(formState.combo) {Combo.inputTypeValuePairs(formState.combo)
|> E.A.fmap(((type_: TypeWithMetadata.t, value)) => |> E.A.fmap(((type_: TypeWithMetadata.t, value)) =>
<div className="box-border"> <div className="box-border">

View File

@ -242,6 +242,7 @@ module Model = {
type t = { type t = {
name: string, name: string,
id: string, id: string,
fileName: string,
description: string, description: string,
author: string, author: string,
version: string, version: string,

View File

@ -220,6 +220,7 @@ module Interface = {
name: "EA Funds: Donations & Payouts", name: "EA Funds: Donations & Payouts",
description: "Calculate the payments and payouts of CEA Funds based on existing data.", description: "Calculate the payments and payouts of CEA Funds based on existing data.",
version: "1.0.0", version: "1.0.0",
fileName: "EAFunds.re",
author: "Ozzie Gooen", author: "Ozzie Gooen",
inputTypes: [| inputTypes: [|
TypeWithMetadata.make( TypeWithMetadata.make(

View File

@ -28,6 +28,7 @@ module Interface = {
Prop.{ Prop.{
name: "Global Catastrophe", name: "Global Catastrophe",
id: "global-catastrophe", id: "global-catastrophe",
fileName: "GlobalCatastrophe.re",
description: "The chances of having at least one catastrophe per year in the future, assuming no other catastrophe until then.", description: "The chances of having at least one catastrophe per year in the future, assuming no other catastrophe until then.",
version: "1.0.0", version: "1.0.0",
author: "Ozzie Gooen", author: "Ozzie Gooen",

View File

@ -1,4 +1,5 @@
let guesstimatorString = age => GuesstimatorDist.normal(80.0 -. age, 2.); let guesstimatorString = age =>
GuesstimatorDist.normal(72.0 -. age, 5.0 -. age *. 0.01);
let makeI = (age: float) => { let makeI = (age: float) => {
DistPlusIngredients.make( DistPlusIngredients.make(
@ -29,6 +30,7 @@ module Interface = {
Prop.{ Prop.{
name: "Death Time", name: "Death Time",
id: "human-lifespan", id: "human-lifespan",
fileName: "Human.re",
description: "When will you die?", description: "When will you die?",
version: "1.0.0", version: "1.0.0",
author: "Ozzie Gooen", author: "Ozzie Gooen",