diff --git a/log/experiments.xml b/log/experiments.xml index f7ded98c2161c838649cc48c4340008ea193c202..c9c335208f2c941300c487b24d2f66b4d5ce2884 100644 --- a/log/experiments.xml +++ b/log/experiments.xml @@ -25,7 +25,7 @@ </gnm:Attributes> <office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.2"> <office:meta> - <dc:date>2021-08-13T17:17:19Z</dc:date> + <dc:date>2021-08-14T08:40:05Z</dc:date> <meta:creation-date>2021-07-23T13:30:52Z</meta:creation-date> </office:meta> </office:document-meta> @@ -40,7 +40,7 @@ <gnm:Sheet DisplayFormulas="0" HideZero="0" HideGrid="0" HideColHeader="0" HideRowHeader="0" DisplayOutlines="1" OutlineSymbolsBelow="1" OutlineSymbolsRight="1" Visibility="GNM_SHEET_VISIBILITY_VISIBLE" GridColor="0:0:0"> <gnm:Name>Sheet1</gnm:Name> <gnm:MaxCol>16</gnm:MaxCol> - <gnm:MaxRow>125</gnm:MaxRow> + <gnm:MaxRow>131</gnm:MaxRow> <gnm:Zoom>1</gnm:Zoom> <gnm:Names> <gnm:Name> @@ -232,17 +232,7 @@ <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font> </gnm:Style> </gnm:StyleRegion> - <gnm:StyleRegion startCol="0" startRow="110" endCol="7" endRow="124"> - <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General"> - <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font> - </gnm:Style> - </gnm:StyleRegion> - <gnm:StyleRegion startCol="0" startRow="125" endCol="0" endRow="125"> - <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General"> - <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font> - </gnm:Style> - </gnm:StyleRegion> - <gnm:StyleRegion startCol="0" startRow="126" endCol="7" endRow="65535"> + <gnm:StyleRegion startCol="0" startRow="110" endCol="7" endRow="65535"> <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General"> <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font> </gnm:Style> @@ -357,11 +347,6 @@ <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font> </gnm:Style> </gnm:StyleRegion> - <gnm:StyleRegion startCol="1" startRow="125" endCol="7" endRow="125"> - <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General"> - <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font> - </gnm:Style> - </gnm:StyleRegion> <gnm:StyleRegion startCol="2" startRow="41" endCol="255" endRow="51"> <gnm:Style HAlign="GNM_HALIGN_GENERAL" VAlign="GNM_VALIGN_BOTTOM" WrapText="0" ShrinkToFit="0" Rotation="0" Shade="0" Indent="0" Locked="1" Hidden="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General"> <gnm:Font Unit="10" Bold="0" Italic="0" Underline="0" StrikeThrough="0" Script="0">Sans</gnm:Font> @@ -459,8 +444,8 @@ <gnm:RowInfo No="40" Unit="13.5"/> <gnm:RowInfo No="49" Unit="13.5" Count="22"/> </gnm:Rows> - <gnm:Selections CursorCol="3" CursorRow="127"> - <gnm:Selection startCol="3" startRow="127" endCol="3" endRow="127"/> + <gnm:Selections CursorCol="1" CursorRow="124"> + <gnm:Selection startCol="1" startRow="124" endCol="1" endRow="124"/> </gnm:Selections> <gnm:Objects> <gnm:CellComment ObjectBound="A76" ObjectOffset="1 0 1 0" Direction="17" Print="1" Author="Lewin Bormann" Text="run with #16"/> @@ -1551,9 +1536,25 @@ <gnm:Cell Row="122" Col="8" ValueType="60">5-95</gnm:Cell> <gnm:Cell Row="122" Col="13" ValueType="60">2400 +/-30 ~ N</gnm:Cell> <gnm:Cell Row="123" Col="0" ValueType="40">123</gnm:Cell> + <gnm:Cell Row="123" Col="1" ValueType="40">22753252</gnm:Cell> + <gnm:Cell Row="123" Col="2" ValueType="60">#27: like 22750437 but with fixed typo</gnm:Cell> + <gnm:Cell Row="123" Col="3" ValueType="40" ValueFormat="0.00%">0.01</gnm:Cell> + <gnm:Cell Row="123" Col="4" ValueType="60">Iter</gnm:Cell> + <gnm:Cell Row="123" Col="5" ValueType="60">mass and U abundances in DeplUSink</gnm:Cell> + <gnm:Cell Row="123" Col="6" ValueType="40">15</gnm:Cell> + <gnm:Cell Row="123" Col="7" ValueType="60">20-120</gnm:Cell> + <gnm:Cell Row="123" Col="8" ValueType="60">5-95</gnm:Cell> + <gnm:Cell Row="123" Col="13" ValueType="60">2400 +/-30 ~ N</gnm:Cell> <gnm:Cell Row="124" Col="0" ValueType="40">124</gnm:Cell> + <gnm:Cell Row="125" Col="0" ValueType="40">125</gnm:Cell> + <gnm:Cell Row="126" Col="0" ValueType="40">126</gnm:Cell> + <gnm:Cell Row="127" Col="0" ValueType="40">127</gnm:Cell> + <gnm:Cell Row="128" Col="0" ValueType="40">128</gnm:Cell> + <gnm:Cell Row="129" Col="0" ValueType="40">129</gnm:Cell> + <gnm:Cell Row="130" Col="0" ValueType="40">130</gnm:Cell> + <gnm:Cell Row="131" Col="0" ValueType="40">131</gnm:Cell> </gnm:Cells> - <gnm:SheetLayout TopLeft="A117"> + <gnm:SheetLayout TopLeft="A106"> <gnm:FreezePanes FrozenTopLeft="A1" UnfrozenTopLeft="A2"/> </gnm:SheetLayout> <gnm:Solver ModelType="0" ProblemType="0" MaxTime="60" MaxIter="1000" NonNeg="1" Discr="0" AutoScale="0" ProgramR="0" SensitivityR="0"/> diff --git a/sampling/models/candu/parameters/cyclerichment_assumptionprior_sampling.json b/sampling/models/candu/parameters/cyclerichment_assumptionprior_sampling.json index 799ed50111bfd81284707bffdd093e95b2f6ad88..0d32d577deb1de7bb3aabfe9e39e764a3b17a7d5 100644 --- a/sampling/models/candu/parameters/cyclerichment_assumptionprior_sampling.json +++ b/sampling/models/candu/parameters/cyclerichment_assumptionprior_sampling.json @@ -2,5 +2,5 @@ "cycle_time": [20, 120], "high_enrichment_grade": [5, 95], - "power": {"type": "Normal", "mu": 2400, "sigma": 30}, + "power": {"type": "Normal", "mu": 2400, "sigma": 30} }