From 3dd8dd1eb2a78c43a017e32e3c669faf81dd35f0 Mon Sep 17 00:00:00 2001 From: Sam Crawford Date: Thu, 19 Jul 2018 11:09:17 -0400 Subject: [PATCH 1/2] Updated T1 and T2 labels to be more meaningful - closes smiths/caseStudies#106 --- code/drasil-example/Drasil/GlassBR/TMods.hs | 4 +-- code/stable/glassbr/SRS/GlassBR_SRS.tex | 30 ++++++++++---------- code/stable/glassbr/Website/GlassBR_SRS.html | 30 ++++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/code/drasil-example/Drasil/GlassBR/TMods.hs b/code/drasil-example/Drasil/GlassBR/TMods.hs index 005bd1f2a2..24ada8c38e 100644 --- a/code/drasil-example/Drasil/GlassBR/TMods.hs +++ b/code/drasil-example/Drasil/GlassBR/TMods.hs @@ -28,7 +28,7 @@ t1IsSafe = tm' (cw t1SafetyReq) [t1descr] t1SafetyReq :: RelationConcept -t1SafetyReq = makeRC "t1SafetyReq" (nounPhraseSP "Safety Requirement-1") +t1SafetyReq = makeRC "safetyReqPb" (nounPhraseSP "Safety Req-Pb") t1descr ((sy is_safe1) $= (sy prob_br) $< (sy pb_tol)) t1descr :: Sentence @@ -47,7 +47,7 @@ t2IsSafe = tm' (cw t2SafetyReq) [t2descr] t2SafetyReq :: RelationConcept -t2SafetyReq = makeRC "t2SafetyReq" (nounPhraseSP "Safety Requirement-2") +t2SafetyReq = makeRC "safetyReqLR" (nounPhraseSP "Safety Req-LR") t2descr ( (sy is_safe2) $= (sy lRe) $> (sy demand)) t2descr :: Sentence diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex index 3e63339d86..55329c0b1f 100644 --- a/code/stable/glassbr/SRS/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/GlassBR_SRS.tex @@ -356,11 +356,11 @@ \subsubsection{Theoretical Models} ~\newline \noindent \begin{minipage}{\textwidth} \begin{tabular}{p{0.2\textwidth} p{0.73\textwidth}} -\toprule \textbf{Refname} & \textbf{T:t1SafetyReq} +\toprule \textbf{Refname} & \textbf{T:safetyReqPb} \phantomsection -\label{T:t1SafetyReq} +\label{T:safetyReqPb} \\ \midrule \\ -Label & Safety Requirement-1 +Label & Safety Req-Pb \\ \midrule \\ Equation & \begin{dmath} is\_safe1={P_{b}}<{P_{btol}} @@ -372,7 +372,7 @@ \subsubsection{Theoretical Models} \item{${P_{btol}}$ is the tolerable probability of breakage (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $is\_safe1$, the glass is considered safe. $is\_safe1$ and $is\_safe2$ (from \hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) are either both True or both False. ${P_{b}}$ is the probability of breakage, as calculated in \hyperref[T:probOfBr]{Definition~T:probOfBr}. ${P_{btol}}$ is the tolerable probability of breakage entered by the user. +Notes & If $is\_safe1$, the glass is considered safe. $is\_safe1$ and $is\_safe2$ (from \hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) are either both True or both False. ${P_{b}}$ is the probability of breakage, as calculated in \hyperref[T:probOfBr]{Definition~T:probOfBr}. ${P_{btol}}$ is the tolerable probability of breakage entered by the user. \\ \midrule \\ Source & FIXME: This needs to be filled in \\ \midrule \\ @@ -382,11 +382,11 @@ \subsubsection{Theoretical Models} ~\newline \noindent \begin{minipage}{\textwidth} \begin{tabular}{p{0.2\textwidth} p{0.73\textwidth}} -\toprule \textbf{Refname} & \textbf{T:t2SafetyReq} +\toprule \textbf{Refname} & \textbf{T:safetyReqLR} \phantomsection -\label{T:t2SafetyReq} +\label{T:safetyReqLR} \\ \midrule \\ -Label & Safety Requirement-2 +Label & Safety Req-LR \\ \midrule \\ Equation & \begin{dmath} is\_safe2=LR>q @@ -398,7 +398,7 @@ \subsubsection{Theoretical Models} \item{$q$ is the applied load (demand) (kPa)} \end{symbDescription} \\ \midrule \\ -Notes & If $is\_safe2$, the glass is considered safe. $is\_safe1$ (from \hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq}) and $is\_safe2$ are either both True or both False. LR is the load resistance (also called capacity), as defined in \hyperref[T:calOfCap]{Definition~T:calOfCap}. $q$ (also referred as the Demand) is the 3 second duration equivalent pressure, as defined in \hyperref[T:calOfDe]{Definition~T:calOfDe}. +Notes & If $is\_safe2$, the glass is considered safe. $is\_safe1$ (from \hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) and $is\_safe2$ are either both True or both False. LR is the load resistance (also called capacity), as defined in \hyperref[T:calOfCap]{Definition~T:calOfCap}. $q$ (also referred as the Demand) is the 3 second duration equivalent pressure, as defined in \hyperref[T:calOfDe]{Definition~T:calOfDe}. \\ \midrule \\ Source & FIXME: This needs to be filled in \\ \midrule \\ @@ -1003,7 +1003,7 @@ \subsection{Functional Requirements} \item[\refstepcounter{reqnum}\rthereqnum\label{FR:functional.requirements.req4}:]Output the input quantities from R1 and the known quantities from R2. \end{description} \begin{description} -\item[\refstepcounter{reqnum}\rthereqnum\label{FR:functional.requirements.req5}:]If $is\_safe1$ and $is\_safe2$ (from \hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq} and \hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) are true, output the message ``For the given input parameters, the glass is considered safe.'' If the condition is false, then output the message ``For the given input parameters, the glass is NOT considered safe.'' +\item[\refstepcounter{reqnum}\rthereqnum\label{FR:functional.requirements.req5}:]If $is\_safe1$ and $is\_safe2$ (from \hyperref[T:safetyReqPb]{Definition~T:safetyReqPb} and \hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) are true, output the message ``For the given input parameters, the glass is considered safe.'' If the condition is false, then output the message ``For the given input parameters, the glass is NOT considered safe.'' \end{description} \begin{itemize} \item[R6:]Output the following quantities: @@ -1083,12 +1083,12 @@ \section{Traceability Matrices and Graphs} The purpose of the traceability matrices is to provide easy references on what has to be additionally modified if a certain component is changed. Every time a component is changed, the items in the column of that component that are marked with an ``X'' should be modified as well. Table~\ref{Table:TraceyItemSecs} shows the dependencies of theoretical models, instance models, and data definitions with each other. Table~\ref{Table:TraceyReqsItems} shows the dependencies of requirements on theoretical models, instance models, data definitions, and data constraints. Table~\ref{Table:TraceyAssumpsOthers} shows the dependencies of theoretical models, instance models, data definitions, likely changes and requirements on the assumptions. \begin{longtable}{l l l l l l l l l l l l l l} \toprule - & T1 (\hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq}) & T2 (\hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:act.thick]{Definition~DD:act.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) + & T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:act.thick]{Definition~DD:act.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) \\ \midrule -T1 (\hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq}) & & X & X & & & & & & & & & & +T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & & X & X & & & & & & & & & & \\ -T2 (\hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) & X & & & X & X & & & & & & & & +T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & X & & & X & X & & & & & & & & \\ IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & & & & & & X & X & X & & & & & \\ @@ -1118,7 +1118,7 @@ \section{Traceability Matrices and Graphs} \end{longtable} \begin{longtable}{l l l l l l l l l l l l l l l l l l l l l} \toprule - & T1 (\hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq}) & T2 (\hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:act.thick]{Definition~DD:act.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) & Data Constraints (Section~\ref{Sec:DataConstraints}) & R1 (Section~\ref{Sec:FRs}) & R2 (Section~\ref{Sec:FRs}) & R3 (Section~\ref{Sec:FRs}) & R4 (Section~\ref{Sec:FRs}) & R5 (Section~\ref{Sec:FRs}) & R6 (Section~\ref{Sec:FRs}) + & T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:act.thick]{Definition~DD:act.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) & Data Constraints (Section~\ref{Sec:DataConstraints}) & R1 (Section~\ref{Sec:FRs}) & R2 (Section~\ref{Sec:FRs}) & R3 (Section~\ref{Sec:FRs}) & R4 (Section~\ref{Sec:FRs}) & R5 (Section~\ref{Sec:FRs}) & R6 (Section~\ref{Sec:FRs}) \\ \midrule R1 (in Section~\ref{Sec:FRs}) & & & & & & & & & & & & & & & & & & & & @@ -1142,9 +1142,9 @@ \section{Traceability Matrices and Graphs} & A1 (Section~\ref{Sec:Assumps}) & A2 (Section~\ref{Sec:Assumps}) & A3 (Section~\ref{Sec:Assumps}) & A4 (Section~\ref{Sec:Assumps}) & A5 (Section~\ref{Sec:Assumps}) & A6 (Section~\ref{Sec:Assumps}) & A7 (Section~\ref{Sec:Assumps}) & A8 (Section~\ref{Sec:Assumps}) \\ \midrule -T1 (\hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq}) & & & & & & & & +T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & & & & & & & & \\ -T2 (\hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) & & & & & & & & +T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & & & & & & & & \\ IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & & & & X & & X & X & \\ diff --git a/code/stable/glassbr/Website/GlassBR_SRS.html b/code/stable/glassbr/Website/GlassBR_SRS.html index 75349e4b3f..db4337f8e6 100644 --- a/code/stable/glassbr/Website/GlassBR_SRS.html +++ b/code/stable/glassbr/Website/GlassBR_SRS.html @@ -1149,7 +1149,7 @@

This section focuses on the general equations and laws that GlassBR is based on.

-
+
@@ -1197,7 +1197,7 @@

@@ -1223,7 +1223,7 @@

@@ -1157,7 +1157,7 @@

-Safety Requirement-1 +Safety Req-Pb

-If is_safe1, the glass is considered safe. is_safe1 and is_safe2 (from T:t2SafetyReq) are either both True or both False. Pb is the probability of breakage, as calculated in T:probOfBr. Pbtol is the tolerable probability of breakage entered by the user. +If is_safe1, the glass is considered safe. is_safe1 and is_safe2 (from T:safetyReqLR) are either both True or both False. Pb is the probability of breakage, as calculated in T:probOfBr. Pbtol is the tolerable probability of breakage entered by the user.

-
+
@@ -1271,7 +1271,7 @@

@@ -3289,7 +3289,7 @@

  • -Check-Glass-Safety: If is_safe1 and is_safe2 (from T:t1SafetyReq and T:t2SafetyReq) are true, output the message "For the given input parameters, the glass is considered safe." If the condition is false, then output the message "For the given input parameters, the glass is NOT considered safe." +Check-Glass-Safety: If is_safe1 and is_safe2 (from T:safetyReqPb and T:safetyReqLR) are true, output the message "For the given input parameters, the glass is considered safe." If the condition is false, then output the message "For the given input parameters, the glass is NOT considered safe."
@@ -3560,10 +3560,10 @@

@@ -1231,7 +1231,7 @@

-Safety Requirement-2 +Safety Req-LR

-If is_safe2, the glass is considered safe. is_safe1 (from T:t1SafetyReq) and is_safe2 are either both True or both False. LR is the load resistance (also called capacity), as defined in T:calOfCap. q (also referred as the Demand) is the 3 second duration equivalent pressure, as defined in T:calOfDe. +If is_safe2, the glass is considered safe. is_safe1 (from T:safetyReqPb) and is_safe2 are either both True or both False. LR is the load resistance (also called capacity), as defined in T:calOfCap. q (also referred as the Demand) is the 3 second duration equivalent pressure, as defined in T:calOfDe.

-T1 (T:t1SafetyReq) +T1 (T:safetyReqPb) -T2 (T:t2SafetyReq) +T2 (T:safetyReqLR) IM1 (T:probOfBr) @@ -3601,7 +3601,7 @@

-T1 (T:t1SafetyReq) +T1 (T:safetyReqPb) @@ -3645,7 +3645,7 @@

-T2 (T:t2SafetyReq) +T2 (T:safetyReqLR) X @@ -4183,10 +4183,10 @@

-T1 (T:t1SafetyReq) +T1 (T:safetyReqPb) -T2 (T:t2SafetyReq) +T2 (T:safetyReqLR) IM1 (T:probOfBr) @@ -4671,7 +4671,7 @@

-T1 (T:t1SafetyReq) +T1 (T:safetyReqPb) @@ -4700,7 +4700,7 @@

-T2 (T:t2SafetyReq) +T2 (T:safetyReqLR) From e6b6c263c3919c0e048eda832d32f87a60af3f2f Mon Sep 17 00:00:00 2001 From: Sam Crawford Date: Fri, 20 Jul 2018 10:32:52 -0400 Subject: [PATCH 2/2] Fixed merge conflict in stable --- code/stable/glassbr/SRS/GlassBR_SRS.tex | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex index cb7feaa28c..74412fe07a 100644 --- a/code/stable/glassbr/SRS/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/GlassBR_SRS.tex @@ -1044,11 +1044,7 @@ \section{Traceability Matrices and Graphs} The purpose of the traceability matrices is to provide easy references on what has to be additionally modified if a certain component is changed. Every time a component is changed, the items in the column of that component that are marked with an ``X'' should be modified as well. Table~\ref{Table:TraceyItemSecs} shows the dependencies of theoretical models, instance models, and data definitions with each other. Table~\ref{Table:TraceyReqsItems} shows the dependencies of requirements on theoretical models, instance models, data definitions, and data constraints. Table~\ref{Table:TraceyAssumpsOthers} shows the dependencies of theoretical models, instance models, data definitions, likely changes and requirements on the assumptions. \begin{longtable}{l l l l l l l l l l l l l l} \toprule -<<<<<<< HEAD - & T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:act.thick]{Definition~DD:act.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) -======= - & T1 (\hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq}) & T2 (\hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:min.thick]{Definition~DD:min.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) ->>>>>>> master + & T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:min.thick]{Definition~DD:min.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) \\ \midrule T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & & X & X & & & & & & & & & & @@ -1083,11 +1079,7 @@ \section{Traceability Matrices and Graphs} \end{longtable} \begin{longtable}{l l l l l l l l l l l l l l l l l l l l l} \toprule -<<<<<<< HEAD - & T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:act.thick]{Definition~DD:act.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) & Data Constraints (Section~\ref{Sec:DataConstraints}) & R1 (Section~\ref{Sec:FRs}) & R2 (Section~\ref{Sec:FRs}) & R3 (Section~\ref{Sec:FRs}) & R4 (Section~\ref{Sec:FRs}) & R5 (Section~\ref{Sec:FRs}) & R6 (Section~\ref{Sec:FRs}) -======= - & T1 (\hyperref[T:t1SafetyReq]{Definition~T:t1SafetyReq}) & T2 (\hyperref[T:t2SafetyReq]{Definition~T:t2SafetyReq}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:min.thick]{Definition~DD:min.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) & Data Constraints (Section~\ref{Sec:DataConstraints}) & R1 (Section~\ref{Sec:FRs}) & R2 (Section~\ref{Sec:FRs}) & R3 (Section~\ref{Sec:FRs}) & R4 (Section~\ref{Sec:FRs}) & R5 (Section~\ref{Sec:FRs}) & R6 (Section~\ref{Sec:FRs}) ->>>>>>> master + & T1 (\hyperref[T:safetyReqPb]{Definition~T:safetyReqPb}) & T2 (\hyperref[T:safetyReqLR]{Definition~T:safetyReqLR}) & IM1 (\hyperref[T:probOfBr]{Definition~T:probOfBr}) & IM2 (\hyperref[T:calOfCap]{Definition~T:calOfCap}) & IM3 (\hyperref[T:calOfDe]{Definition~T:calOfDe}) & DD1 (\hyperref[DD:risk.fun]{Definition~DD:risk.fun}) & DD2 (\hyperref[DD:min.thick]{Definition~DD:min.thick}) & DD3 (\hyperref[DD:loadDurFactor]{Definition~DD:loadDurFactor}) & DD4 (\hyperref[DD:stressDistFac]{Definition~DD:stressDistFac}) & DD5 (\hyperref[DD:nFL]{Definition~DD:nFL}) & DD6 (\hyperref[DD:gTF]{Definition~DD:gTF}) & DD7 (\hyperref[DD:dimlessLoad]{Definition~DD:dimlessLoad}) & DD8 (\hyperref[DD:tolLoad]{Definition~DD:tolLoad}) & Data Constraints (Section~\ref{Sec:DataConstraints}) & R1 (Section~\ref{Sec:FRs}) & R2 (Section~\ref{Sec:FRs}) & R3 (Section~\ref{Sec:FRs}) & R4 (Section~\ref{Sec:FRs}) & R5 (Section~\ref{Sec:FRs}) & R6 (Section~\ref{Sec:FRs}) \\ \midrule R1 (in Section~\ref{Sec:FRs}) & & & & & & & & & & & & & & & & & & & &