From 980e84a3a9abefbdbcf14c15b3cef7d61088865e Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Mon, 11 Dec 2023 12:03:45 -0500
Subject: [PATCH 01/29] 8

---
 frontend/src/constants/logicConstants.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/constants/logicConstants.js b/frontend/src/constants/logicConstants.js
index 9cb9dd62..3111982a 100644
--- a/frontend/src/constants/logicConstants.js
+++ b/frontend/src/constants/logicConstants.js
@@ -136,8 +136,9 @@ export const RULES = Object.freeze({
             enabledNested: true,
         },
         [RULES.ROI_LARGE]: {
+            // zzz #8
             name: "Abs(Residual of interest) too large",
-            notes: val => `|Residual for Dose Group Near BMD| > ${val}`,
+            notes: val => `|Residual Near BMD| > ${val}`,
             hasThreshold: true,
             enabledContinuous: true,
             enabledDichotomous: true,

From a6239cc031ed0c8da7d4559ec5815cff7d23359d Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Thu, 14 Dec 2023 14:21:47 -0500
Subject: [PATCH 02/29] 25a, 26, 30 comment

---
 frontend/src/components/IndividualModel/GoodnessFit.js |  2 +-
 .../src/components/IndividualModel/ModelParameters.js  | 10 +---------
 .../src/components/Output/Multitumor/GoodnessFit.js    |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/IndividualModel/GoodnessFit.js b/frontend/src/components/IndividualModel/GoodnessFit.js
index 09ead3d8..e70063dd 100644
--- a/frontend/src/components/IndividualModel/GoodnessFit.js
+++ b/frontend/src/components/IndividualModel/GoodnessFit.js
@@ -10,7 +10,7 @@ import {ff} from "@/utils/formatters";
 const hdr_c_normal = [
         "Dose", "Size", "Observed Mean", "Calculated Mean", "Estimated Mean",
         "Observed SD", "Calculated SD", "Estimated SD", "Scaled Residual",
-    ],
+    ], // zzz #30
     hdr_c_lognormal = [
         "Dose", "Size", "Observed Mean", "Calculated Median", "Estimated Median",
         "Observed SD", "Calculated GSD", "Estimated GSD", "Scaled Residual",
diff --git a/frontend/src/components/IndividualModel/ModelParameters.js b/frontend/src/components/IndividualModel/ModelParameters.js
index d70b58e8..951ab64e 100644
--- a/frontend/src/components/IndividualModel/ModelParameters.js
+++ b/frontend/src/components/IndividualModel/ModelParameters.js
@@ -29,8 +29,6 @@ class ModelParameters extends Component {
                         <th>Variable</th>
                         <th>Estimate</th>
                         <th>Standard Error</th>
-                        <th>Lower Confidence</th>
-                        <th>Upper Confidence</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -44,7 +42,7 @@ class ModelParameters extends Component {
                                         <>
                                             <span>Bounded</span>
                                             <HelpTextPopover
-                                                title="Bounded"
+                                                title="On Bound"
                                                 content={`The value of this parameter, ${parameters.values[i]}, is within the tolerance of the bound`}
                                             />
                                         </>
@@ -53,12 +51,6 @@ class ModelParameters extends Component {
                                     )}
                                 </td>
                                 <td>{bounded ? "NA" : parameterFormatter(parameters.se[i])}</td>
-                                <td>
-                                    {bounded ? "NA" : parameterFormatter(parameters.lower_ci[i])}
-                                </td>
-                                <td>
-                                    {bounded ? "NA" : parameterFormatter(parameters.upper_ci[i])}
-                                </td>
                             </tr>
                         );
                     })}
diff --git a/frontend/src/components/Output/Multitumor/GoodnessFit.js b/frontend/src/components/Output/Multitumor/GoodnessFit.js
index d896efcb..b0a9a0ef 100644
--- a/frontend/src/components/Output/Multitumor/GoodnessFit.js
+++ b/frontend/src/components/Output/Multitumor/GoodnessFit.js
@@ -10,7 +10,7 @@ import {ff} from "@/utils/formatters";
 const hdr_c_normal = [
         "Dose", "Size", "Observed Mean", "Calculated Mean", "Estimated Mean",
         "Observed SD", "Calculated SD", "Estimated SD", "Scaled Residual",
-    ],
+    ], // zzz #30
     hdr_c_lognormal = [
         "Dose", "Size", "Observed Mean", "Calculated Median", "Estimated Median",
         "Observed SD", "Calculated GSD", "Estimated GSD", "Scaled Residual",

From ffcd74241c8fa3b1787364ca44880be97d9138f4 Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Thu, 14 Dec 2023 14:30:04 -0500
Subject: [PATCH 03/29] 27, 29, 33, 34, 35

---
 .../src/components/IndividualModel/ContinuousDeviance.js | 2 +-
 .../IndividualModel/ContinuousTestOfInterest.js          | 2 +-
 frontend/src/components/IndividualModel/GoodnessFit.js   | 9 +++++----
 .../src/components/IndividualModel/ModelParameters.js    | 6 +++++-
 frontend/src/components/Output/Multitumor/GoodnessFit.js | 6 +++---
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ContinuousDeviance.js b/frontend/src/components/IndividualModel/ContinuousDeviance.js
index e5c30b04..11af916d 100644
--- a/frontend/src/components/IndividualModel/ContinuousDeviance.js
+++ b/frontend/src/components/IndividualModel/ContinuousDeviance.js
@@ -20,7 +20,7 @@ class ContinuousDeviance extends Component {
                 </colgroup>
                 <thead>
                     <tr className="bg-custom">
-                        <th colSpan="9">Likelihoods of Interest</th>
+                        <th colSpan="9">Likelihoods</th>
                     </tr>
                     <tr>
                         <th>Model</th>
diff --git a/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js b/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js
index 6afca764..888aa5ca 100644
--- a/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js
+++ b/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js
@@ -22,7 +22,7 @@ class ContinuousTestOfInterest extends Component {
                 </colgroup>
                 <thead>
                     <tr className="bg-custom text-left">
-                        <th colSpan="4">Test of Interest</th>
+                        <th colSpan="4">Tests of Mean and Variance Fits</th>
                     </tr>
                     <tr>
                         <th>Test</th>
diff --git a/frontend/src/components/IndividualModel/GoodnessFit.js b/frontend/src/components/IndividualModel/GoodnessFit.js
index e70063dd..1dd0766e 100644
--- a/frontend/src/components/IndividualModel/GoodnessFit.js
+++ b/frontend/src/components/IndividualModel/GoodnessFit.js
@@ -8,14 +8,14 @@ import {ff} from "@/utils/formatters";
 
 /* eslint-disable */
 const hdr_c_normal = [
-        "Dose", "Size", "Observed Mean", "Calculated Mean", "Estimated Mean",
-        "Observed SD", "Calculated SD", "Estimated SD", "Scaled Residual",
+        "Dose", "N", "Observed Mean", "Calculated Mean", "Estimated Mean",
+        "Observed SD", "Calculated SD", "Model MLE", "Scaled Residual",
     ], // zzz #30
     hdr_c_lognormal = [
-        "Dose", "Size", "Observed Mean", "Calculated Median", "Estimated Median",
+        "Dose", "N", "Observed Mean", "Calculated Median", "Estimated Median",
         "Observed SD", "Calculated GSD", "Estimated GSD", "Scaled Residual",
     ],
-    hdr_d = [ "Dose", "Size", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
+    hdr_d = [ "Dose", "N", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
 /* eslint-enable */
 
 @observer
@@ -66,6 +66,7 @@ class GoodnessFit extends Component {
                                       <td>{ff(gof.calc_mean[i])}</td>
                                       <td>{ff(gof.est_mean[i])}</td>
                                       <td>{useFF ? ff(gof.obs_sd[i]) : gof.obs_sd[i]}</td>
+                                      {/* zzz # 32 */}
                                       <td>{ff(gof.calc_sd[i])}</td>
                                       <td>{ff(gof.est_sd[i])}</td>
                                       <td>{ff(gof.residual[i])}</td>
diff --git a/frontend/src/components/IndividualModel/ModelParameters.js b/frontend/src/components/IndividualModel/ModelParameters.js
index 951ab64e..1ddd02f1 100644
--- a/frontend/src/components/IndividualModel/ModelParameters.js
+++ b/frontend/src/components/IndividualModel/ModelParameters.js
@@ -50,7 +50,11 @@ class ModelParameters extends Component {
                                         parameterFormatter(parameters.values[i])
                                     )}
                                 </td>
-                                <td>{bounded ? "NA" : parameterFormatter(parameters.se[i])}</td>
+                                <td>
+                                    {bounded
+                                        ? "Not Reported"
+                                        : parameterFormatter(parameters.se[i])}
+                                </td>
                             </tr>
                         );
                     })}
diff --git a/frontend/src/components/Output/Multitumor/GoodnessFit.js b/frontend/src/components/Output/Multitumor/GoodnessFit.js
index b0a9a0ef..0c092e6d 100644
--- a/frontend/src/components/Output/Multitumor/GoodnessFit.js
+++ b/frontend/src/components/Output/Multitumor/GoodnessFit.js
@@ -8,14 +8,14 @@ import {ff} from "@/utils/formatters";
 
 /* eslint-disable */
 const hdr_c_normal = [
-        "Dose", "Size", "Observed Mean", "Calculated Mean", "Estimated Mean",
+        "Dose", "N", "Observed Mean", "Calculated Mean", "Estimated Mean",
         "Observed SD", "Calculated SD", "Estimated SD", "Scaled Residual",
     ], // zzz #30
     hdr_c_lognormal = [
-        "Dose", "Size", "Observed Mean", "Calculated Median", "Estimated Median",
+        "Dose", "N", "Observed Mean", "Calculated Median", "Estimated Median",
         "Observed SD", "Calculated GSD", "Estimated GSD", "Scaled Residual",
     ],
-    hdr_d = [ "Dose", "Size", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
+    hdr_d = [ "Dose", "N", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
 /* eslint-enable */
 
 @observer

From 0e1762672cdc010f0eea47fd5e7f4ab607a04c88 Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Tue, 19 Dec 2023 09:41:19 -0500
Subject: [PATCH 04/29] 2, 6

---
 frontend/src/components/Main/OptionsForm/OptionsFormList.js | 2 +-
 frontend/src/components/Output/BayesianResultTable.js       | 4 ++--
 frontend/src/components/Output/FrequentistResultTable.js    | 4 ++--
 frontend/src/components/Output/Multitumor/ResultTable.js    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Main/OptionsForm/OptionsFormList.js b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
index 075cafea..fc93fe5e 100644
--- a/frontend/src/components/Main/OptionsForm/OptionsFormList.js
+++ b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
@@ -37,7 +37,7 @@ class OptionsFormList extends Component {
                                             <th>BMR Type</th>
                                             <th>BMRF</th>
                                             <th>Tail Probability</th>
-                                            <th>Confidence Level</th>
+                                            <th>Confidence Level (one-sided)</th>
                                             <th>
                                                 Distribution +<br />
                                                 Variance&nbsp;
diff --git a/frontend/src/components/Output/BayesianResultTable.js b/frontend/src/components/Output/BayesianResultTable.js
index b71d7eaa..99a3aaaa 100644
--- a/frontend/src/components/Output/BayesianResultTable.js
+++ b/frontend/src/components/Output/BayesianResultTable.js
@@ -36,8 +36,8 @@ class BayesianResultTable extends Component {
                         <th>BMD</th>
                         <th>BMDU</th>
                         <th>Unnormalized Log Posterior Probability</th>
-                        <th>Scaled Residual for Dose Group near BMD</th>
-                        <th>Scaled Residual for Control Dose Group</th>
+                        <th>Scaled Residual at Control</th>
+                        <th>Scaled Residual near BMD</th>
                     </tr>
                 </thead>
                 <tbody className="table-bordered">
diff --git a/frontend/src/components/Output/FrequentistResultTable.js b/frontend/src/components/Output/FrequentistResultTable.js
index ae3a8bdc..ee120927 100644
--- a/frontend/src/components/Output/FrequentistResultTable.js
+++ b/frontend/src/components/Output/FrequentistResultTable.js
@@ -326,8 +326,8 @@ class FrequentistResultTable extends Component {
                             <i>P</i>-Value
                         </th>
                         <th>AIC</th>
-                        <th>Scaled Residual for Dose Group near BMD</th>
-                        <th>Scaled Residual for Control Dose Group</th>
+                        <th>Scaled Residual at Control</th>
+                        <th>Scaled Residual near BMD</th>
                         {store.recommendationEnabled ? (
                             <th>
                                 <Button
diff --git a/frontend/src/components/Output/Multitumor/ResultTable.js b/frontend/src/components/Output/Multitumor/ResultTable.js
index ce51c436..d96e542b 100644
--- a/frontend/src/components/Output/Multitumor/ResultTable.js
+++ b/frontend/src/components/Output/Multitumor/ResultTable.js
@@ -41,8 +41,8 @@ class ResultTable extends Component {
                             <i>P</i>-Value
                         </th>
                         <th>AIC</th>
-                        <th>Scaled Residual for Dose Group near BMD</th>
-                        <th>Scaled Residual for Control Dose Group</th>
+                        <th>Scaled Residual at Control</th>
+                        <th>Scaled Residual near BMD</th>
                     </tr>
                 </thead>
                 <tbody className="table-bordered">

From ba412d09961b6c5bb29bda74e8c85a492a399712 Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Tue, 19 Dec 2023 17:17:51 -0500
Subject: [PATCH 05/29] 31

---
 .../src/components/Output/Multitumor/GoodnessFit.js   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Output/Multitumor/GoodnessFit.js b/frontend/src/components/Output/Multitumor/GoodnessFit.js
index 0c092e6d..d9e70dfe 100644
--- a/frontend/src/components/Output/Multitumor/GoodnessFit.js
+++ b/frontend/src/components/Output/Multitumor/GoodnessFit.js
@@ -8,12 +8,12 @@ import {ff} from "@/utils/formatters";
 
 /* eslint-disable */
 const hdr_c_normal = [
-        "Dose", "N", "Observed Mean", "Calculated Mean", "Estimated Mean",
-        "Observed SD", "Calculated SD", "Estimated SD", "Scaled Residual",
-    ], // zzz #30
+        "Dose", "N", "Observed Mean", "Calculated Mean", "Model Fitted Mean",
+        "Sample SD", "Model Fitted SD", "Scaled Residual",
+    ],
     hdr_c_lognormal = [
-        "Dose", "N", "Observed Mean", "Calculated Median", "Estimated Median",
-        "Observed SD", "Calculated GSD", "Estimated GSD", "Scaled Residual",
+        "Dose", "N", "Sample Mean", "Approximate Sample Median", "Model Fitted Median",
+        "Sample SD", "Approximate Sample GSD", "Model FItted GSD", "Scaled Residual",
     ],
     hdr_d = [ "Dose", "N", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
 /* eslint-enable */
@@ -66,7 +66,6 @@ class GoodnessFit extends Component {
                                       <td>{ff(gof.calc_mean[i])}</td>
                                       <td>{ff(gof.est_mean[i])}</td>
                                       <td>{useFF ? ff(gof.obs_sd[i]) : gof.obs_sd[i]}</td>
-                                      <td>{ff(gof.calc_sd[i])}</td>
                                       <td>{ff(gof.est_sd[i])}</td>
                                       <td>{ff(gof.residual[i])}</td>
                                   </tr>

From 9a481bc5a5791a7bc36231b1217d7a7a0f507b9a Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Thu, 4 Jan 2024 13:39:41 -0500
Subject: [PATCH 06/29] testfix

---
 tests/analysis/test_executor.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/analysis/test_executor.py b/tests/analysis/test_executor.py
index fec5669b..8fbf25cf 100644
--- a/tests/analysis/test_executor.py
+++ b/tests/analysis/test_executor.py
@@ -169,17 +169,17 @@ def test_disttype(self, bmds3_complete_continuous):
         session = AnalysisSession.create(data, 0, 0)
         assert len(session.frequentist.models) == 5
         names = [model.name() for model in session.frequentist.models]
-        assert names == ["ExponentialM3", "ExponentialM5", "Hill", "Linear", "Power"]
+        assert names == ["Exponential 3", "Exponential 5", "Hill", "Linear", "Power"]
 
         data["options"][0]["dist_type"] = 2
         session = AnalysisSession.create(data, 0, 0)
         assert len(session.frequentist.models) == 5
         names = [model.name() for model in session.frequentist.models]
-        assert names == ["ExponentialM3", "ExponentialM5", "Hill", "Linear", "Power"]
+        assert names == ["Exponential 3", "Exponential 5", "Hill", "Linear", "Power"]
 
         # lognormal
         data["options"][0]["dist_type"] = 3
         session = AnalysisSession.create(data, 0, 0)
         assert len(session.frequentist.models) == 2
         names = [model.name() for model in session.frequentist.models]
-        assert names == ["ExponentialM3", "ExponentialM5"]
+        assert names == ["Exponential 3", "Exponential 5"]

From 40b49f15754f4453717cb3ff22ef9c4e4fa88645 Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Thu, 4 Jan 2024 13:48:35 -0500
Subject: [PATCH 07/29] rm comment, 31

---
 .../src/components/IndividualModel/GoodnessFit.js   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/IndividualModel/GoodnessFit.js b/frontend/src/components/IndividualModel/GoodnessFit.js
index 1dd0766e..7512762a 100644
--- a/frontend/src/components/IndividualModel/GoodnessFit.js
+++ b/frontend/src/components/IndividualModel/GoodnessFit.js
@@ -8,12 +8,12 @@ import {ff} from "@/utils/formatters";
 
 /* eslint-disable */
 const hdr_c_normal = [
-        "Dose", "N", "Observed Mean", "Calculated Mean", "Estimated Mean",
-        "Observed SD", "Calculated SD", "Model MLE", "Scaled Residual",
-    ], // zzz #30
+        "Dose", "N", "Sample Mean", "Model fitted Mean",
+        "Sample SD", "Model MLE", "Scaled Residual",
+    ],
     hdr_c_lognormal = [
-        "Dose", "N", "Observed Mean", "Calculated Median", "Estimated Median",
-        "Observed SD", "Calculated GSD", "Estimated GSD", "Scaled Residual",
+        "Dose", "N", "Sample Mean", "Approximate Sample Median", "Estimated Median",
+        "Sample SD", "Approximate Sample GSD", "Model fitted GSD", "Scaled Residual",
     ],
     hdr_d = [ "Dose", "N", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
 /* eslint-enable */
@@ -63,11 +63,8 @@ class GoodnessFit extends Component {
                                       <td>{item}</td>
                                       <td>{gof.size[i]}</td>
                                       <td>{useFF ? ff(gof.obs_mean[i]) : gof.obs_mean[i]}</td>
-                                      <td>{ff(gof.calc_mean[i])}</td>
                                       <td>{ff(gof.est_mean[i])}</td>
                                       <td>{useFF ? ff(gof.obs_sd[i]) : gof.obs_sd[i]}</td>
-                                      {/* zzz # 32 */}
-                                      <td>{ff(gof.calc_sd[i])}</td>
                                       <td>{ff(gof.est_sd[i])}</td>
                                       <td>{ff(gof.residual[i])}</td>
                                   </tr>

From 163f18a4c49a5e2b7df223ad67c1d69abd6a9b01 Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Thu, 4 Jan 2024 15:01:34 -0500
Subject: [PATCH 08/29] 3 note, 2, 5a, 12, 24, rm comment

---
 frontend/src/components/IndividualModel/ContinuousSummary.js | 4 ++--
 frontend/src/components/IndividualModel/ModelOptionsTable.js | 1 +
 frontend/src/components/IndividualModel/ModelParameters.js   | 2 +-
 frontend/src/components/Main/OptionsForm/OptionsFormList.js  | 1 +
 frontend/src/components/Output/OptionSetTable.js             | 3 ++-
 frontend/src/constants/logicConstants.js                     | 1 -
 frontend/src/constants/modelConstants.js                     | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ContinuousSummary.js b/frontend/src/components/IndividualModel/ContinuousSummary.js
index 58acba62..91547f45 100644
--- a/frontend/src/components/IndividualModel/ContinuousSummary.js
+++ b/frontend/src/components/IndividualModel/ContinuousSummary.js
@@ -19,7 +19,7 @@ class ContinuousSummary extends Component {
                 </colgroup>
                 <thead>
                     <tr className="bg-custom">
-                        <th colSpan="2">Summary</th>
+                        <th colSpan="2">Model Summary</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -50,7 +50,7 @@ class ContinuousSummary extends Component {
                         <td>{fractionalFormatter(p_value)}</td>
                     </tr>
                     <tr>
-                        <td>Model DOF</td>
+                        <td>Model d.f.</td>
                         <td>{ff(results.tests.dfs[3])}</td>
                     </tr>
                 </tbody>
diff --git a/frontend/src/components/IndividualModel/ModelOptionsTable.js b/frontend/src/components/IndividualModel/ModelOptionsTable.js
index 690a7fe4..88ca9a46 100644
--- a/frontend/src/components/IndividualModel/ModelOptionsTable.js
+++ b/frontend/src/components/IndividualModel/ModelOptionsTable.js
@@ -54,6 +54,7 @@ class ModelOptionsTable extends Component {
                 ["Distribution Type", getLabel(model.settings.disttype, distTypeOptions)],
                 ["Direction", model.settings.is_increasing ? "Up" : "Down"],
                 ["Confidence Level", 1 - ff(model.settings.alpha)],
+                // zzz #3 check hybrid
                 ["Tail Probability", ff(model.settings.tail_prob)],
                 hasDegrees.has(model.model_class.verbose)
                     ? ["Degree", ff(model.settings.degree)]
diff --git a/frontend/src/components/IndividualModel/ModelParameters.js b/frontend/src/components/IndividualModel/ModelParameters.js
index 1ddd02f1..6a65b79c 100644
--- a/frontend/src/components/IndividualModel/ModelParameters.js
+++ b/frontend/src/components/IndividualModel/ModelParameters.js
@@ -40,7 +40,7 @@ class ModelParameters extends Component {
                                 <td>
                                     {bounded ? (
                                         <>
-                                            <span>Bounded</span>
+                                            <span>On Bound</span>
                                             <HelpTextPopover
                                                 title="On Bound"
                                                 content={`The value of this parameter, ${parameters.values[i]}, is within the tolerance of the bound`}
diff --git a/frontend/src/components/Main/OptionsForm/OptionsFormList.js b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
index fc93fe5e..5b24488f 100644
--- a/frontend/src/components/Main/OptionsForm/OptionsFormList.js
+++ b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
@@ -36,6 +36,7 @@ class OptionsFormList extends Component {
                                         <>
                                             <th>BMR Type</th>
                                             <th>BMRF</th>
+                                            {/* zzz #3 add hybrid check here too */}
                                             <th>Tail Probability</th>
                                             <th>Confidence Level (one-sided)</th>
                                             <th>
diff --git a/frontend/src/components/Output/OptionSetTable.js b/frontend/src/components/Output/OptionSetTable.js
index 5f9f9275..d3d3068d 100644
--- a/frontend/src/components/Output/OptionSetTable.js
+++ b/frontend/src/components/Output/OptionSetTable.js
@@ -34,8 +34,9 @@ class OptionSetTable extends Component {
                     "Maximum Polynomial Degree",
                     getLabel(selectedDatasetOptions.degree, allDegreeOptions),
                 ],
+                // zzz #3 hybrid check
                 ["Tail Probability", ff(selectedModelOptions.tail_probability)],
-                ["Confidence Level", ff(selectedModelOptions.confidence_level)],
+                ["Confidence Level (one-sided)", ff(selectedModelOptions.confidence_level)],
             ];
         } else if (getModelType === MODEL_DICHOTOMOUS) {
             rows = [
diff --git a/frontend/src/constants/logicConstants.js b/frontend/src/constants/logicConstants.js
index 3111982a..fad718b4 100644
--- a/frontend/src/constants/logicConstants.js
+++ b/frontend/src/constants/logicConstants.js
@@ -136,7 +136,6 @@ export const RULES = Object.freeze({
             enabledNested: true,
         },
         [RULES.ROI_LARGE]: {
-            // zzz #8
             name: "Abs(Residual of interest) too large",
             notes: val => `|Residual Near BMD| > ${val}`,
             hasThreshold: true,
diff --git a/frontend/src/constants/modelConstants.js b/frontend/src/constants/modelConstants.js
index 35dfcc18..4fda10c1 100644
--- a/frontend/src/constants/modelConstants.js
+++ b/frontend/src/constants/modelConstants.js
@@ -78,7 +78,7 @@ const modelsList = {
     hasDegrees = new Set(["Multistage", "Polynomial"]),
     getNameFromDegrees = function(model) {
         const degree = model.parameters.names.length - 1;
-        return `Multistage ${degree}°`;
+        return `Multistage ${degree}`;
     };
 
 export {allModelOptions, getNameFromDegrees, hasDegrees, isLognormal, models, modelsList};

From e7af169975cbd152901148b4c63d66db148f20ee Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Thu, 4 Jan 2024 15:09:08 -0500
Subject: [PATCH 09/29] js eol lf

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 9d024599..0daa15e3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 # https://docs.github.com/en/github/using-git/configuring-git-to-handle-line-endings
 # fix line endings
 * text=auto
-
+*.js text eol=lf
 # ignore paths from language statistics:
 # https://github.com/github/linguist#using-gitattributes
 bmds_server/static/vendor/* linguist-vendored

From 3e7bb4209e7c5710f5a180bb6a24c4b111e8dc9d Mon Sep 17 00:00:00 2001
From: hausman-gdit <karen.hausman@gdit.com>
Date: Thu, 4 Jan 2024 21:18:04 -0500
Subject: [PATCH 10/29] revert MT

---
 .../src/components/Output/Multitumor/GoodnessFit.js   | 11 ++++++-----
 .../src/components/Output/Multitumor/ResultTable.js   |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Output/Multitumor/GoodnessFit.js b/frontend/src/components/Output/Multitumor/GoodnessFit.js
index d9e70dfe..d896efcb 100644
--- a/frontend/src/components/Output/Multitumor/GoodnessFit.js
+++ b/frontend/src/components/Output/Multitumor/GoodnessFit.js
@@ -8,14 +8,14 @@ import {ff} from "@/utils/formatters";
 
 /* eslint-disable */
 const hdr_c_normal = [
-        "Dose", "N", "Observed Mean", "Calculated Mean", "Model Fitted Mean",
-        "Sample SD", "Model Fitted SD", "Scaled Residual",
+        "Dose", "Size", "Observed Mean", "Calculated Mean", "Estimated Mean",
+        "Observed SD", "Calculated SD", "Estimated SD", "Scaled Residual",
     ],
     hdr_c_lognormal = [
-        "Dose", "N", "Sample Mean", "Approximate Sample Median", "Model Fitted Median",
-        "Sample SD", "Approximate Sample GSD", "Model FItted GSD", "Scaled Residual",
+        "Dose", "Size", "Observed Mean", "Calculated Median", "Estimated Median",
+        "Observed SD", "Calculated GSD", "Estimated GSD", "Scaled Residual",
     ],
-    hdr_d = [ "Dose", "N", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
+    hdr_d = [ "Dose", "Size", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
 /* eslint-enable */
 
 @observer
@@ -66,6 +66,7 @@ class GoodnessFit extends Component {
                                       <td>{ff(gof.calc_mean[i])}</td>
                                       <td>{ff(gof.est_mean[i])}</td>
                                       <td>{useFF ? ff(gof.obs_sd[i]) : gof.obs_sd[i]}</td>
+                                      <td>{ff(gof.calc_sd[i])}</td>
                                       <td>{ff(gof.est_sd[i])}</td>
                                       <td>{ff(gof.residual[i])}</td>
                                   </tr>
diff --git a/frontend/src/components/Output/Multitumor/ResultTable.js b/frontend/src/components/Output/Multitumor/ResultTable.js
index d96e542b..ce51c436 100644
--- a/frontend/src/components/Output/Multitumor/ResultTable.js
+++ b/frontend/src/components/Output/Multitumor/ResultTable.js
@@ -41,8 +41,8 @@ class ResultTable extends Component {
                             <i>P</i>-Value
                         </th>
                         <th>AIC</th>
-                        <th>Scaled Residual at Control</th>
-                        <th>Scaled Residual near BMD</th>
+                        <th>Scaled Residual for Dose Group near BMD</th>
+                        <th>Scaled Residual for Control Dose Group</th>
                     </tr>
                 </thead>
                 <tbody className="table-bordered">

From f7c9b0ff3b7b9b4c76a184d43b40fba19ad01e70 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Thu, 8 Feb 2024 12:56:59 -0500
Subject: [PATCH 11/29] rename percentile to cummulative probability

---
 frontend/src/components/IndividualModel/CDFTable.js | 6 +++++-
 frontend/src/constants/plotting.js                  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/IndividualModel/CDFTable.js b/frontend/src/components/IndividualModel/CDFTable.js
index 38362208..d06069e3 100644
--- a/frontend/src/components/IndividualModel/CDFTable.js
+++ b/frontend/src/components/IndividualModel/CDFTable.js
@@ -11,12 +11,16 @@ class CDFTable extends Component {
         const {bmd_dist} = this.props;
         return (
             <table className="table table-sm table-bordered text-right">
+                <colgroup>
+                    <col width="50%" />
+                    <col width="50%" />
+                </colgroup>
                 <thead>
                     <tr className="bg-custom text-left">
                         <th colSpan="2">CDF</th>
                     </tr>
                     <tr>
-                        <th>Percentile</th>
+                        <th>Cumulative Probability</th>
                         <th>BMD</th>
                     </tr>
                 </thead>
diff --git a/frontend/src/constants/plotting.js b/frontend/src/constants/plotting.js
index 2135a8ff..0a07e965 100644
--- a/frontend/src/constants/plotting.js
+++ b/frontend/src/constants/plotting.js
@@ -114,7 +114,7 @@ export const getResponse = dataset => {
         let layout = _.cloneDeep(doseResponseLayout);
         layout.title.text = "BMD Cumulative distribution function";
         layout.xaxis.title.text = getDoseLabel(dataset);
-        layout.yaxis.title.text = "Percentile";
+        layout.yaxis.title.text = "Cumulative Probability";
         layout.yaxis.range = [0, 1];
         return layout;
     },

From f8850352aaf4d07e7ff275f50740ed5c31c83f06 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Thu, 8 Feb 2024 12:57:15 -0500
Subject: [PATCH 12/29] resize tables as needed

---
 .../src/components/IndividualModel/GoodnessFit.js     | 11 +++++++----
 .../src/components/IndividualModel/ModelParameters.js | 10 ++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/IndividualModel/GoodnessFit.js b/frontend/src/components/IndividualModel/GoodnessFit.js
index 7512762a..b0e7db49 100644
--- a/frontend/src/components/IndividualModel/GoodnessFit.js
+++ b/frontend/src/components/IndividualModel/GoodnessFit.js
@@ -8,12 +8,12 @@ import {ff} from "@/utils/formatters";
 
 /* eslint-disable */
 const hdr_c_normal = [
-        "Dose", "N", "Sample Mean", "Model fitted Mean",
+        "Dose", "N", "Sample Mean", "Model Fitted Mean",
         "Sample SD", "Model MLE", "Scaled Residual",
     ],
     hdr_c_lognormal = [
         "Dose", "N", "Sample Mean", "Approximate Sample Median", "Estimated Median",
-        "Sample SD", "Approximate Sample GSD", "Model fitted GSD", "Scaled Residual",
+        "Sample SD", "Approximate Sample GSD", "Model Fitted GSD", "Scaled Residual",
     ],
     hdr_d = [ "Dose", "N", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
 /* eslint-enable */
@@ -22,8 +22,11 @@ const hdr_c_normal = [
 class GoodnessFit extends Component {
     getHeaders(dtype, settings) {
         if (dtype == Dtype.CONTINUOUS || dtype == Dtype.CONTINUOUS_INDIVIDUAL) {
-            const headers = isLognormal(settings.disttype) ? hdr_c_lognormal : hdr_c_normal;
-            return [headers, [10, 10, 10, 12, 12, 12, 10, 12, 12]];
+            const headers = isLognormal(settings.disttype) ? hdr_c_lognormal : hdr_c_normal,
+                colWidths = isLognormal(settings.disttype)
+                    ? [10, 10, 10, 12, 12, 12, 10, 12, 12]
+                    : [1, 1, 1, 1, 1, 1, 1];
+            return [headers, colWidths];
         }
         if (dtype == Dtype.DICHOTOMOUS) {
             return [hdr_d, [17, 16, 16, 17, 17, 17]];
diff --git a/frontend/src/components/IndividualModel/ModelParameters.js b/frontend/src/components/IndividualModel/ModelParameters.js
index 6a65b79c..65594553 100644
--- a/frontend/src/components/IndividualModel/ModelParameters.js
+++ b/frontend/src/components/IndividualModel/ModelParameters.js
@@ -15,15 +15,13 @@ class ModelParameters extends Component {
         return (
             <table className="table table-sm table-bordered text-right col-l-1">
                 <colgroup>
-                    <col width="20%" />
-                    <col width="20%" />
-                    <col width="20%" />
-                    <col width="20%" />
-                    <col width="20%" />
+                    <col width="34%" />
+                    <col width="33%" />
+                    <col width="33%" />
                 </colgroup>
                 <thead>
                     <tr className="bg-custom">
-                        <th colSpan="5">Model Parameters</th>
+                        <th colSpan="3">Model Parameters</th>
                     </tr>
                     <tr>
                         <th>Variable</th>

From b04dddc3f9ab8123cd558b9526dea28b51988952 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 10:12:10 -0500
Subject: [PATCH 13/29] remove change

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 0daa15e3..9d024599 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 # https://docs.github.com/en/github/using-git/configuring-git-to-handle-line-endings
 # fix line endings
 * text=auto
-*.js text eol=lf
+
 # ignore paths from language statistics:
 # https://github.com/github/linguist#using-gitattributes
 bmds_server/static/vendor/* linguist-vendored

From 54c2e1a9a41fae56b30b32ab0266012244edd850 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 10:12:46 -0500
Subject: [PATCH 14/29] fix test w/ degree symbol

---
 tests/integration/test_integration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py
index e435ce92..a05acc87 100644
--- a/tests/integration/test_integration.py
+++ b/tests/integration/test_integration.py
@@ -250,8 +250,8 @@ def test_multi_tumor(self):
             page.locator("#close-modal").click()
 
             # check one result (individual)
-            page.get_by_role("link", name="Multistage 1°*").click()
-            expect(page.get_by_role("dialog")).to_contain_text("Multistage 1°")
+            page.get_by_role("link", name="Multistage 1*").click()
+            expect(page.get_by_role("dialog")).to_contain_text("Multistage 1")
             page.locator("#close-modal").click()
 
             # Read-only

From 9007c7fdb5c8aa2f228c05f615b5688cf4a91eda Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 11:37:57 -0500
Subject: [PATCH 15/29] rename log likelihood globally

---
 frontend/src/components/IndividualModel/ContinuousDeviance.js | 2 +-
 frontend/src/components/IndividualModel/ContinuousSummary.js  | 2 +-
 .../src/components/IndividualModel/DichotomousDeviance.js     | 2 +-
 frontend/src/components/IndividualModel/DichotomousSummary.js | 2 +-
 frontend/src/components/IndividualModel/ModelDetailModal.js   | 2 +-
 .../src/components/Output/Multitumor/AnalysisOfDeviance.js    | 2 +-
 frontend/src/components/Output/Multitumor/MsCombo.js          | 2 +-
 .../components/Output/NestedDichotomous/BootstrapResults.js   | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ContinuousDeviance.js b/frontend/src/components/IndividualModel/ContinuousDeviance.js
index 11af916d..6c692bef 100644
--- a/frontend/src/components/IndividualModel/ContinuousDeviance.js
+++ b/frontend/src/components/IndividualModel/ContinuousDeviance.js
@@ -24,7 +24,7 @@ class ContinuousDeviance extends Component {
                     </tr>
                     <tr>
                         <th>Model</th>
-                        <th>Log Likelihood</th>
+                        <th>-2* Log(Likelihood Ratio)</th>
                         <th># of Parameters</th>
                         <th>AIC</th>
                     </tr>
diff --git a/frontend/src/components/IndividualModel/ContinuousSummary.js b/frontend/src/components/IndividualModel/ContinuousSummary.js
index 91547f45..748da78a 100644
--- a/frontend/src/components/IndividualModel/ContinuousSummary.js
+++ b/frontend/src/components/IndividualModel/ContinuousSummary.js
@@ -40,7 +40,7 @@ class ContinuousSummary extends Component {
                         <td>{ff(results.fit.aic)}</td>
                     </tr>
                     <tr>
-                        <td>Log Likelihood</td>
+                        <td>-2* Log(Likelihood Ratio)</td>
                         <td>{ff(results.fit.loglikelihood)}</td>
                     </tr>
                     <tr>
diff --git a/frontend/src/components/IndividualModel/DichotomousDeviance.js b/frontend/src/components/IndividualModel/DichotomousDeviance.js
index cf7b7add..552e4d5d 100644
--- a/frontend/src/components/IndividualModel/DichotomousDeviance.js
+++ b/frontend/src/components/IndividualModel/DichotomousDeviance.js
@@ -26,7 +26,7 @@ class DichotomousDeviance extends Component {
                     </tr>
                     <tr>
                         <th>Model</th>
-                        <th>Log Likelihood</th>
+                        <th>-2* Log(Likelihood Ratio)</th>
                         <th># Parameters</th>
                         <th>Deviance</th>
                         <th>Test DOF</th>
diff --git a/frontend/src/components/IndividualModel/DichotomousSummary.js b/frontend/src/components/IndividualModel/DichotomousSummary.js
index b06b9aa5..d2a76e5a 100644
--- a/frontend/src/components/IndividualModel/DichotomousSummary.js
+++ b/frontend/src/components/IndividualModel/DichotomousSummary.js
@@ -39,7 +39,7 @@ class DichotomousSummary extends Component {
                         <td>{ff(results.fit.aic)}</td>
                     </tr>
                     <tr>
-                        <td>Log Likelihood</td>
+                        <td>-2* Log(Likelihood Ratio)</td>
                         <td>{ff(results.fit.loglikelihood)}</td>
                     </tr>
                     <tr>
diff --git a/frontend/src/components/IndividualModel/ModelDetailModal.js b/frontend/src/components/IndividualModel/ModelDetailModal.js
index 85f985bc..cae4ad96 100644
--- a/frontend/src/components/IndividualModel/ModelDetailModal.js
+++ b/frontend/src/components/IndividualModel/ModelDetailModal.js
@@ -82,7 +82,7 @@ class ModelBody extends Component {
                 ) : null}
                 {isContinuous ? (
                     <Row>
-                        <Col xl={6}>
+                        <Col xl={8}>
                             <ContinuousDeviance store={outputStore} />
                             <ContinuousTestOfInterest store={outputStore} />
                         </Col>
diff --git a/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js b/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js
index 4209aad4..c46e7c76 100644
--- a/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js
+++ b/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js
@@ -24,7 +24,7 @@ class AnalysisOfDeviance extends Component {
                     </tr>
                     <tr>
                         <th>Model</th>
-                        <th>Log Likelihood</th>
+                        <th>-2* Log(Likelihood Ratio)</th>
                         <th># Parameters</th>
                         <th>Deviance</th>
                         <th>Test DOF</th>
diff --git a/frontend/src/components/Output/Multitumor/MsCombo.js b/frontend/src/components/Output/Multitumor/MsCombo.js
index 5038617d..bf994e88 100644
--- a/frontend/src/components/Output/Multitumor/MsCombo.js
+++ b/frontend/src/components/Output/Multitumor/MsCombo.js
@@ -38,7 +38,7 @@ class MsComboSummary extends Component {
                 ["Combined Log-Likelihood", ff(results.ll)],
                 ["Combined Log-Likelihood Constant", ff(results.ll_constant)],
             ];
-        return <TwoColumnTable data={data} label={label} />;
+        return <TwoColumnTable data={data} label={label} colwidths={[40, 60]} />;
     }
 }
 MsComboSummary.propTypes = {
diff --git a/frontend/src/components/Output/NestedDichotomous/BootstrapResults.js b/frontend/src/components/Output/NestedDichotomous/BootstrapResults.js
index 0b396ac2..ba2b74ff 100644
--- a/frontend/src/components/Output/NestedDichotomous/BootstrapResults.js
+++ b/frontend/src/components/Output/NestedDichotomous/BootstrapResults.js
@@ -12,7 +12,7 @@ class BootstrapResult extends Component {
             data = [
                 ["# Iterations", settings.bootstrap_iterations],
                 ["Bootstrap Seed", ff(settings.bootstrap_seed)],
-                ["Log-likelihood", ff(results.ll)],
+                ["-2* Log(Likelihood Ratio)", ff(results.ll)],
                 ["Observed Chi-square", ff(results.obs_chi_sq)],
                 [
                     <span key={0}>
@@ -21,7 +21,7 @@ class BootstrapResult extends Component {
                     ff(results.combined_pvalue),
                 ],
             ];
-        return <TwoColumnTable data={data} label="Bootstrap Results" />;
+        return <TwoColumnTable data={data} label="Bootstrap Results" colwidths={[40, 60]} />;
     }
 }
 BootstrapResult.propTypes = {

From eabf4959bb5ceb2632c87461f621c994c7722795 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 11:38:40 -0500
Subject: [PATCH 16/29] fix bug in layout

---
 frontend/src/components/Output/Multitumor/Summary.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Output/Multitumor/Summary.js b/frontend/src/components/Output/Multitumor/Summary.js
index 244f2d09..3f6600a7 100644
--- a/frontend/src/components/Output/Multitumor/Summary.js
+++ b/frontend/src/components/Output/Multitumor/Summary.js
@@ -22,7 +22,8 @@ class Summary extends Component {
                     fourDecimalFormatter(model.gof.p_value),
                 ],
                 ["Overall DOF", ff(model.gof.df)],
-                ["Chi²", ff(model.fit.chisq)][("Log Likelihood", ff(model.fit.loglikelihood))],
+                ["Chi²", ff(model.fit.chisq)],
+                ["-2* Log(Likelihood Ratio)", ff(model.fit.loglikelihood)],
             ];
         return <TwoColumnTable data={data} label="Summary" />;
     }

From 16553b0ec59dbe15d47a8f4df3fb49dae3394e46 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 11:48:05 -0500
Subject: [PATCH 17/29] rename scaled residual

---
 frontend/src/components/Output/BayesianResultTable.js    | 2 +-
 frontend/src/components/Output/FrequentistResultTable.js | 2 +-
 frontend/src/components/Output/Multitumor/ResultTable.js | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Output/BayesianResultTable.js b/frontend/src/components/Output/BayesianResultTable.js
index 99a3aaaa..d41fd1a8 100644
--- a/frontend/src/components/Output/BayesianResultTable.js
+++ b/frontend/src/components/Output/BayesianResultTable.js
@@ -63,8 +63,8 @@ class BayesianResultTable extends Component {
                                 <td>{ff(model.results.bmd)}</td>
                                 <td>{ff(model.results.bmdu)}</td>
                                 <td>{ff(model.results.fit.bic_equiv)}</td>
-                                <td>{ff(model.results.gof.roi)}</td>
                                 <td>{ff(model.results.gof.residual[0])}</td>
+                                <td>{ff(model.results.gof.roi)}</td>
                             </tr>
                         );
                     })}
diff --git a/frontend/src/components/Output/FrequentistResultTable.js b/frontend/src/components/Output/FrequentistResultTable.js
index ee120927..4420415c 100644
--- a/frontend/src/components/Output/FrequentistResultTable.js
+++ b/frontend/src/components/Output/FrequentistResultTable.js
@@ -242,8 +242,8 @@ class FrequentistRow extends Component {
                 <td>{ff(results.bmdu)}</td>
                 <td>{fractionalFormatter(getPValue(dataset.dtype, results))}</td>
                 <td>{ff(results.fit.aic)}</td>
-                <td>{ff(results.gof.roi)}</td>
                 <td>{ff(results.gof.residual[0])}</td>
+                <td>{ff(results.gof.roi)}</td>
                 <RecommendationTd
                     store={store}
                     data={data}
diff --git a/frontend/src/components/Output/Multitumor/ResultTable.js b/frontend/src/components/Output/Multitumor/ResultTable.js
index ce51c436..7d1255e6 100644
--- a/frontend/src/components/Output/Multitumor/ResultTable.js
+++ b/frontend/src/components/Output/Multitumor/ResultTable.js
@@ -41,8 +41,8 @@ class ResultTable extends Component {
                             <i>P</i>-Value
                         </th>
                         <th>AIC</th>
-                        <th>Scaled Residual for Dose Group near BMD</th>
-                        <th>Scaled Residual for Control Dose Group</th>
+                        <th>Scaled Residual at Control</th>
+                        <th>Scaled Residual near BMD</th>
                     </tr>
                 </thead>
                 <tbody className="table-bordered">
@@ -101,8 +101,8 @@ class ResultTable extends Component {
                                             <td>{ff(model.slope_factor)}</td>
                                             <td>{ff(model.gof.p_value)}</td>
                                             <td>{ff(model.fit.aic)}</td>
-                                            <td>{ff(model.gof.roi)}</td>
                                             <td>{ff(model.gof.residual[0])}</td>
+                                            <td>{ff(model.gof.roi)}</td>
                                         </tr>
                                     );
                                 })

From 33126affbcde2eaadd1b71eabbb44025254a5c1e Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 11:59:23 -0500
Subject: [PATCH 18/29] rename DOF to d.f.

---
 .../src/components/IndividualModel/ContinuousTestOfInterest.js  | 2 +-
 frontend/src/components/IndividualModel/DichotomousDeviance.js  | 2 +-
 frontend/src/components/IndividualModel/DichotomousSummary.js   | 2 +-
 frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js | 2 +-
 frontend/src/components/Output/Multitumor/Summary.js            | 2 +-
 frontend/src/components/Output/NestedDichotomous/Summary.js     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js b/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js
index 888aa5ca..5058773a 100644
--- a/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js
+++ b/frontend/src/components/IndividualModel/ContinuousTestOfInterest.js
@@ -30,7 +30,7 @@ class ContinuousTestOfInterest extends Component {
                             LLR
                             <HelpTextPopover title="LLR" content="2 * Log(Likelihood Ratio)" />
                         </th>
-                        <th>Test DOF</th>
+                        <th>Test d.f.</th>
                         <th>
                             <i>P</i>-Value
                         </th>
diff --git a/frontend/src/components/IndividualModel/DichotomousDeviance.js b/frontend/src/components/IndividualModel/DichotomousDeviance.js
index 552e4d5d..e948e2ff 100644
--- a/frontend/src/components/IndividualModel/DichotomousDeviance.js
+++ b/frontend/src/components/IndividualModel/DichotomousDeviance.js
@@ -29,7 +29,7 @@ class DichotomousDeviance extends Component {
                         <th>-2* Log(Likelihood Ratio)</th>
                         <th># Parameters</th>
                         <th>Deviance</th>
-                        <th>Test DOF</th>
+                        <th>Test d.f.</th>
                         <th>
                             <i>P</i>-Value
                         </th>
diff --git a/frontend/src/components/IndividualModel/DichotomousSummary.js b/frontend/src/components/IndividualModel/DichotomousSummary.js
index d2a76e5a..c1b733bc 100644
--- a/frontend/src/components/IndividualModel/DichotomousSummary.js
+++ b/frontend/src/components/IndividualModel/DichotomousSummary.js
@@ -49,7 +49,7 @@ class DichotomousSummary extends Component {
                         <td>{fourDecimalFormatter(results.gof.p_value)}</td>
                     </tr>
                     <tr>
-                        <td>Overall DOF</td>
+                        <td>Overall d.f.</td>
                         <td>{ff(results.gof.df)}</td>
                     </tr>
                     <tr>
diff --git a/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js b/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js
index c46e7c76..90435817 100644
--- a/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js
+++ b/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js
@@ -27,7 +27,7 @@ class AnalysisOfDeviance extends Component {
                         <th>-2* Log(Likelihood Ratio)</th>
                         <th># Parameters</th>
                         <th>Deviance</th>
-                        <th>Test DOF</th>
+                        <th>Test d.f.</th>
                         <th>
                             <i>P</i>-Value
                         </th>
diff --git a/frontend/src/components/Output/Multitumor/Summary.js b/frontend/src/components/Output/Multitumor/Summary.js
index 3f6600a7..e9f05a49 100644
--- a/frontend/src/components/Output/Multitumor/Summary.js
+++ b/frontend/src/components/Output/Multitumor/Summary.js
@@ -21,7 +21,7 @@ class Summary extends Component {
                     </span>,
                     fourDecimalFormatter(model.gof.p_value),
                 ],
-                ["Overall DOF", ff(model.gof.df)],
+                ["Overall d.f.", ff(model.gof.df)],
                 ["Chi²", ff(model.fit.chisq)],
                 ["-2* Log(Likelihood Ratio)", ff(model.fit.loglikelihood)],
             ];
diff --git a/frontend/src/components/Output/NestedDichotomous/Summary.js b/frontend/src/components/Output/NestedDichotomous/Summary.js
index 9589f6f1..a68c217d 100644
--- a/frontend/src/components/Output/NestedDichotomous/Summary.js
+++ b/frontend/src/components/Output/NestedDichotomous/Summary.js
@@ -20,7 +20,7 @@ class Summary extends Component {
                     </span>,
                     ff(results.combined_pvalue),
                 ],
-                ["D.O.F.", ff(results.dof)],
+                ["d.f.", ff(results.dof)],
                 [
                     <span key={1}>
                         Chi<sup>2</sup>

From e3a8853b4189becb88dc4d556909544728d7ea12 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 12:09:39 -0500
Subject: [PATCH 19/29] change Summary to Modeling Summary

---
 frontend/src/components/IndividualModel/ContinuousSummary.js  | 2 +-
 frontend/src/components/IndividualModel/DichotomousSummary.js | 2 +-
 frontend/src/components/Output/Multitumor/MsCombo.js          | 3 +--
 frontend/src/components/Output/Multitumor/Summary.js          | 2 +-
 frontend/src/components/Output/NestedDichotomous/Summary.js   | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ContinuousSummary.js b/frontend/src/components/IndividualModel/ContinuousSummary.js
index 748da78a..30d211b5 100644
--- a/frontend/src/components/IndividualModel/ContinuousSummary.js
+++ b/frontend/src/components/IndividualModel/ContinuousSummary.js
@@ -19,7 +19,7 @@ class ContinuousSummary extends Component {
                 </colgroup>
                 <thead>
                     <tr className="bg-custom">
-                        <th colSpan="2">Model Summary</th>
+                        <th colSpan="2">Modeling Summary</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/frontend/src/components/IndividualModel/DichotomousSummary.js b/frontend/src/components/IndividualModel/DichotomousSummary.js
index c1b733bc..be92923b 100644
--- a/frontend/src/components/IndividualModel/DichotomousSummary.js
+++ b/frontend/src/components/IndividualModel/DichotomousSummary.js
@@ -18,7 +18,7 @@ class DichotomousSummary extends Component {
                 </colgroup>
                 <thead>
                     <tr className="bg-custom">
-                        <th colSpan="2">Summary</th>
+                        <th colSpan="2">Modeling Summary</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/frontend/src/components/Output/Multitumor/MsCombo.js b/frontend/src/components/Output/Multitumor/MsCombo.js
index bf994e88..22bbb0ea 100644
--- a/frontend/src/components/Output/Multitumor/MsCombo.js
+++ b/frontend/src/components/Output/Multitumor/MsCombo.js
@@ -29,7 +29,6 @@ MsComboInfo.propTypes = {
 class MsComboSummary extends Component {
     render() {
         const {results} = this.props,
-            label = "Summary",
             data = [
                 ["BMD", ff(results.bmd)],
                 ["BMDL", ff(results.bmdl)],
@@ -38,7 +37,7 @@ class MsComboSummary extends Component {
                 ["Combined Log-Likelihood", ff(results.ll)],
                 ["Combined Log-Likelihood Constant", ff(results.ll_constant)],
             ];
-        return <TwoColumnTable data={data} label={label} colwidths={[40, 60]} />;
+        return <TwoColumnTable data={data} label={"Modeling Summary"} colwidths={[40, 60]} />;
     }
 }
 MsComboSummary.propTypes = {
diff --git a/frontend/src/components/Output/Multitumor/Summary.js b/frontend/src/components/Output/Multitumor/Summary.js
index e9f05a49..11db6689 100644
--- a/frontend/src/components/Output/Multitumor/Summary.js
+++ b/frontend/src/components/Output/Multitumor/Summary.js
@@ -25,7 +25,7 @@ class Summary extends Component {
                 ["Chi²", ff(model.fit.chisq)],
                 ["-2* Log(Likelihood Ratio)", ff(model.fit.loglikelihood)],
             ];
-        return <TwoColumnTable data={data} label="Summary" />;
+        return <TwoColumnTable data={data} label="Modeling Summary" />;
     }
 }
 
diff --git a/frontend/src/components/Output/NestedDichotomous/Summary.js b/frontend/src/components/Output/NestedDichotomous/Summary.js
index a68c217d..76432a88 100644
--- a/frontend/src/components/Output/NestedDichotomous/Summary.js
+++ b/frontend/src/components/Output/NestedDichotomous/Summary.js
@@ -28,7 +28,7 @@ class Summary extends Component {
                     ff(results.summary.chi_squared),
                 ],
             ];
-        return <TwoColumnTable label="Summary" data={data} />;
+        return <TwoColumnTable label="Modeling Summary" data={data} />;
     }
 }
 Summary.propTypes = {

From f6a93e98b63439b807cc32d3f97e355a88cee733 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 14:24:17 -0500
Subject: [PATCH 20/29] rename "Abs(Residual of interest)" -> "|Residual near
 BMD|"

---
 frontend/src/constants/logicConstants.js | 6 +++---
 tests/data/db.yaml                       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/constants/logicConstants.js b/frontend/src/constants/logicConstants.js
index fad718b4..8b184a96 100644
--- a/frontend/src/constants/logicConstants.js
+++ b/frontend/src/constants/logicConstants.js
@@ -136,7 +136,7 @@ export const RULES = Object.freeze({
             enabledNested: true,
         },
         [RULES.ROI_LARGE]: {
-            name: "Abs(Residual of interest) too large",
+            name: "|Residual near BMD| too large",
             notes: val => `|Residual Near BMD| > ${val}`,
             hasThreshold: true,
             enabledContinuous: true,
@@ -144,7 +144,7 @@ export const RULES = Object.freeze({
             enabledNested: true,
         },
         [RULES.WARNINGS]: {
-            name: "BMDS model Warning",
+            name: "BMDS model warning",
             notes: val => "BMD output file included warning",
             hasThreshold: false,
             enabledContinuous: false,
@@ -200,7 +200,7 @@ export const RULES = Object.freeze({
             enabledNested: true,
         },
         [RULES.CONTROL_RESIDUAL_HIGH]: {
-            name: "Abs(Residual at control) too large",
+            name: "|Residual at control| too large",
             notes: val => `|Residual at control| > ${val}`,
             hasThreshold: true,
             enabledContinuous: true,
diff --git a/tests/data/db.yaml b/tests/data/db.yaml
index e5f6cc52..9cd0c75a 100644
--- a/tests/data/db.yaml
+++ b/tests/data/db.yaml
@@ -1615,7 +1615,7 @@
                 - Control stdev. fit greater than threshold (2.312 > 1.5)
                 '1':
                 - Goodness of fit p-value less than threshold (0 < 0.1)
-                - Abs(Residual of interest) greater than threshold (2.246 > 2.0)
+                - '|Residual near BMD| greater than threshold (2.246 > 2.0)'
                 - Variance test failed (Test 2 p-value 2 < 0.05)
                 - Incorrect variance model (p-value 2 = 0), constant variance selected
                 '2': []
@@ -7068,7 +7068,7 @@
       true}]}, "results": {"recommended_model_index": null, "recommended_model_variable":
       null, "model_bin": [1], "model_notes": [{"0": ["Control stdev. fit greater than
       threshold (2.312 > 1.5)"], "1": ["Goodness of fit p-value less than threshold
-      (0 < 0.1)", "Abs(Residual of interest) greater than threshold (2.246 > 2.0)",
+      (0 < 0.1)", "|Residual near BMD| greater than threshold (2.246 > 2.0)",
       "Constant variance test failed (p-value 2 < 0.05)", "Incorrect variance model
       (p-value 2 = 0), constant variance selected"], "2": []}]}}, "selected": {"model_index":
       null, "notes": ""}}, "bayesian": null}]}, "errors": [], "created": "2021-11-15T18:42:28.857Z",
@@ -7343,7 +7343,7 @@
       true}]}, "results": {"recommended_model_index": null, "recommended_model_variable":
       null, "model_bin": [1], "model_notes": [{"0": ["Control stdev. fit greater than
       threshold (2.312 > 1.5)"], "1": ["Goodness of fit p-value less than threshold
-      (0 < 0.1)", "Abs(Residual of interest) greater than threshold (2.246 > 2.0)",
+      (0 < 0.1)", "|Residual near BMD| greater than threshold (2.246 > 2.0)",
       "Constant variance test failed (p-value 2 < 0.05)", "Incorrect variance model
       (p-value 2 = 0), constant variance selected"], "2": []}]}}, "selected": {"model_index":
       null, "notes": "No best fitting model selected"}}, "bayesian": null}], "analysis_id":

From cf107666051c46f19830e63565fa0e0128d8b1f6 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 14:26:40 -0500
Subject: [PATCH 21/29] rename "Frequentist Model Results" to "Maximum
 Likelihood Approach Model Results"

---
 frontend/src/components/Output/Output.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Output/Output.js b/frontend/src/components/Output/Output.js
index f3aea0b9..5b7b6de4 100644
--- a/frontend/src/components/Output/Output.js
+++ b/frontend/src/components/Output/Output.js
@@ -119,7 +119,7 @@ class Output extends Component {
                     ) : (
                         <div className="row">
                             <div className="col-lg-8">
-                                <h4>Frequentist Model Results</h4>
+                                <h4>Maximum Likelihood Approach Model Results</h4>
                                 <FrequentistResultTable />
                                 {canEdit ? <SelectModel /> : null}
                             </div>

From 6876c7a96ecbeea45daa8a665f9592b6bd3b150d Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 14:35:55 -0500
Subject: [PATCH 22/29] title case

---
 frontend/src/constants/plotting.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/constants/plotting.js b/frontend/src/constants/plotting.js
index 0a07e965..014695e0 100644
--- a/frontend/src/constants/plotting.js
+++ b/frontend/src/constants/plotting.js
@@ -112,7 +112,7 @@ export const getResponse = dataset => {
     },
     getCdfLayout = function(dataset) {
         let layout = _.cloneDeep(doseResponseLayout);
-        layout.title.text = "BMD Cumulative distribution function";
+        layout.title.text = "BMD Cumulative Distribution Function";
         layout.xaxis.title.text = getDoseLabel(dataset);
         layout.yaxis.title.text = "Cumulative Probability";
         layout.yaxis.range = [0, 1];

From f2b32b5720e2ed1236de6d13955aadf978137e2b Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 15:41:59 -0500
Subject: [PATCH 23/29] add vertical spacing

---
 frontend/src/components/Output/Output.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Output/Output.js b/frontend/src/components/Output/Output.js
index 5b7b6de4..f87c1085 100644
--- a/frontend/src/components/Output/Output.js
+++ b/frontend/src/components/Output/Output.js
@@ -81,7 +81,7 @@ class Output extends Component {
 
         return (
             <div className="container-fluid mb-3">
-                <div className="row">
+                <div className="row py-2">
                     {outputStore.outputs.length > 1 ? (
                         <div className="col-lg-2">
                             <SelectInput
@@ -117,7 +117,7 @@ class Output extends Component {
                             </div>
                         </div>
                     ) : (
-                        <div className="row">
+                        <div className="row py-2">
                             <div className="col-lg-8">
                                 <h4>Maximum Likelihood Approach Model Results</h4>
                                 <FrequentistResultTable />
@@ -134,7 +134,7 @@ class Output extends Component {
                     )
                 ) : null}
                 {selectedBayesian ? (
-                    <div className="row">
+                    <div className="row py-2">
                         <div className="col-lg-12">
                             <h4>Bayesian Model Results</h4>
                             <BayesianResultTable />
@@ -150,7 +150,7 @@ class Output extends Component {
                 ) : null}
 
                 {isFuture && !outputStore.isMultiTumor ? (
-                    <div className="row">
+                    <div className="row py-2">
                         {selectedFrequentist ? (
                             <div className="col col-lg-6">
                                 <DoseResponsePlot

From 7d7a4640171521d2af40d8956e1328728e6acbb8 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 15:50:43 -0500
Subject: [PATCH 24/29] Change "Confidence Level" to "Confidence Level
 (one-sided)" globally

---
 .../src/components/IndividualModel/ModelOptionsTable.js   | 6 +++---
 .../src/components/Main/OptionsForm/OptionsFormList.js    | 6 +++---
 frontend/src/components/Output/Multitumor/ModelOptions.js | 2 +-
 frontend/src/components/Output/Multitumor/MsCombo.js      | 2 +-
 frontend/src/components/Output/OptionSetTable.js          | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ModelOptionsTable.js b/frontend/src/components/IndividualModel/ModelOptionsTable.js
index 88ca9a46..3d90ebc2 100644
--- a/frontend/src/components/IndividualModel/ModelOptionsTable.js
+++ b/frontend/src/components/IndividualModel/ModelOptionsTable.js
@@ -39,7 +39,7 @@ class ModelOptionsTable extends Component {
             data = [
                 ["BMR Type", getLabel(model.settings.bmr_type, dichotomousBmrOptions)],
                 ["BMR", ff(model.settings.bmr)],
-                ["Confidence Level", ff(1 - model.settings.alpha)],
+                ["Confidence Level (one sided)", ff(1 - model.settings.alpha)],
                 hasDegrees.has(model.model_class.verbose)
                     ? ["Degree", ff(model.settings.degree)]
                     : null,
@@ -53,7 +53,7 @@ class ModelOptionsTable extends Component {
                 ["BMRF", ff(model.settings.bmr)],
                 ["Distribution Type", getLabel(model.settings.disttype, distTypeOptions)],
                 ["Direction", model.settings.is_increasing ? "Up" : "Down"],
-                ["Confidence Level", 1 - ff(model.settings.alpha)],
+                ["Confidence Level (one sided)", 1 - ff(model.settings.alpha)],
                 // zzz #3 check hybrid
                 ["Tail Probability", ff(model.settings.tail_prob)],
                 hasDegrees.has(model.model_class.verbose)
@@ -67,7 +67,7 @@ class ModelOptionsTable extends Component {
             data = [
                 ["BMR Type", getLabel(model.settings.bmr_type, dichotomousBmrOptions)],
                 ["BMR", ff(model.settings.bmr)],
-                ["Confidence Level", ff(1 - model.settings.alpha)],
+                ["Confidence Level (one sided)", ff(1 - model.settings.alpha)],
                 ["Bootstrap Seed", model.settings.bootstrap_seed],
                 ["Bootstrap Iterations", model.settings.bootstrap_iterations],
                 [
diff --git a/frontend/src/components/Main/OptionsForm/OptionsFormList.js b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
index 5b24488f..86257fbc 100644
--- a/frontend/src/components/Main/OptionsForm/OptionsFormList.js
+++ b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
@@ -38,7 +38,7 @@ class OptionsFormList extends Component {
                                             <th>BMRF</th>
                                             {/* zzz #3 add hybrid check here too */}
                                             <th>Tail Probability</th>
-                                            <th>Confidence Level (one-sided)</th>
+                                            <th>Confidence Level (one sided)</th>
                                             <th>
                                                 Distribution +<br />
                                                 Variance&nbsp;
@@ -51,14 +51,14 @@ class OptionsFormList extends Component {
                                         <>
                                             <th>Risk Type</th>
                                             <th>BMR</th>
-                                            <th>Confidence Level</th>
+                                            <th>Confidence Level (one sided)</th>
                                         </>
                                     ) : null}
                                     {modelType === MODEL_NESTED_DICHOTOMOUS ? (
                                         <>
                                             <th>Risk Type</th>
                                             <th>BMR</th>
-                                            <th>Confidence Level</th>
+                                            <th>Confidence Level (one sided)</th>
                                             <th>
                                                 Litter Specific
                                                 <br />
diff --git a/frontend/src/components/Output/Multitumor/ModelOptions.js b/frontend/src/components/Output/Multitumor/ModelOptions.js
index b073ac4b..85a34715 100644
--- a/frontend/src/components/Output/Multitumor/ModelOptions.js
+++ b/frontend/src/components/Output/Multitumor/ModelOptions.js
@@ -18,7 +18,7 @@ class ModelOptions extends Component {
             data = [
                 ["Risk Type", getLabel(options.bmr_type, dichotomousBmrOptions)],
                 ["BMR", ff(options.bmr_value)],
-                ["Confidence Level", ff(options.confidence_level)],
+                ["Confidence Level (one sided)", ff(options.confidence_level)],
                 ["Degree", degree],
             ];
         return <TwoColumnTable data={data} label="Model Options" />;
diff --git a/frontend/src/components/Output/Multitumor/MsCombo.js b/frontend/src/components/Output/Multitumor/MsCombo.js
index 22bbb0ea..16b364ac 100644
--- a/frontend/src/components/Output/Multitumor/MsCombo.js
+++ b/frontend/src/components/Output/Multitumor/MsCombo.js
@@ -16,7 +16,7 @@ class MsComboInfo extends Component {
                 ["Model", "Multitumor"],
                 ["Risk Type", getLabel(options.bmr_type, dichotomousBmrOptions)],
                 ["BMR", ff(options.bmr_value)],
-                ["Confidence Level", ff(options.confidence_level)],
+                ["Confidence Level (one sided)", ff(options.confidence_level)],
             ];
         return <TwoColumnTable data={data} label={label} />;
     }
diff --git a/frontend/src/components/Output/OptionSetTable.js b/frontend/src/components/Output/OptionSetTable.js
index d3d3068d..fdcac6e3 100644
--- a/frontend/src/components/Output/OptionSetTable.js
+++ b/frontend/src/components/Output/OptionSetTable.js
@@ -36,13 +36,13 @@ class OptionSetTable extends Component {
                 ],
                 // zzz #3 hybrid check
                 ["Tail Probability", ff(selectedModelOptions.tail_probability)],
-                ["Confidence Level (one-sided)", ff(selectedModelOptions.confidence_level)],
+                ["Confidence Level (one sided)", ff(selectedModelOptions.confidence_level)],
             ];
         } else if (getModelType === MODEL_DICHOTOMOUS) {
             rows = [
                 ["BMR Type", getLabel(selectedModelOptions.bmr_type, dichotomousBmrOptions)],
                 ["BMR", ff(selectedModelOptions.bmr_value)],
-                ["Confidence Level", ff(selectedModelOptions.confidence_level)],
+                ["Confidence Level (one sided)", ff(selectedModelOptions.confidence_level)],
                 [
                     "Maximum Multistage Degree",
                     getLabel(selectedDatasetOptions.degree, allDegreeOptions),
@@ -52,7 +52,7 @@ class OptionSetTable extends Component {
             rows = [
                 ["BMR Type", getLabel(selectedModelOptions.bmr_type, dichotomousBmrOptions)],
                 ["BMR", ff(selectedModelOptions.bmr_value)],
-                ["Confidence Level", ff(selectedModelOptions.confidence_level)],
+                ["Confidence Level (one sided)", ff(selectedModelOptions.confidence_level)],
                 ["Bootstrap Seed", selectedModelOptions.bootstrap_seed],
                 ["Bootstrap Iterations", selectedModelOptions.bootstrap_iterations],
                 [
@@ -67,7 +67,7 @@ class OptionSetTable extends Component {
             rows = [
                 ["BMR Type", getLabel(selectedModelOptions.bmr_type, dichotomousBmrOptions)],
                 ["BMR", ff(selectedModelOptions.bmr_value)],
-                ["Confidence Level", ff(selectedModelOptions.confidence_level)],
+                ["Confidence Level (one sided)", ff(selectedModelOptions.confidence_level)],
                 ["Degree Setting", outputStore.multitumorDegreeInputSettings.join(", ")],
             ];
         } else {

From 69126fdeeab3253b441dd9871502184dc88c4cda Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 16:11:47 -0500
Subject: [PATCH 25/29] add on bound footnote to UI

---
 .../IndividualModel/ModelParameters.js        | 103 ++++++++++--------
 1 file changed, 57 insertions(+), 46 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ModelParameters.js b/frontend/src/components/IndividualModel/ModelParameters.js
index 65594553..49dcf060 100644
--- a/frontend/src/components/IndividualModel/ModelParameters.js
+++ b/frontend/src/components/IndividualModel/ModelParameters.js
@@ -10,54 +10,65 @@ import {parameterFormatter} from "@/utils/formatters";
 class ModelParameters extends Component {
     render() {
         const {parameters} = this.props,
-            indexes = _.range(parameters.names.length);
+            indexes = _.range(parameters.names.length),
+            anyBounded = _.sum(parameters.bounded) > 0;
 
         return (
-            <table className="table table-sm table-bordered text-right col-l-1">
-                <colgroup>
-                    <col width="34%" />
-                    <col width="33%" />
-                    <col width="33%" />
-                </colgroup>
-                <thead>
-                    <tr className="bg-custom">
-                        <th colSpan="3">Model Parameters</th>
-                    </tr>
-                    <tr>
-                        <th>Variable</th>
-                        <th>Estimate</th>
-                        <th>Standard Error</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {indexes.map(i => {
-                        const bounded = parameters.bounded[i];
-                        return (
-                            <tr key={i}>
-                                <td>{parameters.names[i]}</td>
-                                <td>
-                                    {bounded ? (
-                                        <>
-                                            <span>On Bound</span>
-                                            <HelpTextPopover
-                                                title="On Bound"
-                                                content={`The value of this parameter, ${parameters.values[i]}, is within the tolerance of the bound`}
-                                            />
-                                        </>
-                                    ) : (
-                                        parameterFormatter(parameters.values[i])
-                                    )}
-                                </td>
-                                <td>
-                                    {bounded
-                                        ? "Not Reported"
-                                        : parameterFormatter(parameters.se[i])}
-                                </td>
-                            </tr>
-                        );
-                    })}
-                </tbody>
-            </table>
+            <>
+                <table className="table table-sm table-bordered text-right col-l-1">
+                    <colgroup>
+                        <col width="34%" />
+                        <col width="33%" />
+                        <col width="33%" />
+                    </colgroup>
+                    <thead>
+                        <tr className="bg-custom">
+                            <th colSpan="3">Model Parameters</th>
+                        </tr>
+                        <tr>
+                            <th>Variable</th>
+                            <th>Estimate</th>
+                            <th>Standard Error</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {indexes.map(i => {
+                            const bounded = parameters.bounded[i];
+                            return (
+                                <tr key={i}>
+                                    <td>{parameters.names[i]}</td>
+                                    <td>
+                                        {bounded ? (
+                                            <>
+                                                <span>On Bound</span>
+                                                <HelpTextPopover
+                                                    title="On Bound"
+                                                    content={`The value of this parameter, ${parameters.values[i]}, is within the tolerance of the bound`}
+                                                />
+                                            </>
+                                        ) : (
+                                            parameterFormatter(parameters.values[i])
+                                        )}
+                                    </td>
+                                    <td>
+                                        {bounded
+                                            ? "Not Reported"
+                                            : parameterFormatter(parameters.se[i])}
+                                    </td>
+                                </tr>
+                            );
+                        })}
+                    </tbody>
+                </table>
+                {anyBounded ? (
+                    <p>
+                        Standard errors estimates are not generated for parameters estimated on
+                        corresponding bounds, although sampling error is present for all parameters,
+                        as a rule. Standard error estimates may not be reliable as a basis for
+                        confidence intervals or tests when one or more parameters are on bounds.
+                    </p>
+                ) : null}
+            </>
         );
     }
 }

From 6e5d96f0a474e6378e5742466179ecd499329f73 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 17:31:43 -0500
Subject: [PATCH 26/29] handle goodness of fit table

---
 .../components/IndividualModel/GoodnessFit.js | 162 +++++++++++-------
 .../IndividualModel/ModelDetailModal.js       |   2 +-
 2 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/frontend/src/components/IndividualModel/GoodnessFit.js b/frontend/src/components/IndividualModel/GoodnessFit.js
index b0e7db49..c81bc2a7 100644
--- a/frontend/src/components/IndividualModel/GoodnessFit.js
+++ b/frontend/src/components/IndividualModel/GoodnessFit.js
@@ -6,88 +6,122 @@ import {Dtype} from "@/constants/dataConstants";
 import {isLognormal} from "@/constants/modelConstants";
 import {ff} from "@/utils/formatters";
 
-/* eslint-disable */
-const hdr_c_normal = [
-        "Dose", "N", "Sample Mean", "Model Fitted Mean",
-        "Sample SD", "Model MLE", "Scaled Residual",
-    ],
-    hdr_c_lognormal = [
-        "Dose", "N", "Sample Mean", "Approximate Sample Median", "Estimated Median",
-        "Sample SD", "Approximate Sample GSD", "Model Fitted GSD", "Scaled Residual",
-    ],
-    hdr_d = [ "Dose", "N", "Observed", "Expected", "Estimated Probability", "Scaled Residual"];
-/* eslint-enable */
-
 @observer
 class GoodnessFit extends Component {
-    getHeaders(dtype, settings) {
-        if (dtype == Dtype.CONTINUOUS || dtype == Dtype.CONTINUOUS_INDIVIDUAL) {
-            const headers = isLognormal(settings.disttype) ? hdr_c_lognormal : hdr_c_normal,
-                colWidths = isLognormal(settings.disttype)
-                    ? [10, 10, 10, 12, 12, 12, 10, 12, 12]
-                    : [1, 1, 1, 1, 1, 1, 1];
-            return [headers, colWidths];
-        }
-        if (dtype == Dtype.DICHOTOMOUS) {
-            return [hdr_d, [17, 16, 16, 17, 17, 17]];
-        }
-        throw Error("Unknown dtype");
+    getDichotomousData() {
+        const {store} = this.props,
+            gof = store.modalModel.results.gof,
+            dataset = store.selectedDataset;
+        return {
+            headers: [
+                "Dose",
+                "N",
+                "Observed",
+                "Expected",
+                "Estimated Probability",
+                "Scaled Residual",
+            ],
+            colwidths: [17, 16, 16, 17, 17, 17],
+            data: dataset.doses.map((dose, i) => {
+                return [
+                    dose,
+                    dataset.ns[i],
+                    dataset.incidences[i],
+                    ff(gof.expected[i]),
+                    ff(gof.expected[i] / dataset.ns[i]),
+                    ff(gof.residual[i]),
+                ];
+            }),
+        };
+    }
+
+    getContinuousNormalData(dtype) {
+        const {store} = this.props,
+            gof = store.modalModel.results.gof,
+            dataset = store.selectedDataset,
+            useFF = dtype === Dtype.CONTINUOUS_INDIVIDUAL;
+        return {
+            headers: [
+                "Dose", "N", "Sample Mean", "Model Fitted Mean",
+                "Sample SD", "Model Fitted SD", "Scaled Residual",
+            ],
+            colwidths: [1, 1, 1, 1, 1, 1, 1],
+            data: dataset.doses.map((dose, i) => {
+                return [
+                    dose,
+                    dataset.ns[i],
+                    useFF ? ff(gof.obs_mean[i]) : gof.obs_mean[i],
+                    ff(gof.est_mean[i]),
+                    useFF ? ff(gof.obs_sd[i]) : gof.obs_sd[i],
+                    ff(gof.est_sd[i]),
+                    ff(gof.residual[i]),
+                ];
+            }),
+        };
+    }
+
+    getContinuousLognormalData(dtype) {
+        const {store} = this.props,
+            gof = store.modalModel.results.gof,
+            dataset = store.selectedDataset,
+            useFF = dtype === Dtype.CONTINUOUS_INDIVIDUAL;
+        return {
+            headers: [
+                "Dose", "N", "Sample Mean", "Approximate Sample Median", "Model Fitted Median",
+                "Sample SD", "Approximate Sample GSD", "Model Fitted GSD", "Scaled Residual",
+            ],
+            colwidths: [10, 10, 10, 12, 12, 12, 10, 12, 12],
+            data: dataset.doses.map((dose, i) => {
+                return [
+                    dose,
+                    dataset.ns[i],
+                    useFF ? ff(gof.obs_mean[i]) : gof.obs_mean[i],
+                    ff(gof.calc_mean[i]),
+                    ff(gof.est_mean[i]),
+                    useFF ? ff(gof.obs_sd[i]) : gof.obs_sd[i],
+                    ff(gof.calc_mean[i]),
+                    ff(gof.est_sd[i]),
+                    ff(gof.residual[i]),
+                ];
+            }),
+        };
     }
     render() {
         const {store} = this.props,
             settings = store.modalModel.settings,
-            gof = store.modalModel.results.gof,
             dataset = store.selectedDataset,
-            {dtype} = dataset,
-            headers = this.getHeaders(dtype, settings);
+            {dtype} = dataset;
+
+        let data;
+        if (dtype == Dtype.DICHOTOMOUS) {
+            data = this.getDichotomousData();
+        } else {
+            if (isLognormal(settings.disttype)){
+                data = this.getContinuousLognormalData(dtype)
+            } else {
+                data = this.getContinuousNormalData(dtype)
+            }
+        }
+        console.log(data)
         return (
             <table className="table table-sm table-bordered text-right">
                 <colgroup>
-                    {headers[1].map((d, i) => (
-                        <col key={i} width={`${d}%`} />
-                    ))}
+                    {data.colwidths.map((d, i) => <col key={i} width={`${d}%`} />)}
                 </colgroup>
                 <thead>
                     <tr className="bg-custom text-left">
-                        <th colSpan={headers[0].length}>Goodness of Fit</th>
+                        <th colSpan={data.headers.length}>Goodness of Fit</th>
                     </tr>
                     <tr>
-                        {headers[0].map((d, i) => (
-                            <th key={i}>{d}</th>
-                        ))}
+                        {data.headers.map((d, i) => <th key={i}>{d}</th>)}
                     </tr>
                 </thead>
                 <tbody>
-                    {dtype == Dtype.CONTINUOUS || dtype == Dtype.CONTINUOUS_INDIVIDUAL
-                        ? gof.dose.map((item, i) => {
-                              const useFF = dtype === Dtype.CONTINUOUS_INDIVIDUAL;
-                              return (
-                                  <tr key={i}>
-                                      <td>{item}</td>
-                                      <td>{gof.size[i]}</td>
-                                      <td>{useFF ? ff(gof.obs_mean[i]) : gof.obs_mean[i]}</td>
-                                      <td>{ff(gof.est_mean[i])}</td>
-                                      <td>{useFF ? ff(gof.obs_sd[i]) : gof.obs_sd[i]}</td>
-                                      <td>{ff(gof.est_sd[i])}</td>
-                                      <td>{ff(gof.residual[i])}</td>
-                                  </tr>
-                              );
-                          })
-                        : null}
-                    {dtype == Dtype.DICHOTOMOUS
-                        ? dataset.doses.map((dose, i) => {
-                              return (
-                                  <tr key={i}>
-                                      <td>{dose}</td>
-                                      <td>{dataset.ns[i]}</td>
-                                      <td>{dataset.incidences[i]}</td>
-                                      <td>{ff(gof.expected[i])}</td>
-                                      <td>{ff(gof.expected[i] / dataset.ns[i])}</td>
-                                      <td>{ff(gof.residual[i])}</td>
-                                  </tr>
-                              );
-                          })
-                        : null}
+                    {data.data.map((row, i)=>{
+                        return <tr key={i}>
+                            {row.map((cell,j) => <td key={j}>{cell}</td>)}
+                        </tr>
+                    })}
                 </tbody>
             </table>
         );
diff --git a/frontend/src/components/IndividualModel/ModelDetailModal.js b/frontend/src/components/IndividualModel/ModelDetailModal.js
index cae4ad96..e58e2e78 100644
--- a/frontend/src/components/IndividualModel/ModelDetailModal.js
+++ b/frontend/src/components/IndividualModel/ModelDetailModal.js
@@ -69,7 +69,7 @@ class ModelBody extends Component {
                     </Col>
                 </Row>
                 <Row>
-                    <Col xl={isDichotomous ? 8 : 10}>
+                    <Col xl={isDichotomous ? 8 : 12}>
                         <GoodnessFit store={outputStore} />
                     </Col>
                 </Row>

From 417b63803bd8c080b9a4ee28a580e8dbb0f10ace Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 17:35:29 -0500
Subject: [PATCH 27/29] use < and > instead of less than and greater than

---
 tests/analysis/test_validators.py |  2 +-
 tests/data/db.yaml                | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/analysis/test_validators.py b/tests/analysis/test_validators.py
index 425e9aca..879b7573 100644
--- a/tests/analysis/test_validators.py
+++ b/tests/analysis/test_validators.py
@@ -350,7 +350,7 @@ def test_dichotomous(self, bmds3_complete_dichotomous):
         # check incidence > n
         check = deepcopy(dataset)
         check["incidences"][0] = check["ns"][0] + 1
-        with pytest.raises(PydanticValidationError, match="Incidence cannot be greater than N"):
+        with pytest.raises(PydanticValidationError, match="Incidence > N"):
             datasets.MaxDichotomousDatasetSchema(**check)
 
         # check minimums
diff --git a/tests/data/db.yaml b/tests/data/db.yaml
index 9cd0c75a..4d7e79b3 100644
--- a/tests/data/db.yaml
+++ b/tests/data/db.yaml
@@ -1612,10 +1612,10 @@
               - 1
               model_notes:
               - '0':
-                - Control stdev. fit greater than threshold (2.312 > 1.5)
+                - Control stdev. fit > threshold (2.312 > 1.5)
                 '1':
-                - Goodness of fit p-value less than threshold (0 < 0.1)
-                - '|Residual near BMD| greater than threshold (2.246 > 2.0)'
+                - Goodness of fit p-value < threshold (0 < 0.1)
+                - '|Residual near BMD| > threshold (2.246 > 2.0)'
                 - Variance test failed (Test 2 p-value 2 < 0.05)
                 - Incorrect variance model (p-value 2 = 0), constant variance selected
                 '2': []
@@ -7067,8 +7067,8 @@
       2.0, "enabled_dichotomous": true, "enabled_continuous": false, "enabled_nested":
       true}]}, "results": {"recommended_model_index": null, "recommended_model_variable":
       null, "model_bin": [1], "model_notes": [{"0": ["Control stdev. fit greater than
-      threshold (2.312 > 1.5)"], "1": ["Goodness of fit p-value less than threshold
-      (0 < 0.1)", "|Residual near BMD| greater than threshold (2.246 > 2.0)",
+      threshold (2.312 > 1.5)"], "1": ["Goodness of fit p-value < threshold
+      (0 < 0.1)", "|Residual near BMD| > threshold (2.246 > 2.0)",
       "Constant variance test failed (p-value 2 < 0.05)", "Incorrect variance model
       (p-value 2 = 0), constant variance selected"], "2": []}]}}, "selected": {"model_index":
       null, "notes": ""}}, "bayesian": null}]}, "errors": [], "created": "2021-11-15T18:42:28.857Z",
@@ -7342,8 +7342,8 @@
       2.0, "enabled_dichotomous": true, "enabled_continuous": false, "enabled_nested":
       true}]}, "results": {"recommended_model_index": null, "recommended_model_variable":
       null, "model_bin": [1], "model_notes": [{"0": ["Control stdev. fit greater than
-      threshold (2.312 > 1.5)"], "1": ["Goodness of fit p-value less than threshold
-      (0 < 0.1)", "|Residual near BMD| greater than threshold (2.246 > 2.0)",
+      threshold (2.312 > 1.5)"], "1": ["Goodness of fit p-value < threshold
+      (0 < 0.1)", "|Residual near BMD| > threshold (2.246 > 2.0)",
       "Constant variance test failed (p-value 2 < 0.05)", "Incorrect variance model
       (p-value 2 = 0), constant variance selected"], "2": []}]}}, "selected": {"model_index":
       null, "notes": "No best fitting model selected"}}, "bayesian": null}], "analysis_id":

From e42856a18ed78805fe6132548a63a43baee3231e Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 17:53:18 -0500
Subject: [PATCH 28/29] only show tail probability if hybrid continuous bmr

---
 .../components/IndividualModel/ModelOptionsTable.js    |  6 ++++--
 .../src/components/Main/OptionsForm/OptionsFormList.js | 10 +++++++---
 frontend/src/components/Output/OptionSetTable.js       |  8 +++++---
 frontend/src/constants/optionsConstants.js             |  3 +++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/IndividualModel/ModelOptionsTable.js b/frontend/src/components/IndividualModel/ModelOptionsTable.js
index 3d90ebc2..13455bd4 100644
--- a/frontend/src/components/IndividualModel/ModelOptionsTable.js
+++ b/frontend/src/components/IndividualModel/ModelOptionsTable.js
@@ -6,6 +6,7 @@ import {getLabel} from "@/common";
 import TwoColumnTable from "@/components/common/TwoColumnTable";
 import {Dtype} from "@/constants/dataConstants";
 import {hasDegrees} from "@/constants/modelConstants";
+import {isHybridBmr} from "@/constants/optionsConstants";
 import {
     continuousBmrOptions,
     dichotomousBmrOptions,
@@ -54,8 +55,9 @@ class ModelOptionsTable extends Component {
                 ["Distribution Type", getLabel(model.settings.disttype, distTypeOptions)],
                 ["Direction", model.settings.is_increasing ? "Up" : "Down"],
                 ["Confidence Level (one sided)", 1 - ff(model.settings.alpha)],
-                // zzz #3 check hybrid
-                ["Tail Probability", ff(model.settings.tail_prob)],
+                isHybridBmr(model.settings.bmr_type)?
+                    ["Tail Probability", ff(model.settings.tail_prob)]:
+                    null,
                 hasDegrees.has(model.model_class.verbose)
                     ? ["Degree", ff(model.settings.degree)]
                     : null,
diff --git a/frontend/src/components/Main/OptionsForm/OptionsFormList.js b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
index 86257fbc..babf2d76 100644
--- a/frontend/src/components/Main/OptionsForm/OptionsFormList.js
+++ b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
@@ -10,6 +10,7 @@ import {
     MODEL_NESTED_DICHOTOMOUS,
 } from "@/constants/mainConstants";
 
+import {isHybridBmr} from "@/constants/optionsConstants";
 import Button from "../../common/Button";
 import HelpTextPopover from "../../common/HelpTextPopover";
 import OptionsForm from "./OptionsForm";
@@ -23,7 +24,8 @@ class OptionsFormList extends Component {
             modelType = optionsStore.getModelType,
             optionsList = toJS(optionsStore.optionsList),
             distTypeHelpText =
-                "If lognormal is selected, only the Exponential and Hill models can be executed. Other models will be removed during the execution process and will not be shown in the outputs.";
+                "If lognormal is selected, only the Exponential and Hill models can be executed. Other models will be removed during the execution process and will not be shown in the outputs.",
+            tailProbabilityHelpText = "Only used for Hybrid models.";
         return (
             <div>
                 <div className="panel panel-default">
@@ -36,8 +38,10 @@ class OptionsFormList extends Component {
                                         <>
                                             <th>BMR Type</th>
                                             <th>BMRF</th>
-                                            {/* zzz #3 add hybrid check here too */}
-                                            <th>Tail Probability</th>
+                                            <th>
+                                                Tail Probability
+                                                <HelpTextPopover content={tailProbabilityHelpText} />
+                                            </th>
                                             <th>Confidence Level (one sided)</th>
                                             <th>
                                                 Distribution +<br />
diff --git a/frontend/src/components/Output/OptionSetTable.js b/frontend/src/components/Output/OptionSetTable.js
index fdcac6e3..38660033 100644
--- a/frontend/src/components/Output/OptionSetTable.js
+++ b/frontend/src/components/Output/OptionSetTable.js
@@ -11,6 +11,7 @@ import {
     distTypeOptions,
     litterSpecificCovariateOptions,
 } from "@/constants/optionsConstants";
+import {isHybridBmr} from "@/constants/optionsConstants";
 import {ff} from "@/utils/formatters";
 
 @inject("outputStore")
@@ -34,8 +35,9 @@ class OptionSetTable extends Component {
                     "Maximum Polynomial Degree",
                     getLabel(selectedDatasetOptions.degree, allDegreeOptions),
                 ],
-                // zzz #3 hybrid check
-                ["Tail Probability", ff(selectedModelOptions.tail_probability)],
+                isHybridBmr(selectedModelOptions.bmr_type)?
+                    ["Tail Probability", ff(selectedModelOptions.tail_probability)]:
+                    null,
                 ["Confidence Level (one sided)", ff(selectedModelOptions.confidence_level)],
             ];
         } else if (getModelType === MODEL_DICHOTOMOUS) {
@@ -84,7 +86,7 @@ class OptionSetTable extends Component {
                         <col width="40%" />
                     </colgroup>
                     <tbody>
-                        {rows.map((d, i) => {
+                        {rows.filter(d=>!_.isNull(d)).map((d, i) => {
                             return (
                                 <tr key={i}>
                                     <th className="bg-custom">{d[0]}</th>
diff --git a/frontend/src/constants/optionsConstants.js b/frontend/src/constants/optionsConstants.js
index e79cf094..5a781548 100644
--- a/frontend/src/constants/optionsConstants.js
+++ b/frontend/src/constants/optionsConstants.js
@@ -44,6 +44,9 @@ export const options = {
         {value: 6, label: "Hybrid-Extra Risk"},
         {value: 7, label: "Hybrid-Added Risk"},
     ],
+    isHybridBmr = function(val){
+        return val === 6 || val === 7
+    },
     distTypeOptions = [
         {value: 1, label: "Normal + Constant"},
         {value: 2, label: "Normal + Non-constant"},

From 225fc6b961ec0427a30fea0d8574d5a2b5aec721 Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 9 Feb 2024 17:57:04 -0500
Subject: [PATCH 29/29] make format

---
 .../components/IndividualModel/GoodnessFit.js | 47 +++++++++++++------
 .../IndividualModel/ModelOptionsTable.js      |  6 +--
 .../Main/OptionsForm/OptionsFormList.js       |  5 +-
 .../src/components/Output/OptionSetTable.js   | 25 +++++-----
 frontend/src/constants/optionsConstants.js    |  4 +-
 5 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/IndividualModel/GoodnessFit.js b/frontend/src/components/IndividualModel/GoodnessFit.js
index c81bc2a7..b2413c18 100644
--- a/frontend/src/components/IndividualModel/GoodnessFit.js
+++ b/frontend/src/components/IndividualModel/GoodnessFit.js
@@ -42,8 +42,13 @@ class GoodnessFit extends Component {
             useFF = dtype === Dtype.CONTINUOUS_INDIVIDUAL;
         return {
             headers: [
-                "Dose", "N", "Sample Mean", "Model Fitted Mean",
-                "Sample SD", "Model Fitted SD", "Scaled Residual",
+                "Dose",
+                "N",
+                "Sample Mean",
+                "Model Fitted Mean",
+                "Sample SD",
+                "Model Fitted SD",
+                "Scaled Residual",
             ],
             colwidths: [1, 1, 1, 1, 1, 1, 1],
             data: dataset.doses.map((dose, i) => {
@@ -67,8 +72,15 @@ class GoodnessFit extends Component {
             useFF = dtype === Dtype.CONTINUOUS_INDIVIDUAL;
         return {
             headers: [
-                "Dose", "N", "Sample Mean", "Approximate Sample Median", "Model Fitted Median",
-                "Sample SD", "Approximate Sample GSD", "Model Fitted GSD", "Scaled Residual",
+                "Dose",
+                "N",
+                "Sample Mean",
+                "Approximate Sample Median",
+                "Model Fitted Median",
+                "Sample SD",
+                "Approximate Sample GSD",
+                "Model Fitted GSD",
+                "Scaled Residual",
             ],
             colwidths: [10, 10, 10, 12, 12, 12, 10, 12, 12],
             data: dataset.doses.map((dose, i) => {
@@ -96,31 +108,38 @@ class GoodnessFit extends Component {
         if (dtype == Dtype.DICHOTOMOUS) {
             data = this.getDichotomousData();
         } else {
-            if (isLognormal(settings.disttype)){
-                data = this.getContinuousLognormalData(dtype)
+            if (isLognormal(settings.disttype)) {
+                data = this.getContinuousLognormalData(dtype);
             } else {
-                data = this.getContinuousNormalData(dtype)
+                data = this.getContinuousNormalData(dtype);
             }
         }
-        console.log(data)
         return (
             <table className="table table-sm table-bordered text-right">
                 <colgroup>
-                    {data.colwidths.map((d, i) => <col key={i} width={`${d}%`} />)}
+                    {data.colwidths.map((d, i) => (
+                        <col key={i} width={`${d}%`} />
+                    ))}
                 </colgroup>
                 <thead>
                     <tr className="bg-custom text-left">
                         <th colSpan={data.headers.length}>Goodness of Fit</th>
                     </tr>
                     <tr>
-                        {data.headers.map((d, i) => <th key={i}>{d}</th>)}
+                        {data.headers.map((d, i) => (
+                            <th key={i}>{d}</th>
+                        ))}
                     </tr>
                 </thead>
                 <tbody>
-                    {data.data.map((row, i)=>{
-                        return <tr key={i}>
-                            {row.map((cell,j) => <td key={j}>{cell}</td>)}
-                        </tr>
+                    {data.data.map((row, i) => {
+                        return (
+                            <tr key={i}>
+                                {row.map((cell, j) => (
+                                    <td key={j}>{cell}</td>
+                                ))}
+                            </tr>
+                        );
                     })}
                 </tbody>
             </table>
diff --git a/frontend/src/components/IndividualModel/ModelOptionsTable.js b/frontend/src/components/IndividualModel/ModelOptionsTable.js
index 13455bd4..b60a2994 100644
--- a/frontend/src/components/IndividualModel/ModelOptionsTable.js
+++ b/frontend/src/components/IndividualModel/ModelOptionsTable.js
@@ -55,9 +55,9 @@ class ModelOptionsTable extends Component {
                 ["Distribution Type", getLabel(model.settings.disttype, distTypeOptions)],
                 ["Direction", model.settings.is_increasing ? "Up" : "Down"],
                 ["Confidence Level (one sided)", 1 - ff(model.settings.alpha)],
-                isHybridBmr(model.settings.bmr_type)?
-                    ["Tail Probability", ff(model.settings.tail_prob)]:
-                    null,
+                isHybridBmr(model.settings.bmr_type)
+                    ? ["Tail Probability", ff(model.settings.tail_prob)]
+                    : null,
                 hasDegrees.has(model.model_class.verbose)
                     ? ["Degree", ff(model.settings.degree)]
                     : null,
diff --git a/frontend/src/components/Main/OptionsForm/OptionsFormList.js b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
index babf2d76..83ed7b14 100644
--- a/frontend/src/components/Main/OptionsForm/OptionsFormList.js
+++ b/frontend/src/components/Main/OptionsForm/OptionsFormList.js
@@ -10,7 +10,6 @@ import {
     MODEL_NESTED_DICHOTOMOUS,
 } from "@/constants/mainConstants";
 
-import {isHybridBmr} from "@/constants/optionsConstants";
 import Button from "../../common/Button";
 import HelpTextPopover from "../../common/HelpTextPopover";
 import OptionsForm from "./OptionsForm";
@@ -40,7 +39,9 @@ class OptionsFormList extends Component {
                                             <th>BMRF</th>
                                             <th>
                                                 Tail Probability
-                                                <HelpTextPopover content={tailProbabilityHelpText} />
+                                                <HelpTextPopover
+                                                    content={tailProbabilityHelpText}
+                                                />
                                             </th>
                                             <th>Confidence Level (one sided)</th>
                                             <th>
diff --git a/frontend/src/components/Output/OptionSetTable.js b/frontend/src/components/Output/OptionSetTable.js
index 38660033..68e66f95 100644
--- a/frontend/src/components/Output/OptionSetTable.js
+++ b/frontend/src/components/Output/OptionSetTable.js
@@ -1,3 +1,4 @@
+import _ from "lodash";
 import {inject, observer} from "mobx-react";
 import PropTypes from "prop-types";
 import React, {Component} from "react";
@@ -35,9 +36,9 @@ class OptionSetTable extends Component {
                     "Maximum Polynomial Degree",
                     getLabel(selectedDatasetOptions.degree, allDegreeOptions),
                 ],
-                isHybridBmr(selectedModelOptions.bmr_type)?
-                    ["Tail Probability", ff(selectedModelOptions.tail_probability)]:
-                    null,
+                isHybridBmr(selectedModelOptions.bmr_type)
+                    ? ["Tail Probability", ff(selectedModelOptions.tail_probability)]
+                    : null,
                 ["Confidence Level (one sided)", ff(selectedModelOptions.confidence_level)],
             ];
         } else if (getModelType === MODEL_DICHOTOMOUS) {
@@ -86,14 +87,16 @@ class OptionSetTable extends Component {
                         <col width="40%" />
                     </colgroup>
                     <tbody>
-                        {rows.filter(d=>!_.isNull(d)).map((d, i) => {
-                            return (
-                                <tr key={i}>
-                                    <th className="bg-custom">{d[0]}</th>
-                                    <td>{d[1]}</td>
-                                </tr>
-                            );
-                        })}
+                        {rows
+                            .filter(d => !_.isNull(d))
+                            .map((d, i) => {
+                                return (
+                                    <tr key={i}>
+                                        <th className="bg-custom">{d[0]}</th>
+                                        <td>{d[1]}</td>
+                                    </tr>
+                                );
+                            })}
                     </tbody>
                 </table>
             </>
diff --git a/frontend/src/constants/optionsConstants.js b/frontend/src/constants/optionsConstants.js
index 5a781548..c471f673 100644
--- a/frontend/src/constants/optionsConstants.js
+++ b/frontend/src/constants/optionsConstants.js
@@ -44,8 +44,8 @@ export const options = {
         {value: 6, label: "Hybrid-Extra Risk"},
         {value: 7, label: "Hybrid-Added Risk"},
     ],
-    isHybridBmr = function(val){
-        return val === 6 || val === 7
+    isHybridBmr = function(val) {
+        return val === 6 || val === 7;
     },
     distTypeOptions = [
         {value: 1, label: "Normal + Constant"},