From 1cf33bbd354ab9952fb0af0ec5d17631a693b1aa Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sun, 17 Oct 2021 17:07:15 -0400 Subject: [PATCH 1/9] Quick attempt at fixing multicharacter identifiers --- .../lib/Language/Drasil/TeX/Print.hs | 5 +- code/stable/glassbr/SRS/HTML/GlassBR_SRS.html | 54 ++-- code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex | 250 +++++++++--------- code/stable/nopcm/SRS/PDF/NoPCM_SRS.tex | 10 +- .../SRS/HTML/PDController_SRS.html | 4 +- .../pdcontroller/SRS/PDF/PDController_SRS.tex | 14 +- code/stable/ssp/SRS/HTML/SSP_SRS.html | 6 +- code/stable/ssp/SRS/PDF/SSP_SRS.tex | 26 +- code/stable/swhs/SRS/HTML/SWHS_SRS.html | 2 +- code/stable/swhs/SRS/PDF/SWHS_SRS.tex | 24 +- 10 files changed, 204 insertions(+), 191 deletions(-) diff --git a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs index 5b8772238d..7e84625b2e 100644 --- a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs +++ b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs @@ -80,6 +80,8 @@ print :: PrintingInformation -> [LayoutObj] -> D print sm = foldr (($+$) . (`lo` sm)) empty ------------------ Symbol ---------------------------- + +-- TODO: It seems that there's a disconnect with this function and -- | Converts a symbol into a printable document form. symbol :: LD.Symbol -> D symbol (LD.Variable s) = pure $ text s @@ -123,7 +125,8 @@ pExpr (Case ps) = mkEnv "cases" (cases ps) pExpr (Mtx a) = mkEnv "bmatrix" (pMatrix a) pExpr (Row [x]) = br $ pExpr x -- FIXME: Hack needed for symbols with multiple subscripts, etc. pExpr (Row l) = foldl1 (<>) (map pExpr l) -pExpr (Ident s) = pure . text $ s +pExpr (Ident s@[_]) = pure . text $ s +pExpr (Ident s) = commandD "mathit" (pure $ text s) pExpr (Label s) = command "text" s pExpr (Spec s) = pure . text $ unPL $ L.special s --pExpr (Gr g) = unPL $ greek g diff --git a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html index 43739dfeaf..9812c3df0a 100644 --- a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html +++ b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html @@ -884,7 +884,7 @@

Theoretical Models

Equation - \[is-safeProb={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] + \[\mathit{is-safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] @@ -937,7 +937,9 @@

Theoretical Models

Equation - \[is-safeLoad=capacity\gt{}Load\] + + \[\mathit{is-safeLoad}=\mathit{capacity}\gt{}\mathit{Load}\] + Description @@ -1012,7 +1014,7 @@

Data Definitions

Equation - \[B=\frac{k}{\left(a b\right)^{m-1}} \left(E h^{2}\right)^{m} LDF e^{J}\] + \[B=\frac{k}{\left(a b\right)^{m-1}} \left(E h^{2}\right)^{m} \mathit{LDF} e^{J}\] @@ -1169,7 +1171,7 @@

Data Definitions

Equation - \[LDF=\left(\frac{{t_{\text{d}}}}{60}\right)^{\frac{m}{16}}\] + \[\mathit{LDF}=\left(\frac{{t_{\text{d}}}}{60}\right)^{\frac{m}{16}}\] @@ -1234,7 +1236,9 @@

Data Definitions

Equation - \[J=interpZ\left(\text{``SDF.txt''},AR,\hat{q}\right)\] + + \[J=\mathit{interpZ}\left(\text{``SDF.txt''},\mathit{AR},\hat{q}\right)\] + Description @@ -1297,7 +1301,7 @@

Data Definitions

Equation - \[NFL=\frac{{\hat{q}_{\text{tol}}} E h^{4}}{\left(a b\right)^{2}}\] + \[\mathit{NFL}=\frac{{\hat{q}_{\text{tol}}} E h^{4}}{\left(a b\right)^{2}}\] @@ -1374,11 +1378,11 @@

Data Definitions

Equation - \[GTF=\begin{cases} - 1, & g=\text{``AN''}\\ - 4, & g=\text{``FT''}\\ - 2, & g=\text{``HS''} - \end{cases}\] + \[\mathit{GTF}=\begin{cases} + 1, & g=\text{``AN''}\\ + 4, & g=\text{``FT''}\\ + 2, & g=\text{``HS''} + \end{cases}\] @@ -1433,7 +1437,9 @@

Data Definitions

Equation - \[\hat{q}=\frac{q \left(a b\right)^{2}}{E h^{4} GTF}\] + + \[\hat{q}=\frac{q \left(a b\right)^{2}}{E h^{4} \mathit{GTF}}\] + Description @@ -1515,7 +1521,7 @@

Data Definitions

Equation - \[{\hat{q}_{\text{tol}}}=interpY\left(\text{``SDF.txt''},AR,{J_{\text{tol}}}\right)\] + \[{\hat{q}_{\text{tol}}}=\mathit{interpY}\left(\text{``SDF.txt''},\mathit{AR},{J_{\text{tol}}}\right)\] @@ -1583,7 +1589,7 @@

Data Definitions

Equation - \[{J_{\text{tol}}}=\ln\left(\ln\left(\frac{1}{1-{P_{\text{b}\text{tol}}}}\right) \frac{\left(a b\right)^{m-1}}{k \left(E h^{2}\right)^{m} LDF}\right)\] + \[{J_{\text{tol}}}=\ln\left(\ln\left(\frac{1}{1-{P_{\text{b}\text{tol}}}}\right) \frac{\left(a b\right)^{m-1}}{k \left(E h^{2}\right)^{m} \mathit{LDF}}\right)\] @@ -1670,7 +1676,7 @@

Data Definitions

Equation - \[SD=\sqrt{{SD_{\text{x}}}^{2}+{SD_{\text{y}}}^{2}+{SD_{\text{z}}}^{2}}\] + \[\mathit{SD}=\sqrt{{\mathit{SD}_{\text{x}}}^{2}+{\mathit{SD}_{\text{y}}}^{2}+{\mathit{SD}_{\text{z}}}^{2}}\] @@ -1723,7 +1729,7 @@

Data Definitions

Equation - \[AR=\frac{a}{b}\] + \[\mathit{AR}=\frac{a}{b}\] Description @@ -1782,7 +1788,7 @@

Data Definitions

Equation - \[{w_{TNT}}=w TNT\] + \[{w_{\mathit{TNT}}}=w \mathit{TNT}\] Description @@ -1887,7 +1893,7 @@

Data Definitions

Equation - \[LR=NFL GTF LSF\] + \[\mathit{LR}=\mathit{NFL} \mathit{GTF} \mathit{LSF}\] Description @@ -1945,7 +1951,9 @@

Data Definitions

Equation - \[q=interpY\left(\text{``TSD.txt''},SD,{w_{TNT}}\right)\] + + \[q=\mathit{interpY}\left(\text{``TSD.txt''},\mathit{SD},{w_{\mathit{TNT}}}\right)\] + Description @@ -2029,7 +2037,9 @@

Instance Models

Equation - \[is-safePb={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] + + \[\mathit{is-safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] + Description @@ -2094,7 +2104,7 @@

Instance Models

Input Constraints - \[LR\gt{}0\] + \[\mathit{LR}\gt{}0\] \[q\gt{}0\] @@ -2104,7 +2114,7 @@

Instance Models

Equation - \[is-safeLR=LR\gt{}q\] + \[\mathit{is-safeLR}=\mathit{LR}\gt{}q\] Description diff --git a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex index 4b77997917..f773da07b0 100644 --- a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex @@ -70,15 +70,15 @@ \subsection{Table of Symbols} \endhead $a$ & Plate length (long dimension) & ${\text{m}}$ \\ -$AR$ & Aspect ratio & -- +$\mathit{AR}$ & Aspect ratio & -- \\ -${AR_{\text{max}}}$ & Maximum aspect ratio & -- +${\mathit{AR}_{\text{max}}}$ & Maximum aspect ratio & -- \\ $B$ & Risk of failure & -- \\ $b$ & Plate width (short dimension) & ${\text{m}}$ \\ -$capacity$ & Capacity or load resistance & ${\text{Pa}}$ +$\mathit{capacity}$ & Capacity or load resistance & ${\text{Pa}}$ \\ ${d_{\text{max}}}$ & Maximum value for one of the dimensions of the glass plate & ${\text{m}}$ \\ @@ -88,21 +88,21 @@ \subsection{Table of Symbols} \\ $g$ & Glass type & -- \\ -$GTF$ & Glass type factor & -- +$\mathit{GTF}$ & Glass type factor & -- \\ $h$ & Minimum thickness & ${\text{m}}$ \\ -$interpY$ & InterpY & -- +$\mathit{interpY}$ & InterpY & -- \\ -$interpZ$ & InterpZ & -- +$\mathit{interpZ}$ & InterpZ & -- \\ -$is-safeLoad$ & Load resistance safety requirement & -- +$\mathit{is-safeLoad}$ & Load resistance safety requirement & -- \\ -$is-safeLR$ & 3 second load equivalent resistance safety requirement & -- +$\mathit{is-safeLR}$ & 3 second load equivalent resistance safety requirement & -- \\ -$is-safePb$ & Probability of glass breakage safety requirement & -- +$\mathit{is-safePb}$ & Probability of glass breakage safety requirement & -- \\ -$is-safeProb$ & Probability of failure safety requirement & -- +$\mathit{is-safeProb}$ & Probability of failure safety requirement & -- \\ $J$ & Stress distribution factor (Function) & -- \\ @@ -114,17 +114,17 @@ \subsection{Table of Symbols} \\ $k$ & Surface flaw parameter & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ -$LDF$ & Load duration factor & -- +$\mathit{LDF}$ & Load duration factor & -- \\ -$Load$ & Applied load (demand) or pressure & ${\text{Pa}}$ +$\mathit{Load}$ & Applied load (demand) or pressure & ${\text{Pa}}$ \\ -$LR$ & Load resistance & ${\text{Pa}}$ +$\mathit{LR}$ & Load resistance & ${\text{Pa}}$ \\ -$LSF$ & Load share factor & -- +$\mathit{LSF}$ & Load share factor & -- \\ $m$ & Surface flaw parameter & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ -$NFL$ & Non-factored load & ${\text{Pa}}$ +$\mathit{NFL}$ & Non-factored load & ${\text{Pa}}$ \\ ${P_{\text{b}}}$ & Probability of breakage & -- \\ @@ -140,23 +140,23 @@ \subsection{Table of Symbols} \\ ${\hat{q}_{\text{tol}}}$ & Tolerable load & -- \\ -$SD$ & Stand off distance & ${\text{m}}$ +$\mathit{SD}$ & Stand off distance & ${\text{m}}$ \\ -${SD_{\text{max}}}$ & Maximum stand off distance permissible for input & ${\text{m}}$ +${\mathit{SD}_{\text{max}}}$ & Maximum stand off distance permissible for input & ${\text{m}}$ \\ -${SD_{\text{min}}}$ & Minimum stand off distance permissible for input & ${\text{m}}$ +${\mathit{SD}_{\text{min}}}$ & Minimum stand off distance permissible for input & ${\text{m}}$ \\ -${SD_{\text{x}}}$ & Stand off distance ($x$-component) & ${\text{m}}$ +${\mathit{SD}_{\text{x}}}$ & Stand off distance ($x$-component) & ${\text{m}}$ \\ -${SD_{\text{y}}}$ & Stand off distance ($y$-component) & ${\text{m}}$ +${\mathit{SD}_{\text{y}}}$ & Stand off distance ($y$-component) & ${\text{m}}$ \\ -${SD_{\text{z}}}$ & Stand off distance ($z$-component) & ${\text{m}}$ +${\mathit{SD}_{\text{z}}}$ & Stand off distance ($z$-component) & ${\text{m}}$ \\ $t$ & Nominal thickness $t\in{}\{2.5,2.7,3.0,4.0,5.0,6.0,8.0,10.0,12.0,16.0,19.0,22.0\}$ & ${\text{mm}}$ \\ ${t_{\text{d}}}$ & Duration of load & ${\text{s}}$ \\ -$TNT$ & TNT equivalent factor & -- +$\mathit{TNT}$ & TNT equivalent factor & -- \\ $w$ & Charge weight & ${\text{kg}}$ \\ @@ -164,7 +164,7 @@ \subsection{Table of Symbols} \\ ${w_{\text{min}}}$ & Minimum permissible input charge weight & ${\text{kg}}$ \\ -${w_{TNT}}$ & Equivalent TNT charge mass & ${\text{kg}}$ +${w_{\mathit{TNT}}}$ & Equivalent TNT charge mass & ${\text{kg}}$ \\ \bottomrule \caption{Table of Symbols} @@ -344,7 +344,7 @@ \subsubsection{Terminology and Definitions} \item{Specified design load - The magnitude in Pa (psf), type (for example, wind or snow) and duration of the load given by the specifying authority.} \item{Long duration load - Any load lasting approximately 30 days.} \end{itemize} -\item{Stand off distance (SD) - The distance from the glazing surface to the centroid of a hemispherical high explosive charge. It is represented by the coordinates (${SD_{\text{x}}}$, ${SD_{\text{y}}}$, ${SD_{\text{z}}}$).} +\item{Stand off distance (SD) - The distance from the glazing surface to the centroid of a hemispherical high explosive charge. It is represented by the coordinates (${\mathit{SD}_{\text{x}}}$, ${\mathit{SD}_{\text{y}}}$, ${\mathit{SD}_{\text{z}}}$).} \item{Load share factor (LSF) - A multiplying factor derived from the load sharing between the double glazing, of equal or different thicknesses and types (including the layered behaviour of LG under long duration loads), in a sealed IG unit.} \item{Glass type factor (GTF) - A multiplying factor for adjusting the LR of different glass type, that is, AN, FT, or HS, in monolithic glass, LG (Laminated Glass), or IG (Insulating Glass) constructions.} \item{Aspect ratio (AR) - The ratio of the long dimension of the glass to the short dimension of the glass. For glass supported on four sides, the aspect ratio is always equal to or greater than 1.0. For glass supported on three sides, the ratio of the length of one of the supported edges perpendicular to the free edge, to the length of the free edge, is equal to or greater than 0.5.} @@ -388,7 +388,7 @@ \subsubsection{Assumptions} \item[glassLite:\phantomsection\label{assumpGL}]{Glass under consideration is assumed to be a single lite; hence, the value of LSF is equal to 1 for all calculations in GlassBR. (RefBy: \hyperref[accMoreThanSingleLite]{LC:Accomodate-More-than-Single-Lite}.)} \item[boundaryConditions:\phantomsection\label{assumpBC}]{Boundary conditions for the glass slab are assumed to be 4-sided support for calculations. (RefBy: \hyperref[accMoreBoundaryConditions]{LC:Accomodate-More-Boundary-Conditions}.)} \item[responseType:\phantomsection\label{assumpRT}]{The response type considered in GlassBR is flexural. (RefBy: \hyperref[considerMoreThanFlexGlass]{LC:Consider-More-than-Flexure-Glass}.)} -\item[ldfConstant:\phantomsection\label{assumpLDFC}]{With reference to \hyperref[assumpSV]{A:standardValues}, the value of load duration factor ($LDF$) is a constant in GlassBR. (RefBy: \hyperref[varValsOfmkE]{LC:Variable-Values-of-m,k,E} and \hyperref[DD:loadDurFactor]{DD:loadDurFactor}.)} +\item[ldfConstant:\phantomsection\label{assumpLDFC}]{With reference to \hyperref[assumpSV]{A:standardValues}, the value of load duration factor ($\mathit{LDF}$) is a constant in GlassBR. (RefBy: \hyperref[varValsOfmkE]{LC:Variable-Values-of-m,k,E} and \hyperref[DD:loadDurFactor]{DD:loadDurFactor}.)} \end{itemize} \subsubsection{Theoretical Models} \label{Sec:TMs} @@ -406,16 +406,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - is-safeProb={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} + \mathit{is-safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$is-safeProb$ is the probability of failure safety requirement (Unitless)} + \item{$\mathit{is-safeProb}$ is the probability of failure safety requirement (Unitless)} \item{${P_{\text{f}}}$ is the probability of failure (Unitless)} \item{${P_{\text{f}\text{tol}}}$ is the tolerable probability of failure (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $is-safeProb$, the structure is considered safe. +Notes & If $\mathit{is-safeProb}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -438,16 +438,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - is-safeLoad=capacity\gt{}Load + \mathit{is-safeLoad}=\mathit{capacity}\gt{}\mathit{Load} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$is-safeLoad$ is the load resistance safety requirement (Unitless)} - \item{$capacity$ is the capacity or load resistance (${\text{Pa}}$)} - \item{$Load$ is the applied load (demand) or pressure (${\text{Pa}}$)} + \item{$\mathit{is-safeLoad}$ is the load resistance safety requirement (Unitless)} + \item{$\mathit{capacity}$ is the capacity or load resistance (${\text{Pa}}$)} + \item{$\mathit{Load}$ is the applied load (demand) or pressure (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $is-safeLoad$, the structure is considered safe. +Notes & If $\mathit{is-safeLoad}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -484,7 +484,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} - B=\frac{k}{\left(a b\right)^{m-1}} \left(E h^{2}\right)^{m} LDF e^{J} + B=\frac{k}{\left(a b\right)^{m-1}} \left(E h^{2}\right)^{m} \mathit{LDF} e^{J} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -495,7 +495,7 @@ \subsubsection{Data Definitions} \item{$m$ is the surface flaw parameter ($\frac{\text{m}^{12}}{\text{N}^{7}}$)} \item{$E$ is the modulus of elasticity of glass (${\text{Pa}}$)} \item{$h$ is the minimum thickness (${\text{m}}$)} - \item{$LDF$ is the load duration factor (Unitless)} + \item{$\mathit{LDF}$ is the load duration factor (Unitless)} \item{$J$ is the stress distribution factor (Function) (Unitless)} \end{symbDescription} \\ \midrule \\ @@ -503,7 +503,7 @@ \subsubsection{Data Definitions} $h$ is defined in \hyperref[DD:minThick]{DD:minThick} and is based on the nominal thicknesses. - $LDF$ is defined in \hyperref[DD:loadDurFactor]{DD:loadDurFactor}. + $\mathit{LDF}$ is defined in \hyperref[DD:loadDurFactor]{DD:loadDurFactor}. $J$ is defined in \hyperref[DD:stressDistFac]{DD:stressDistFac}. @@ -579,25 +579,25 @@ \subsubsection{Data Definitions} Label & Load duration factor \\ \midrule \\ -Symbol & $LDF$ +Symbol & $\mathit{LDF}$ \\ \midrule \\ Units & Unitless \\ \midrule \\ Equation & \begin{displaymath} - LDF=\left(\frac{{t_{\text{d}}}}{60}\right)^{\frac{m}{16}} + \mathit{LDF}=\left(\frac{{t_{\text{d}}}}{60}\right)^{\frac{m}{16}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$LDF$ is the load duration factor (Unitless)} + \item{$\mathit{LDF}$ is the load duration factor (Unitless)} \item{${t_{\text{d}}}$ is the duration of load (${\text{s}}$)} \item{$m$ is the surface flaw parameter ($\frac{\text{m}^{12}}{\text{N}^{7}}$)} \end{symbDescription} \\ \midrule \\ Notes & ${t_{\text{d}}}$ and $m$ come from \hyperref[assumpSV]{A:standardValues}. - $LDF$ is assumed to be constant (from \hyperref[assumpLDFC]{A:ldfConstant}). + $\mathit{LDF}$ is assumed to be constant (from \hyperref[assumpLDFC]{A:ldfConstant}). \\ \midrule \\ Source & \cite{astm2009} @@ -627,19 +627,19 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} - J=interpZ\left(\text{``SDF.txt''},AR,\hat{q}\right) + J=\mathit{interpZ}\left(\text{``SDF.txt''},\mathit{AR},\hat{q}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} \item{$J$ is the stress distribution factor (Function) (Unitless)} - \item{$interpZ$ is the interpZ (Unitless)} - \item{$AR$ is the aspect ratio (Unitless)} + \item{$\mathit{interpZ}$ is the interpZ (Unitless)} + \item{$\mathit{AR}$ is the aspect ratio (Unitless)} \item{$\hat{q}$ is the dimensionless load (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & $J$ is obtained by interpolating from data shown in \hyperref[Figure:dimlessloadVSaspect]{Fig:dimlessloadVSaspect}. - $AR$ is defined in \hyperref[DD:aspectRatio]{DD:aspectRatio}. + $\mathit{AR}$ is defined in \hyperref[DD:aspectRatio]{DD:aspectRatio}. $\hat{q}$ is defined in \hyperref[DD:dimlessLoad]{DD:dimlessLoad}. @@ -664,18 +664,18 @@ \subsubsection{Data Definitions} Label & Non-factored load \\ \midrule \\ -Symbol & $NFL$ +Symbol & $\mathit{NFL}$ \\ \midrule \\ Units & ${\text{Pa}}$ \\ \midrule \\ Equation & \begin{displaymath} - NFL=\frac{{\hat{q}_{\text{tol}}} E h^{4}}{\left(a b\right)^{2}} + \mathit{NFL}=\frac{{\hat{q}_{\text{tol}}} E h^{4}}{\left(a b\right)^{2}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$NFL$ is the non-factored load (${\text{Pa}}$)} + \item{$\mathit{NFL}$ is the non-factored load (${\text{Pa}}$)} \item{${\hat{q}_{\text{tol}}}$ is the tolerable load (Unitless)} \item{$E$ is the modulus of elasticity of glass (${\text{Pa}}$)} \item{$h$ is the minimum thickness (${\text{m}}$)} @@ -712,22 +712,22 @@ \subsubsection{Data Definitions} Label & Glass type factor \\ \midrule \\ -Symbol & $GTF$ +Symbol & $\mathit{GTF}$ \\ \midrule \\ Units & Unitless \\ \midrule \\ Equation & \begin{displaymath} - GTF=\begin{cases} - 1, & g=\text{``AN''}\\ - 4, & g=\text{``FT''}\\ - 2, & g=\text{``HS''} - \end{cases} + \mathit{GTF}=\begin{cases} + 1, & g=\text{``AN''}\\ + 4, & g=\text{``FT''}\\ + 2, & g=\text{``HS''} + \end{cases} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$GTF$ is the glass type factor (Unitless)} + \item{$\mathit{GTF}$ is the glass type factor (Unitless)} \item{$g$ is the glass type (Unitless)} \end{symbDescription} \\ \midrule \\ @@ -765,7 +765,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} - \hat{q}=\frac{q \left(a b\right)^{2}}{E h^{4} GTF} + \hat{q}=\frac{q \left(a b\right)^{2}}{E h^{4} \mathit{GTF}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -775,7 +775,7 @@ \subsubsection{Data Definitions} \item{$b$ is the plate width (short dimension) (${\text{m}}$)} \item{$E$ is the modulus of elasticity of glass (${\text{Pa}}$)} \item{$h$ is the minimum thickness (${\text{m}}$)} - \item{$GTF$ is the glass type factor (Unitless)} + \item{$\mathit{GTF}$ is the glass type factor (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & $q$ is the 3 second duration equivalent pressure, as given in \hyperref[DD:calofDemand]{DD:calofDemand}. @@ -786,7 +786,7 @@ \subsubsection{Data Definitions} $h$ is defined in \hyperref[DD:minThick]{DD:minThick} and is based on the nominal thicknesses. - $GTF$ is defined in \hyperref[DD:gTF]{DD:gTF}. + $\mathit{GTF}$ is defined in \hyperref[DD:gTF]{DD:gTF}. \\ \midrule \\ Source & \cite{astm2009} and \cite[(Eq. 7)]{campidelli} @@ -816,19 +816,19 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} - {\hat{q}_{\text{tol}}}=interpY\left(\text{``SDF.txt''},AR,{J_{\text{tol}}}\right) + {\hat{q}_{\text{tol}}}=\mathit{interpY}\left(\text{``SDF.txt''},\mathit{AR},{J_{\text{tol}}}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} \item{${\hat{q}_{\text{tol}}}$ is the tolerable load (Unitless)} - \item{$interpY$ is the interpY (Unitless)} - \item{$AR$ is the aspect ratio (Unitless)} + \item{$\mathit{interpY}$ is the interpY (Unitless)} + \item{$\mathit{AR}$ is the aspect ratio (Unitless)} \item{${J_{\text{tol}}}$ is the stress distribution factor (Function) based on Pbtol (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & ${\hat{q}_{\text{tol}}}$ is obtained by interpolating from data shown in \hyperref[Figure:dimlessloadVSaspect]{Fig:dimlessloadVSaspect}. - $AR$ is defined in \hyperref[DD:aspectRatio]{DD:aspectRatio}. + $\mathit{AR}$ is defined in \hyperref[DD:aspectRatio]{DD:aspectRatio}. ${J_{\text{tol}}}$ is defined in \hyperref[DD:sdfTol]{DD:sdfTol}. @@ -860,7 +860,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} - {J_{\text{tol}}}=\ln\left(\ln\left(\frac{1}{1-{P_{\text{b}\text{tol}}}}\right) \frac{\left(a b\right)^{m-1}}{k \left(E h^{2}\right)^{m} LDF}\right) + {J_{\text{tol}}}=\ln\left(\ln\left(\frac{1}{1-{P_{\text{b}\text{tol}}}}\right) \frac{\left(a b\right)^{m-1}}{k \left(E h^{2}\right)^{m} \mathit{LDF}}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -872,7 +872,7 @@ \subsubsection{Data Definitions} \item{$k$ is the surface flaw parameter ($\frac{\text{m}^{12}}{\text{N}^{7}}$)} \item{$E$ is the modulus of elasticity of glass (${\text{Pa}}$)} \item{$h$ is the minimum thickness (${\text{m}}$)} - \item{$LDF$ is the load duration factor (Unitless)} + \item{$\mathit{LDF}$ is the load duration factor (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & ${P_{\text{b}\text{tol}}}$ is entered by the user. @@ -883,7 +883,7 @@ \subsubsection{Data Definitions} $h$ is defined in \hyperref[DD:minThick]{DD:minThick} and is based on the nominal thicknesses. - $LDF$ is defined in \hyperref[DD:loadDurFactor]{DD:loadDurFactor}. + $\mathit{LDF}$ is defined in \hyperref[DD:loadDurFactor]{DD:loadDurFactor}. \\ \midrule \\ Source & \cite{astm2009} @@ -906,21 +906,21 @@ \subsubsection{Data Definitions} Label & Stand off distance \\ \midrule \\ -Symbol & $SD$ +Symbol & $\mathit{SD}$ \\ \midrule \\ Units & ${\text{m}}$ \\ \midrule \\ Equation & \begin{displaymath} - SD=\sqrt{{SD_{\text{x}}}^{2}+{SD_{\text{y}}}^{2}+{SD_{\text{z}}}^{2}} + \mathit{SD}=\sqrt{{\mathit{SD}_{\text{x}}}^{2}+{\mathit{SD}_{\text{y}}}^{2}+{\mathit{SD}_{\text{z}}}^{2}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$SD$ is the stand off distance (${\text{m}}$)} - \item{${SD_{\text{x}}}$ is the stand off distance ($x$-component) (${\text{m}}$)} - \item{${SD_{\text{y}}}$ is the stand off distance ($y$-component) (${\text{m}}$)} - \item{${SD_{\text{z}}}$ is the stand off distance ($z$-component) (${\text{m}}$)} + \item{$\mathit{SD}$ is the stand off distance (${\text{m}}$)} + \item{${\mathit{SD}_{\text{x}}}$ is the stand off distance ($x$-component) (${\text{m}}$)} + \item{${\mathit{SD}_{\text{y}}}$ is the stand off distance ($y$-component) (${\text{m}}$)} + \item{${\mathit{SD}_{\text{z}}}$ is the stand off distance ($z$-component) (${\text{m}}$)} \end{symbDescription} \\ \midrule \\ Source & \cite{astm2009} @@ -943,18 +943,18 @@ \subsubsection{Data Definitions} Label & Aspect ratio \\ \midrule \\ -Symbol & $AR$ +Symbol & $\mathit{AR}$ \\ \midrule \\ Units & Unitless \\ \midrule \\ Equation & \begin{displaymath} - AR=\frac{a}{b} + \mathit{AR}=\frac{a}{b} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$AR$ is the aspect ratio (Unitless)} + \item{$\mathit{AR}$ is the aspect ratio (Unitless)} \item{$a$ is the plate length (long dimension) (${\text{m}}$)} \item{$b$ is the plate width (short dimension) (${\text{m}}$)} \end{symbDescription} @@ -982,20 +982,20 @@ \subsubsection{Data Definitions} Label & Equivalent TNT charge mass \\ \midrule \\ -Symbol & ${w_{TNT}}$ +Symbol & ${w_{\mathit{TNT}}}$ \\ \midrule \\ Units & ${\text{kg}}$ \\ \midrule \\ Equation & \begin{displaymath} - {w_{TNT}}=w TNT + {w_{\mathit{TNT}}}=w \mathit{TNT} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{${w_{TNT}}$ is the equivalent TNT charge mass (${\text{kg}}$)} + \item{${w_{\mathit{TNT}}}$ is the equivalent TNT charge mass (${\text{kg}}$)} \item{$w$ is the charge weight (${\text{kg}}$)} - \item{$TNT$ is the TNT equivalent factor (Unitless)} + \item{$\mathit{TNT}$ is the TNT equivalent factor (Unitless)} \end{symbDescription} \\ \midrule \\ Source & \cite{astm2009} @@ -1056,28 +1056,28 @@ \subsubsection{Data Definitions} Label & Load resistance \\ \midrule \\ -Symbol & $LR$ +Symbol & $\mathit{LR}$ \\ \midrule \\ Units & ${\text{Pa}}$ \\ \midrule \\ Equation & \begin{displaymath} - LR=NFL GTF LSF + \mathit{LR}=\mathit{NFL} \mathit{GTF} \mathit{LSF} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$LR$ is the load resistance (${\text{Pa}}$)} - \item{$NFL$ is the non-factored load (${\text{Pa}}$)} - \item{$GTF$ is the glass type factor (Unitless)} - \item{$LSF$ is the load share factor (Unitless)} + \item{$\mathit{LR}$ is the load resistance (${\text{Pa}}$)} + \item{$\mathit{NFL}$ is the non-factored load (${\text{Pa}}$)} + \item{$\mathit{GTF}$ is the glass type factor (Unitless)} + \item{$\mathit{LSF}$ is the load share factor (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & $LR$ is also called capacity. +Notes & $\mathit{LR}$ is also called capacity. - $NFL$ is defined in \hyperref[DD:nFL]{DD:nFL}. + $\mathit{NFL}$ is defined in \hyperref[DD:nFL]{DD:nFL}. - $GTF$ is defined in \hyperref[DD:gTF]{DD:gTF}. + $\mathit{GTF}$ is defined in \hyperref[DD:gTF]{DD:gTF}. \\ \midrule \\ Source & \cite{astm2009} @@ -1107,17 +1107,17 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} - q=interpY\left(\text{``TSD.txt''},SD,{w_{TNT}}\right) + q=\mathit{interpY}\left(\text{``TSD.txt''},\mathit{SD},{w_{\mathit{TNT}}}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} \item{$q$ is the applied load (demand) (${\text{Pa}}$)} - \item{$interpY$ is the interpY (Unitless)} - \item{$SD$ is the stand off distance (${\text{m}}$)} - \item{${w_{TNT}}$ is the equivalent TNT charge mass (${\text{kg}}$)} + \item{$\mathit{interpY}$ is the interpY (Unitless)} + \item{$\mathit{SD}$ is the stand off distance (${\text{m}}$)} + \item{${w_{\mathit{TNT}}}$ is the equivalent TNT charge mass (${\text{kg}}$)} \end{symbDescription} \\ \midrule \\ -Notes & $q$, or applied load (demand), is the 3 second duration equivalent pressure obtained from \hyperref[Figure:demandVSsod]{Fig:demandVSsod} by interpolation using stand off distance ($SD$) and ${w_{TNT}}$ as parameters. ${w_{TNT}}$ is defined in \hyperref[DD:eqTNTW]{DD:eqTNTW}. $SD$ is the stand off distance as defined in \hyperref[DD:standOffDist]{DD:standOffDist}. +Notes & $q$, or applied load (demand), is the 3 second duration equivalent pressure obtained from \hyperref[Figure:demandVSsod]{Fig:demandVSsod} by interpolation using stand off distance ($\mathit{SD}$) and ${w_{\mathit{TNT}}}$ as parameters. ${w_{\mathit{TNT}}}$ is defined in \hyperref[DD:eqTNTW]{DD:eqTNTW}. $\mathit{SD}$ is the stand off distance as defined in \hyperref[DD:standOffDist]{DD:standOffDist}. \\ \midrule \\ Source & \cite{astm2009} @@ -1149,7 +1149,7 @@ \subsubsection{Instance Models} Input & ${P_{\text{b}}}$, ${P_{\text{b}\text{tol}}}$ \\ \midrule \\ -Output & $is-safePb$ +Output & $\mathit{is-safePb}$ \\ \midrule \\ Input Constraints & \begin{displaymath} @@ -1162,16 +1162,16 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - is-safePb={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} + \mathit{is-safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$is-safePb$ is the probability of glass breakage safety requirement (Unitless)} + \item{$\mathit{is-safePb}$ is the probability of glass breakage safety requirement (Unitless)} \item{${P_{\text{b}}}$ is the probability of breakage (Unitless)} \item{${P_{\text{b}\text{tol}}}$ is the tolerable probability of breakage (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $is-safePb$, the glass is considered safe. $is-safePb$ and $is-safePb$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. +Notes & If $\mathit{is-safePb}$, the glass is considered safe. $\mathit{is-safePb}$ and $\mathit{is-safePb}$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. ${P_{\text{b}}}$ is defined in \hyperref[DD:probOfBreak]{DD:probOfBreak}. @@ -1197,14 +1197,14 @@ \subsubsection{Instance Models} Label & Safety Req-LR \\ \midrule \\ -Input & $LR$, $q$ +Input & $\mathit{LR}$, $q$ \\ \midrule \\ -Output & $is-safeLR$ +Output & $\mathit{is-safeLR}$ \\ \midrule \\ Input Constraints & \begin{displaymath} - LR\gt{}0 + \mathit{LR}\gt{}0 \end{displaymath} \begin{displaymath} q\gt{}0 @@ -1213,18 +1213,18 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - is-safeLR=LR\gt{}q + \mathit{is-safeLR}=\mathit{LR}\gt{}q \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$is-safeLR$ is the 3 second load equivalent resistance safety requirement (Unitless)} - \item{$LR$ is the load resistance (${\text{Pa}}$)} + \item{$\mathit{is-safeLR}$ is the 3 second load equivalent resistance safety requirement (Unitless)} + \item{$\mathit{LR}$ is the load resistance (${\text{Pa}}$)} \item{$q$ is the applied load (demand) (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $is-safeLR$, the glass is considered safe. $is-safePb$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $is-safeLR$ are either both True or both False. +Notes & If $\mathit{is-safeLR}$, the glass is considered safe. $\mathit{is-safePb}$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $\mathit{is-safeLR}$ are either both True or both False. - $LR$ is defined in \hyperref[DD:calofCapacity]{DD:calofCapacity} and is also called capacity. + $\mathit{LR}$ is defined in \hyperref[DD:calofCapacity]{DD:calofCapacity} and is also called capacity. $q$ is the 3 second duration equivalent pressure, as given in \hyperref[DD:calofDemand]{DD:calofDemand}. @@ -1249,15 +1249,15 @@ \subsubsection{Data Constraints} \endhead $a$ & $a\gt{}0\land{}a\geq{}b$ & ${d_{\text{min}}}\leq{}a\leq{}{d_{\text{max}}}$ & $1.5$ ${\text{m}}$ & 10$\%$ \\ -$AR$ & $AR\geq{}1$ & $AR\leq{}{AR_{\text{max}}}$ & $1.5$ & 10$\%$ +$\mathit{AR}$ & $\mathit{AR}\geq{}1$ & $\mathit{AR}\leq{}{\mathit{AR}_{\text{max}}}$ & $1.5$ & 10$\%$ \\ $b$ & $0\lt{}b\leq{}a$ & ${d_{\text{min}}}\leq{}b\leq{}{d_{\text{max}}}$ & $1.2$ ${\text{m}}$ & 10$\%$ \\ ${P_{\text{b}\text{tol}}}$ & $0\leq{}{P_{\text{b}\text{tol}}}\leq{}1$ & -- & $0.008$ & 0.1$\%$ \\ -$SD$ & $SD\gt{}0$ & ${SD_{\text{min}}}\leq{}SD\leq{}{SD_{\text{max}}}$ & $45$ ${\text{m}}$ & 10$\%$ +$\mathit{SD}$ & $\mathit{SD}\gt{}0$ & ${\mathit{SD}_{\text{min}}}\leq{}\mathit{SD}\leq{}{\mathit{SD}_{\text{max}}}$ & $45$ ${\text{m}}$ & 10$\%$ \\ -$TNT$ & $TNT\gt{}0$ & -- & $1$ & 10$\%$ +$\mathit{TNT}$ & $\mathit{TNT}\gt{}0$ & -- & $1$ & 10$\%$ \\ $w$ & $w\gt{}0$ & ${w_{\text{min}}}\leq{}w\leq{}{w_{\text{max}}}$ & $42$ ${\text{kg}}$ & 10$\%$ \\ @@ -1296,7 +1296,7 @@ \subsection{Functional Requirements} \item[System-Set-Values-Following-Assumptions:\phantomsection\label{sysSetValsFollowingAssumps}]{The system shall set the known values as described in the table for \hyperref[Table:ReqAssignments]{Required Assignments}.} \item[Check-Input-with-Data\_Constraints:\phantomsection\label{checkInputWithDataCons}]{The system shall check the entered input values to ensure that they do not exceed the \hyperref[Sec:DataConstraints]{data constraints}. If any of the input values are out of bounds, an error message is displayed and the calculations stop.} \item[Output-Values-and-Known-Values:\phantomsection\label{outputValsAndKnownValues}]{Output the input values from \hyperref[inputValues]{FR:Input-Values} and the known values from \hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions}.} -\item[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $is-safePb\land{}is-safeLR$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $\mathit{is-safePb}\land{}\mathit{is-safeLR}$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Output-Values:\phantomsection\label{outputValues}]{Output the values from the table for \hyperref[Table:ReqOutputs]{Required Outputs}.} \end{itemize} \begin{longtabu}{l X[l] l} @@ -1313,15 +1313,15 @@ \subsection{Functional Requirements} \\ ${P_{\text{b}\text{tol}}}$ & Tolerable probability of breakage & -- \\ -${SD_{\text{x}}}$ & Stand off distance ($x$-component) & ${\text{m}}$ +${\mathit{SD}_{\text{x}}}$ & Stand off distance ($x$-component) & ${\text{m}}$ \\ -${SD_{\text{y}}}$ & Stand off distance ($y$-component) & ${\text{m}}$ +${\mathit{SD}_{\text{y}}}$ & Stand off distance ($y$-component) & ${\text{m}}$ \\ -${SD_{\text{z}}}$ & Stand off distance ($z$-component) & ${\text{m}}$ +${\mathit{SD}_{\text{z}}}$ & Stand off distance ($z$-component) & ${\text{m}}$ \\ $t$ & Nominal thickness $t\in{}\{2.5,2.7,3.0,4.0,5.0,6.0,8.0,10.0,12.0,16.0,19.0,22.0\}$ & ${\text{mm}}$ \\ -$TNT$ & TNT equivalent factor & -- +$\mathit{TNT}$ & TNT equivalent factor & -- \\ $w$ & Charge weight & ${\text{kg}}$ \\ @@ -1335,23 +1335,23 @@ \subsection{Functional Requirements} \\ \midrule \endhead -$AR$ & Aspect ratio & \hyperref[DD:aspectRatio]{DD:aspectRatio} & -- +$\mathit{AR}$ & Aspect ratio & \hyperref[DD:aspectRatio]{DD:aspectRatio} & -- \\ $E$ & Modulus of elasticity of glass & \hyperref[assumpSV]{A:standardValues} & ${\text{Pa}}$ \\ -$GTF$ & Glass type factor & \hyperref[DD:gTF]{DD:gTF} & -- +$\mathit{GTF}$ & Glass type factor & \hyperref[DD:gTF]{DD:gTF} & -- \\ $h$ & Minimum thickness & \hyperref[DD:minThick]{DD:minThick} & ${\text{m}}$ \\ $k$ & Surface flaw parameter & \hyperref[assumpSV]{A:standardValues} & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ -$LDF$ & Load duration factor & \hyperref[DD:loadDurFactor]{DD:loadDurFactor} & -- +$\mathit{LDF}$ & Load duration factor & \hyperref[DD:loadDurFactor]{DD:loadDurFactor} & -- \\ -$LSF$ & Load share factor & \hyperref[assumpGL]{A:glassLite} & -- +$\mathit{LSF}$ & Load share factor & \hyperref[assumpGL]{A:glassLite} & -- \\ $m$ & Surface flaw parameter & \hyperref[assumpSV]{A:standardValues} & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ -$SD$ & Stand off distance & \hyperref[DD:standOffDist]{DD:standOffDist} & ${\text{m}}$ +$\mathit{SD}$ & Stand off distance & \hyperref[DD:standOffDist]{DD:standOffDist} & ${\text{m}}$ \\ ${t_{\text{d}}}$ & Duration of load & \hyperref[assumpSV]{A:standardValues} & ${\text{s}}$ \\ @@ -1365,23 +1365,23 @@ \subsection{Functional Requirements} \\ \midrule \endhead -$AR$ & Aspect ratio & \hyperref[DD:aspectRatio]{DD:aspectRatio} & -- +$\mathit{AR}$ & Aspect ratio & \hyperref[DD:aspectRatio]{DD:aspectRatio} & -- \\ $B$ & Risk of failure & \hyperref[DD:riskFun]{DD:riskFun} & -- \\ -$GTF$ & Glass type factor & \hyperref[DD:gTF]{DD:gTF} & -- +$\mathit{GTF}$ & Glass type factor & \hyperref[DD:gTF]{DD:gTF} & -- \\ $h$ & Minimum thickness & \hyperref[DD:minThick]{DD:minThick} & ${\text{m}}$ \\ -$is-safeLR$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- +$\mathit{is-safeLR}$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- \\ -$is-safePb$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- +$\mathit{is-safePb}$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- \\ $J$ & Stress distribution factor (Function) & \hyperref[DD:stressDistFac]{DD:stressDistFac} & -- \\ ${J_{\text{tol}}}$ & Stress distribution factor (Function) based on Pbtol & \hyperref[DD:sdfTol]{DD:sdfTol} & -- \\ -$NFL$ & Non-factored load & \hyperref[DD:nFL]{DD:nFL} & ${\text{Pa}}$ +$\mathit{NFL}$ & Non-factored load & \hyperref[DD:nFL]{DD:nFL} & ${\text{Pa}}$ \\ $\hat{q}$ & Dimensionless load & \hyperref[DD:dimlessLoad]{DD:dimlessLoad} & -- \\ @@ -1678,7 +1678,7 @@ \section{Values of Auxiliary Constants} \\ \midrule \endhead -${AR_{\text{max}}}$ & maximum aspect ratio & $5$ & -- +${\mathit{AR}_{\text{max}}}$ & maximum aspect ratio & $5$ & -- \\ ${d_{\text{max}}}$ & maximum value for one of the dimensions of the glass plate & $5$ & ${\text{m}}$ \\ @@ -1692,13 +1692,13 @@ \section{Values of Auxiliary Constants} \\ $k$ & surface flaw parameter & $28.6\cdot{}10^{-54}$ & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ -$LSF$ & load share factor & $1$ & -- +$\mathit{LSF}$ & load share factor & $1$ & -- \\ $m$ & surface flaw parameter & $7$ & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ -${SD_{\text{max}}}$ & maximum stand off distance permissible for input & $130$ & ${\text{m}}$ +${\mathit{SD}_{\text{max}}}$ & maximum stand off distance permissible for input & $130$ & ${\text{m}}$ \\ -${SD_{\text{min}}}$ & minimum stand off distance permissible for input & $6$ & ${\text{m}}$ +${\mathit{SD}_{\text{min}}}$ & minimum stand off distance permissible for input & $6$ & ${\text{m}}$ \\ ${t_{\text{d}}}$ & duration of load & $3$ & ${\text{s}}$ \\ diff --git a/code/stable/nopcm/SRS/PDF/NoPCM_SRS.tex b/code/stable/nopcm/SRS/PDF/NoPCM_SRS.tex index 00903a60b0..f7adbd8578 100644 --- a/code/stable/nopcm/SRS/PDF/NoPCM_SRS.tex +++ b/code/stable/nopcm/SRS/PDF/NoPCM_SRS.tex @@ -80,9 +80,9 @@ \subsection{Table of Symbols} \\ ${A_{\text{tol}}}$ & Absolute tolerance & -- \\ -${AR_{\text{max}}}$ & Maximum aspect ratio & -- +${\mathit{AR}_{\text{max}}}$ & Maximum aspect ratio & -- \\ -${AR_{\text{min}}}$ & Minimum aspect ratio & -- +${\mathit{AR}_{\text{min}}}$ & Minimum aspect ratio & -- \\ $C$ & Specific heat capacity & $\frac{\text{J}}{\text{kg}{}^{\circ}\text{C}}$ \\ @@ -860,7 +860,7 @@ \subsubsection{Data Constraints} \\ ${C_{\text{W}}}$ & ${C_{\text{W}}}\gt{}0$ & ${{C_{\text{W}}}^{\text{min}}}\lt{}{C_{\text{W}}}\lt{}{{C_{\text{W}}}^{\text{max}}}$ & $4186$ $\frac{\text{J}}{\text{kg}{}^{\circ}\text{C}}$ & 10$\%$ \\ -$D$ & $D\gt{}0$ & ${AR_{\text{min}}}\leq{}D\leq{}{AR_{\text{max}}}$ & $0.412$ ${\text{m}}$ & 10$\%$ +$D$ & $D\gt{}0$ & ${\mathit{AR}_{\text{min}}}\leq{}D\leq{}{\mathit{AR}_{\text{max}}}$ & $0.412$ ${\text{m}}$ & 10$\%$ \\ ${h_{\text{C}}}$ & ${h_{\text{C}}}\gt{}0$ & ${{h_{\text{C}}}^{\text{min}}}\leq{}{h_{\text{C}}}\leq{}{{h_{\text{C}}}^{\text{max}}}$ & $1000$ $\frac{\text{W}}{\text{m}^{2}{}^{\circ}\text{C}}$ & 10$\%$ \\ @@ -1211,9 +1211,9 @@ \section{Values of Auxiliary Constants} \endhead ${{A_{\text{C}}}^{\text{max}}}$ & maximum surface area of coil & $100000$ & ${\text{m}^{2}}$ \\ -${AR_{\text{max}}}$ & maximum aspect ratio & $100$ & -- +${\mathit{AR}_{\text{max}}}$ & maximum aspect ratio & $100$ & -- \\ -${AR_{\text{min}}}$ & minimum aspect ratio & $0.01$ & -- +${\mathit{AR}_{\text{min}}}$ & minimum aspect ratio & $0.01$ & -- \\ ${{C_{\text{W}}}^{\text{max}}}$ & maximum specific heat capacity of water & $4210$ & $\frac{\text{J}}{\text{kg}{}^{\circ}\text{C}}$ \\ diff --git a/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html b/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html index 7c27976cde..cd6f25a363 100644 --- a/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html +++ b/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html @@ -670,7 +670,7 @@

Theoretical Models

Equation - \[{F_{\text{s}}}=\int_{-∞}^{∞}{{f_{\text{t}}} e^{-s t}}\,dt\] + \[{F_{\text{s}}}=\int_{\mathit{-∞}}^{∞}{{f_{\text{t}}} e^{-s t}}\,dt\] @@ -726,7 +726,7 @@

Theoretical Models

Equation - \[{f_{\text{t}}}=L⁻¹[F(s)]\] + \[{f_{\text{t}}}=\mathit{L⁻¹[F(s)]}\] Description diff --git a/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex b/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex index b3ffd00b8b..6c428f3d3f 100644 --- a/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex +++ b/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex @@ -62,9 +62,9 @@ \subsection{Table of Symbols} \\ \midrule \endhead -$-∞$ & Negative Infinity & -- +$\mathit{-∞}$ & Negative Infinity & -- \\ -$AbsTol$ & Absolute Tolerance & -- +$\mathit{AbsTol}$ & Absolute Tolerance & -- \\ ${C_{\text{s}}}$ & Control Variable in the frequency domain & -- \\ @@ -90,7 +90,7 @@ \subsection{Table of Symbols} \\ $k$ & Stiffness coefficient of the spring & ${\text{s}}$ \\ -$L⁻¹[F(s)]$ & Inverse Laplace Transform of a function & -- +$\mathit{L⁻¹[F(s)]}$ & Inverse Laplace Transform of a function & -- \\ $m$ & Mass & ${\text{kg}}$ \\ @@ -100,7 +100,7 @@ \subsection{Table of Symbols} \\ ${r_{\text{t}}}$ & Set-Point & -- \\ -$RelTol$ & Relative Tolerance & -- +$\mathit{RelTol}$ & Relative Tolerance & -- \\ $s$ & Complex frequency-domain parameter & -- \\ @@ -321,7 +321,7 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - {F_{\text{s}}}=\int_{-∞}^{∞}{{f_{\text{t}}} e^{-s t}}\,dt + {F_{\text{s}}}=\int_{\mathit{-∞}}^{∞}{{f_{\text{t}}} e^{-s t}}\,dt \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -354,12 +354,12 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - {f_{\text{t}}}=L⁻¹[F(s)] + {f_{\text{t}}}=\mathit{L⁻¹[F(s)]} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} \item{${f_{\text{t}}}$ is the Function in the time domain (Unitless)} - \item{$L⁻¹[F(s)]$ is the Inverse Laplace Transform of a function (Unitless)} + \item{$\mathit{L⁻¹[F(s)]}$ is the Inverse Laplace Transform of a function (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & Inverse Laplace Transform of F(S). The Inverse Laplace transforms are typically inferred from a pre-computed table of Laplace Transforms (\cite{laplaceWiki}). diff --git a/code/stable/ssp/SRS/HTML/SSP_SRS.html b/code/stable/ssp/SRS/HTML/SSP_SRS.html index 60d04d68df..bb4b6bd1d5 100644 --- a/code/stable/ssp/SRS/HTML/SSP_SRS.html +++ b/code/stable/ssp/SRS/HTML/SSP_SRS.html @@ -3295,8 +3295,8 @@

Data Definitions

Equation \[\symbf{f}=\begin{cases} - 1, & const_f\\ - \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}const_f + 1, & \mathit{const_f}\\ + \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}\mathit{const_f} \end{cases}\] @@ -4348,7 +4348,7 @@

Equation - \[{{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},const_f\right)\] + \[{{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},\mathit{const_f}\right)\] diff --git a/code/stable/ssp/SRS/PDF/SSP_SRS.tex b/code/stable/ssp/SRS/PDF/SSP_SRS.tex index 52396b5f59..fb626f915b 100644 --- a/code/stable/ssp/SRS/PDF/SSP_SRS.tex +++ b/code/stable/ssp/SRS/PDF/SSP_SRS.tex @@ -84,7 +84,7 @@ \subsection{Table of Symbols} \\ $c'$ & Effective Cohesion: The internal pressure that sticks particles of soil together. & ${\text{Pa}}$ \\ -$const_f$ & Decision on F: A Boolean decision on which form of f the user desires: constant if true, or half-sine if false. & -- +$\mathit{const_f}$ & Decision on F: A Boolean decision on which form of f the user desires: constant if true, or half-sine if false. & -- \\ ${F_{\text{n}}}$ & Total Normal Force: Component of a force in the normal direction. & ${\text{N}}$ \\ @@ -1809,8 +1809,8 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} \symbf{f}=\begin{cases} - 1, & const_f\\ - \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}const_f + 1, & \mathit{const_f}\\ + \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}\mathit{const_f} \end{cases} \end{displaymath} \\ \midrule \\ @@ -1820,7 +1820,7 @@ \subsubsection{Data Definitions} \item{${\symbf{x}_{\text{slip}}}$ is the $x$-coordinates of the slip surface (${\text{m}}$)} \item{$i$ is the index (Unitless)} \item{$n$ is the number of slices (Unitless)} - \item{$const_f$ is the decision on f (Unitless)} + \item{$\mathit{const_f}$ is the decision on f (Unitless)} \end{symbDescription} \\ \midrule \\ Source & \cite{fredlund1977} @@ -2082,7 +2082,7 @@ \subsubsection{Instance Models} Label & Factor of safety \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $const_f$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const_f}$ \\ \midrule \\ Output & ${F_{\text{S}}}$ @@ -2244,7 +2244,7 @@ \subsubsection{Instance Models} Label & Normal and shear force proportionality constant \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $const_f$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const_f}$ \\ \midrule \\ Output & $λ$ @@ -2370,7 +2370,7 @@ \subsubsection{Instance Models} Label & Normal and shear force proportionality constant denominator \\ \midrule \\ -Input & ${\symbf{x}_{\text{slip}}}$, $const_f$ +Input & ${\symbf{x}_{\text{slip}}}$, $\mathit{const_f}$ \\ \midrule \\ Output & ${\symbf{C}_{\text{den}}}$ @@ -2423,7 +2423,7 @@ \subsubsection{Instance Models} Label & Interslice normal forces \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $const_f$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const_f}$ \\ \midrule \\ Output & $\symbf{G}$ @@ -2488,7 +2488,7 @@ \subsubsection{Instance Models} Label & Critical slip surface identification \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{x}_{\text{wt}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, $const_f$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{x}_{\text{wt}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, $\mathit{const_f}$ \\ \midrule \\ Output & ${{F_{\text{S}}}^{\text{min}}}$ @@ -2499,7 +2499,7 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - {{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},const_f\right) + {{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},\mathit{const_f}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -2514,7 +2514,7 @@ \subsubsection{Instance Models} \item{${γ_{\text{dry}}}$ is the soil dry unit weight ($\frac{\text{N}}{\text{m}^{3}}$)} \item{${γ_{\text{sat}}}$ is the soil saturated unit weight ($\frac{\text{N}}{\text{m}^{3}}$)} \item{${γ_{w}}$ is the unit weight of water ($\frac{\text{N}}{\text{m}^{3}}$)} - \item{$const_f$ is the decision on f (Unitless)} + \item{$\mathit{const_f}$ is the decision on f (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & The minimization function must enforce the constraints on the critical slip surface expressed in \hyperref[assumpSSC]{A:Slip-Surface-Concave} and \hyperref[Sec:CorSolProps]{Sec:Properties of a Correct Solution}. The sizes of ${\symbf{x}_{\text{wt}}}$ and ${\symbf{y}_{\text{wt}}}$ must be equal and not 1. The sizes of ${\symbf{x}_{\text{slope}}}$ and ${\symbf{y}_{\text{slope}}}$ must be equal and at least 2. The first and last ${\symbf{x}_{\text{wt}}}$ values must be equal to the first and last ${\symbf{x}_{\text{slope}}}$ values. ${\symbf{x}_{\text{wt}}}$ and ${\symbf{x}_{\text{slope}}}$ values must be monotonically increasing. ${{x_{\text{slip}}}^{\text{maxExt}}}$, ${{x_{\text{slip}}}^{\text{maxEtr}}}$, ${{x_{\text{slip}}}^{\text{minExt}}}$, and ${{x_{\text{slip}}}^{\text{minEtr}}}$ must be between or equal to the minimum and maximum ${\symbf{x}_{\text{slope}}}$ values. ${{y_{\text{slip}}}^{\text{max}}}$ cannot be below the minimum ${\symbf{y}_{\text{slope}}}$ value. ${{y_{\text{slip}}}^{\text{min}}}$ cannot be above the maximum ${\symbf{y}_{\text{slope}}}$ value. All $x$ values of ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must be between ${{x_{\text{slip}}}^{\text{minEtr}}}$ and ${{x_{\text{slip}}}^{\text{maxExt}}}$. All $y$ values of ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must not be below ${{y_{\text{slip}}}^{\text{min}}}$. For any given vertex in ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ the $y$ value must not exceed the ${\symbf{y}_{\text{slope}}}$ value corresponding to the same $x$ value. The first and last vertices in ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must each be equal to one of the vertices formed by ${\symbf{x}_{\text{slope}}}$ and ${\symbf{y}_{\text{slope}}}$. The slope between consecutive vertices must be always increasing as $x$ increases. The internal angle between consecutive vertices in ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must not be below 110 degrees. @@ -2621,7 +2621,7 @@ \subsection{Functional Requirements} \\ $c'$ & Effective cohesion & ${\text{Pa}}$ \\ -$const_f$ & Decision on f & -- +$\mathit{const_f}$ & Decision on f & -- \\ ${{x_{\text{slip}}}^{\text{maxEtr}}}$ & Maximum entry $x$-coordinate & ${\text{m}}$ \\ @@ -2661,7 +2661,7 @@ \subsection{Functional Requirements} \\ \midrule \endhead -$const_f$ & decision on f +$\mathit{const_f}$ & decision on f \\ ${{x_{\text{slip}}}^{\text{maxExt}}}$ & maximum exit $x$-coordinate \\ diff --git a/code/stable/swhs/SRS/HTML/SWHS_SRS.html b/code/stable/swhs/SRS/HTML/SWHS_SRS.html index ac684c24b2..340d71d8c8 100644 --- a/code/stable/swhs/SRS/HTML/SWHS_SRS.html +++ b/code/stable/swhs/SRS/HTML/SWHS_SRS.html @@ -2150,7 +2150,7 @@

Data Definitions

Equation - \[AR=\frac{D}{L}\] + \[\mathit{AR}=\frac{D}{L}\] Description diff --git a/code/stable/swhs/SRS/PDF/SWHS_SRS.tex b/code/stable/swhs/SRS/PDF/SWHS_SRS.tex index 5217f569c5..4cedf420e8 100644 --- a/code/stable/swhs/SRS/PDF/SWHS_SRS.tex +++ b/code/stable/swhs/SRS/PDF/SWHS_SRS.tex @@ -80,11 +80,11 @@ \subsection{Table of Symbols} \\ ${A_{\text{P}}}$ & Phase change material surface area & ${\text{m}^{2}}$ \\ -$AR$ & Aspect ratio & -- +$\mathit{AR}$ & Aspect ratio & -- \\ -${AR_{\text{max}}}$ & Maximum aspect ratio & -- +${\mathit{AR}_{\text{max}}}$ & Maximum aspect ratio & -- \\ -${AR_{\text{min}}}$ & Minimum aspect ratio & -- +${\mathit{AR}_{\text{min}}}$ & Minimum aspect ratio & -- \\ $C$ & Specific heat capacity & $\frac{\text{J}}{\text{kg}{}^{\circ}\text{C}}$ \\ @@ -160,7 +160,7 @@ \subsection{Table of Symbols} \\ ${m_{\text{W}}}$ & Mass of water & ${\text{kg}}$ \\ -$MINFRACT$ & Minimum fraction of the tank volume taken up by the PCM & -- +$\mathit{MINFRACT}$ & Minimum fraction of the tank volume taken up by the PCM & -- \\ $\symbf{\hat{n}}$ & Unit outward normal vector for a surface & -- \\ @@ -1105,18 +1105,18 @@ \subsubsection{Data Definitions} Label & Aspect ratio \\ \midrule \\ -Symbol & $AR$ +Symbol & $\mathit{AR}$ \\ \midrule \\ Units & Unitless \\ \midrule \\ Equation & \begin{displaymath} - AR=\frac{D}{L} + \mathit{AR}=\frac{D}{L} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$AR$ is the aspect ratio (Unitless)} + \item{$\mathit{AR}$ is the aspect ratio (Unitless)} \item{$D$ is the diameter of tank (${\text{m}}$)} \item{$L$ is the length of tank (${\text{m}}$)} \end{symbDescription} @@ -1459,7 +1459,7 @@ \subsubsection{Data Constraints} \\ ${C_{\text{W}}}$ & ${C_{\text{W}}}\gt{}0$ & ${{C_{\text{W}}}^{\text{min}}}\lt{}{C_{\text{W}}}\lt{}{{C_{\text{W}}}^{\text{max}}}$ & $4186$ $\frac{\text{J}}{\text{kg}{}^{\circ}\text{C}}$ & 10$\%$ \\ -$D$ & $D\gt{}0$ & ${AR_{\text{min}}}\leq{}D\leq{}{AR_{\text{max}}}$ & $0.412$ ${\text{m}}$ & 10$\%$ +$D$ & $D\gt{}0$ & ${\mathit{AR}_{\text{min}}}\leq{}D\leq{}{\mathit{AR}_{\text{max}}}$ & $0.412$ ${\text{m}}$ & 10$\%$ \\ ${H_{\text{f}}}$ & ${H_{\text{f}}}\gt{}0$ & ${{H_{\text{f}}}_{\text{min}}}\lt{}{H_{\text{f}}}\lt{}{{H_{\text{f}}}_{\text{max}}}$ & $211600$ $\frac{\text{J}}{\text{kg}}$ & 10$\%$ \\ @@ -1479,7 +1479,7 @@ \subsubsection{Data Constraints} \\ ${t_{\text{step}}}$ & $0\lt{}{t_{\text{step}}}\lt{}{t_{\text{final}}}$ & -- & $0.01$ ${\text{s}}$ & 10$\%$ \\ -${V_{\text{P}}}$ & $0\lt{}{V_{\text{P}}}\lt{}{V_{\text{tank}}}$ & ${V_{\text{P}}}\geq{}MINFRACT {V_{\text{tank}}}$ & $0.05$ ${\text{m}^{3}}$ & 10$\%$ +${V_{\text{P}}}$ & $0\lt{}{V_{\text{P}}}\lt{}{V_{\text{tank}}}$ & ${V_{\text{P}}}\geq{}\mathit{MINFRACT} {V_{\text{tank}}}$ & $0.05$ ${\text{m}^{3}}$ & 10$\%$ \\ ${ρ_{\text{P}}}$ & ${ρ_{\text{P}}}\gt{}0$ & ${{ρ_{\text{P}}}^{\text{min}}}\lt{}{ρ_{\text{P}}}\lt{}{{ρ_{\text{P}}}^{\text{max}}}$ & $1007$ $\frac{\text{kg}}{\text{m}^{3}}$ & 10$\%$ \\ @@ -1942,9 +1942,9 @@ \section{Values of Auxiliary Constants} \endhead ${{A_{\text{C}}}^{\text{max}}}$ & maximum surface area of coil & $100000$ & ${\text{m}^{2}}$ \\ -${AR_{\text{max}}}$ & maximum aspect ratio & $100$ & -- +${\mathit{AR}_{\text{max}}}$ & maximum aspect ratio & $100$ & -- \\ -${AR_{\text{min}}}$ & minimum aspect ratio & $0.01$ & -- +${\mathit{AR}_{\text{min}}}$ & minimum aspect ratio & $0.01$ & -- \\ ${C_{\text{tol}}}$ & relative tolerance for conservation of energy & $0.001\%$ & -- \\ @@ -1976,7 +1976,7 @@ \section{Values of Auxiliary Constants} \\ ${L_{\text{min}}}$ & minimum length of tank & $0.1$ & ${\text{m}}$ \\ -$MINFRACT$ & minimum fraction of the tank volume taken up by the PCM & $1.0\cdot{}10^{-6}$ & -- +$\mathit{MINFRACT}$ & minimum fraction of the tank volume taken up by the PCM & $1.0\cdot{}10^{-6}$ & -- \\ ${{t_{\text{final}}}^{\text{max}}}$ & maximum final time & $86400$ & ${\text{s}}$ \\ From de56e3ec24840c954288a9ec6bcb10cb14357d1b Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Sun, 17 Oct 2021 17:12:12 -0400 Subject: [PATCH 2/9] Complete writing the TODO note I wrote --- code/drasil-printers/lib/Language/Drasil/TeX/Print.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs index 7e84625b2e..a81095d596 100644 --- a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs +++ b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs @@ -81,7 +81,8 @@ print sm = foldr (($+$) . (`lo` sm)) empty ------------------ Symbol ---------------------------- --- TODO: It seems that there's a disconnect with this function and +-- TODO: It seems that there's a disconnect from this function and that of Symbol.hs? + -- | Converts a symbol into a printable document form. symbol :: LD.Symbol -> D symbol (LD.Variable s) = pure $ text s From 21aa3b7e190a380c49ef9ee5d2056c264940dcd6 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Tue, 26 Oct 2021 15:28:23 -0400 Subject: [PATCH 3/9] Rename unitals by pattern: is-safeX -> is_safeX --- .../glassbr/lib/Drasil/GlassBR/Unitals.hs | 8 ++-- code/stable/glassbr/SRS/HTML/GlassBR_SRS.html | 42 +++++++++---------- code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex | 42 +++++++++---------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs index a97c90a794..22b3055ac7 100644 --- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs +++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs @@ -243,13 +243,13 @@ dimlessLoad = vc "dimlessLoad" (nounPhraseSP "dimensionless load") (hat lQ) Real gTF = dqdNoUnit glTyFac (variable "GTF") Real isSafePb = vc "isSafePb" (nounPhraseSP "probability of glass breakage safety requirement") - (variable "is-safePb") Boolean + (variable "is_safePb") Boolean isSafeProb = vc "isSafeProb" (nounPhraseSP "probability of failure safety requirement") - (variable "is-safeProb") Boolean + (variable "is_safeProb") Boolean isSafeLR = vc "isSafeLR" (nounPhraseSP "3 second load equivalent resistance safety requirement") - (variable "is-safeLR") Boolean + (variable "is_safeLR") Boolean isSafeLoad = vc "isSafeLoad" (nounPhraseSP "load resistance safety requirement") - (variable "is-safeLoad") Boolean + (variable "is_safeLoad") Boolean lDurFac = vc'' loadDurFactor (variable "LDF") Real loadSF = dqdNoUnit loadShareFac (variable "LSF") Real diff --git a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html index 9812c3df0a..ce888ea61d 100644 --- a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html +++ b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html @@ -247,22 +247,22 @@

Table of Symbols

-- - is-safeLoad + is_safeLoad Load resistance safety requirement -- - is-safeLR + is_safeLR 3 second load equivalent resistance safety requirement -- - is-safePb + is_safePb Probability of glass breakage safety requirement -- - is-safeProb + is_safeProb Probability of failure safety requirement -- @@ -884,7 +884,7 @@

Theoretical Models

Equation - \[\mathit{is-safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] + \[\mathit{is_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] @@ -892,7 +892,7 @@

Theoretical Models

  • - is-safeProb is the probability of failure safety requirement (Unitless) + is_safeProb is the probability of failure safety requirement (Unitless)
  • Pf is the probability of failure (Unitless) @@ -907,7 +907,7 @@

    Theoretical Models

    Notes

    - If is-safeProb, the structure is considered safe. + If is_safeProb, the structure is considered safe.

    @@ -938,7 +938,7 @@

    Theoretical Models

    Equation - \[\mathit{is-safeLoad}=\mathit{capacity}\gt{}\mathit{Load}\] + \[\mathit{is_safeLoad}=\mathit{capacity}\gt{}\mathit{Load}\] @@ -946,7 +946,7 @@

    Theoretical Models

    • - is-safeLoad is the load resistance safety requirement (Unitless) + is_safeLoad is the load resistance safety requirement (Unitless)
    • capacity is the capacity or load resistance (Pa) @@ -961,7 +961,7 @@

      Theoretical Models

      Notes

      - If is-safeLoad, the structure is considered safe. + If is_safeLoad, the structure is considered safe.

      @@ -2022,7 +2022,7 @@

      Instance Models

      Output -

      is-safePb

      +

      is_safePb

      Input Constraints @@ -2038,7 +2038,7 @@

      Instance Models

      Equation - \[\mathit{is-safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] + \[\mathit{is_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] @@ -2046,7 +2046,7 @@

      Instance Models

      • - is-safePb is the probability of glass breakage safety requirement (Unitless) + is_safePb is the probability of glass breakage safety requirement (Unitless)
      • Pb is the probability of breakage (Unitless) @@ -2061,7 +2061,7 @@

        Instance Models

        Notes

        - If is-safePb, the glass is considered safe. is-safePb and is-safePb (from IM:isSafeLR) are either both True or both False. + If is_safePb, the glass is considered safe. is_safePb and is_safePb (from IM:isSafeLR) are either both True or both False.

        Pb is defined in DD:probOfBreak. @@ -2099,7 +2099,7 @@

        Instance Models

        Output -

        is-safeLR

        +

        is_safeLR

        Input Constraints @@ -2114,14 +2114,14 @@

        Instance Models

        Equation - \[\mathit{is-safeLR}=\mathit{LR}\gt{}q\] + \[\mathit{is_safeLR}=\mathit{LR}\gt{}q\] Description
        • - is-safeLR is the 3 second load equivalent resistance safety requirement (Unitless) + is_safeLR is the 3 second load equivalent resistance safety requirement (Unitless)
        • LR is the load resistance (Pa)
        • q is the applied load (demand) (Pa)
          • @@ -2132,7 +2132,7 @@

          Instance Models

          Notes

          - If is-safeLR, the glass is considered safe. is-safePb (from IM:isSafePb) and is-safeLR are either both True or both False. + If is_safeLR, the glass is considered safe. is_safePb (from IM:isSafePb) and is_safeLR are either both True or both False.

          LR is defined in DD:calofCapacity and is also called capacity. @@ -2305,7 +2305,7 @@

          Functional Requirements

          - Check-Glass-Safety: If is-safePb ∧ is-safeLR (from TM:isSafeProb and TM:isSafeLoad), 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_safePb ∧ is_safeLR (from TM:isSafeProb and TM:isSafeLoad), 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."

          @@ -2484,13 +2484,13 @@

          Functional Requirements

          m - is-safeLR + is_safeLR Safety Req-LR IM:isSafeLR -- - is-safePb + is_safePb Safety Req-Pb IM:isSafePb -- diff --git a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex index f773da07b0..8860ba9bf0 100644 --- a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex @@ -96,13 +96,13 @@ \subsection{Table of Symbols} \\ $\mathit{interpZ}$ & InterpZ & -- \\ -$\mathit{is-safeLoad}$ & Load resistance safety requirement & -- +$\mathit{is_safeLoad}$ & Load resistance safety requirement & -- \\ -$\mathit{is-safeLR}$ & 3 second load equivalent resistance safety requirement & -- +$\mathit{is_safeLR}$ & 3 second load equivalent resistance safety requirement & -- \\ -$\mathit{is-safePb}$ & Probability of glass breakage safety requirement & -- +$\mathit{is_safePb}$ & Probability of glass breakage safety requirement & -- \\ -$\mathit{is-safeProb}$ & Probability of failure safety requirement & -- +$\mathit{is_safeProb}$ & Probability of failure safety requirement & -- \\ $J$ & Stress distribution factor (Function) & -- \\ @@ -406,16 +406,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is-safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} + \mathit{is_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is-safeProb}$ is the probability of failure safety requirement (Unitless)} + \item{$\mathit{is_safeProb}$ is the probability of failure safety requirement (Unitless)} \item{${P_{\text{f}}}$ is the probability of failure (Unitless)} \item{${P_{\text{f}\text{tol}}}$ is the tolerable probability of failure (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is-safeProb}$, the structure is considered safe. +Notes & If $\mathit{is_safeProb}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -438,16 +438,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is-safeLoad}=\mathit{capacity}\gt{}\mathit{Load} + \mathit{is_safeLoad}=\mathit{capacity}\gt{}\mathit{Load} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is-safeLoad}$ is the load resistance safety requirement (Unitless)} + \item{$\mathit{is_safeLoad}$ is the load resistance safety requirement (Unitless)} \item{$\mathit{capacity}$ is the capacity or load resistance (${\text{Pa}}$)} \item{$\mathit{Load}$ is the applied load (demand) or pressure (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is-safeLoad}$, the structure is considered safe. +Notes & If $\mathit{is_safeLoad}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -1149,7 +1149,7 @@ \subsubsection{Instance Models} Input & ${P_{\text{b}}}$, ${P_{\text{b}\text{tol}}}$ \\ \midrule \\ -Output & $\mathit{is-safePb}$ +Output & $\mathit{is_safePb}$ \\ \midrule \\ Input Constraints & \begin{displaymath} @@ -1162,16 +1162,16 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is-safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} + \mathit{is_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is-safePb}$ is the probability of glass breakage safety requirement (Unitless)} + \item{$\mathit{is_safePb}$ is the probability of glass breakage safety requirement (Unitless)} \item{${P_{\text{b}}}$ is the probability of breakage (Unitless)} \item{${P_{\text{b}\text{tol}}}$ is the tolerable probability of breakage (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is-safePb}$, the glass is considered safe. $\mathit{is-safePb}$ and $\mathit{is-safePb}$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. +Notes & If $\mathit{is_safePb}$, the glass is considered safe. $\mathit{is_safePb}$ and $\mathit{is_safePb}$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. ${P_{\text{b}}}$ is defined in \hyperref[DD:probOfBreak]{DD:probOfBreak}. @@ -1200,7 +1200,7 @@ \subsubsection{Instance Models} Input & $\mathit{LR}$, $q$ \\ \midrule \\ -Output & $\mathit{is-safeLR}$ +Output & $\mathit{is_safeLR}$ \\ \midrule \\ Input Constraints & \begin{displaymath} @@ -1213,16 +1213,16 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is-safeLR}=\mathit{LR}\gt{}q + \mathit{is_safeLR}=\mathit{LR}\gt{}q \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is-safeLR}$ is the 3 second load equivalent resistance safety requirement (Unitless)} + \item{$\mathit{is_safeLR}$ is the 3 second load equivalent resistance safety requirement (Unitless)} \item{$\mathit{LR}$ is the load resistance (${\text{Pa}}$)} \item{$q$ is the applied load (demand) (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is-safeLR}$, the glass is considered safe. $\mathit{is-safePb}$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $\mathit{is-safeLR}$ are either both True or both False. +Notes & If $\mathit{is_safeLR}$, the glass is considered safe. $\mathit{is_safePb}$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $\mathit{is_safeLR}$ are either both True or both False. $\mathit{LR}$ is defined in \hyperref[DD:calofCapacity]{DD:calofCapacity} and is also called capacity. @@ -1296,7 +1296,7 @@ \subsection{Functional Requirements} \item[System-Set-Values-Following-Assumptions:\phantomsection\label{sysSetValsFollowingAssumps}]{The system shall set the known values as described in the table for \hyperref[Table:ReqAssignments]{Required Assignments}.} \item[Check-Input-with-Data\_Constraints:\phantomsection\label{checkInputWithDataCons}]{The system shall check the entered input values to ensure that they do not exceed the \hyperref[Sec:DataConstraints]{data constraints}. If any of the input values are out of bounds, an error message is displayed and the calculations stop.} \item[Output-Values-and-Known-Values:\phantomsection\label{outputValsAndKnownValues}]{Output the input values from \hyperref[inputValues]{FR:Input-Values} and the known values from \hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions}.} -\item[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $\mathit{is-safePb}\land{}\mathit{is-safeLR}$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $\mathit{is_safePb}\land{}\mathit{is_safeLR}$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Output-Values:\phantomsection\label{outputValues}]{Output the values from the table for \hyperref[Table:ReqOutputs]{Required Outputs}.} \end{itemize} \begin{longtabu}{l X[l] l} @@ -1373,9 +1373,9 @@ \subsection{Functional Requirements} \\ $h$ & Minimum thickness & \hyperref[DD:minThick]{DD:minThick} & ${\text{m}}$ \\ -$\mathit{is-safeLR}$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- +$\mathit{is_safeLR}$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- \\ -$\mathit{is-safePb}$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- +$\mathit{is_safePb}$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- \\ $J$ & Stress distribution factor (Function) & \hyperref[DD:stressDistFac]{DD:stressDistFac} & -- \\ From 16e0e3813846b1eafdf933d6a356fdb2432538d5 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Tue, 26 Oct 2021 15:41:38 -0400 Subject: [PATCH 4/9] Escape underscores in TeX generation, there is a larger scope to be disussed here however. --- .../lib/Language/Drasil/TeX/Print.hs | 11 ++++- code/stable/glassbr/SRS/HTML/GlassBR_SRS.html | 8 ++-- code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex | 42 +++++++++---------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs index a81095d596..8e275675c7 100644 --- a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs +++ b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs @@ -116,6 +116,13 @@ data OpenClose = Open | Close ----------------------------------------------------------------- -- (Since this is all implicitly in Math, leave it as String for now) +-- | Escape all special TeX characters. +-- TODO: This function should be improved. +escapeIdentSymbols :: String -> String +escapeIdentSymbols ('_':ss) = '\\' : '_' : escapeIdentSymbols ss +escapeIdentSymbols (s:ss) = s : escapeIdentSymbols ss +escapeIdentSymbols [] = [] + -- | Print an expression to a document. pExpr :: Expr -> D pExpr (Dbl d) = pure . text $ showEFloat Nothing d "" @@ -126,8 +133,8 @@ pExpr (Case ps) = mkEnv "cases" (cases ps) pExpr (Mtx a) = mkEnv "bmatrix" (pMatrix a) pExpr (Row [x]) = br $ pExpr x -- FIXME: Hack needed for symbols with multiple subscripts, etc. pExpr (Row l) = foldl1 (<>) (map pExpr l) -pExpr (Ident s@[_]) = pure . text $ s -pExpr (Ident s) = commandD "mathit" (pure $ text s) +pExpr (Ident s@[_]) = pure . text . escapeIdentSymbols $ s +pExpr (Ident s) = commandD "mathit" (pure . text . escapeIdentSymbols $ s) pExpr (Label s) = command "text" s pExpr (Spec s) = pure . text $ unPL $ L.special s --pExpr (Gr g) = unPL $ greek g diff --git a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html index ce888ea61d..432d6b571d 100644 --- a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html +++ b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html @@ -884,7 +884,7 @@

          Theoretical Models

          Equation - \[\mathit{is_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] + \[\mathit{is\_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] @@ -938,7 +938,7 @@

          Theoretical Models

          Equation - \[\mathit{is_safeLoad}=\mathit{capacity}\gt{}\mathit{Load}\] + \[\mathit{is\_safeLoad}=\mathit{capacity}\gt{}\mathit{Load}\] @@ -2038,7 +2038,7 @@

          Instance Models

          Equation - \[\mathit{is_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] + \[\mathit{is\_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] @@ -2114,7 +2114,7 @@

          Instance Models

          Equation - \[\mathit{is_safeLR}=\mathit{LR}\gt{}q\] + \[\mathit{is\_safeLR}=\mathit{LR}\gt{}q\] Description diff --git a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex index 8860ba9bf0..9a17330188 100644 --- a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex @@ -96,13 +96,13 @@ \subsection{Table of Symbols} \\ $\mathit{interpZ}$ & InterpZ & -- \\ -$\mathit{is_safeLoad}$ & Load resistance safety requirement & -- +$\mathit{is\_safeLoad}$ & Load resistance safety requirement & -- \\ -$\mathit{is_safeLR}$ & 3 second load equivalent resistance safety requirement & -- +$\mathit{is\_safeLR}$ & 3 second load equivalent resistance safety requirement & -- \\ -$\mathit{is_safePb}$ & Probability of glass breakage safety requirement & -- +$\mathit{is\_safePb}$ & Probability of glass breakage safety requirement & -- \\ -$\mathit{is_safeProb}$ & Probability of failure safety requirement & -- +$\mathit{is\_safeProb}$ & Probability of failure safety requirement & -- \\ $J$ & Stress distribution factor (Function) & -- \\ @@ -406,16 +406,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} + \mathit{is\_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is_safeProb}$ is the probability of failure safety requirement (Unitless)} + \item{$\mathit{is\_safeProb}$ is the probability of failure safety requirement (Unitless)} \item{${P_{\text{f}}}$ is the probability of failure (Unitless)} \item{${P_{\text{f}\text{tol}}}$ is the tolerable probability of failure (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is_safeProb}$, the structure is considered safe. +Notes & If $\mathit{is\_safeProb}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -438,16 +438,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is_safeLoad}=\mathit{capacity}\gt{}\mathit{Load} + \mathit{is\_safeLoad}=\mathit{capacity}\gt{}\mathit{Load} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is_safeLoad}$ is the load resistance safety requirement (Unitless)} + \item{$\mathit{is\_safeLoad}$ is the load resistance safety requirement (Unitless)} \item{$\mathit{capacity}$ is the capacity or load resistance (${\text{Pa}}$)} \item{$\mathit{Load}$ is the applied load (demand) or pressure (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is_safeLoad}$, the structure is considered safe. +Notes & If $\mathit{is\_safeLoad}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -1149,7 +1149,7 @@ \subsubsection{Instance Models} Input & ${P_{\text{b}}}$, ${P_{\text{b}\text{tol}}}$ \\ \midrule \\ -Output & $\mathit{is_safePb}$ +Output & $\mathit{is\_safePb}$ \\ \midrule \\ Input Constraints & \begin{displaymath} @@ -1162,16 +1162,16 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} + \mathit{is\_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is_safePb}$ is the probability of glass breakage safety requirement (Unitless)} + \item{$\mathit{is\_safePb}$ is the probability of glass breakage safety requirement (Unitless)} \item{${P_{\text{b}}}$ is the probability of breakage (Unitless)} \item{${P_{\text{b}\text{tol}}}$ is the tolerable probability of breakage (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is_safePb}$, the glass is considered safe. $\mathit{is_safePb}$ and $\mathit{is_safePb}$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. +Notes & If $\mathit{is\_safePb}$, the glass is considered safe. $\mathit{is\_safePb}$ and $\mathit{is\_safePb}$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. ${P_{\text{b}}}$ is defined in \hyperref[DD:probOfBreak]{DD:probOfBreak}. @@ -1200,7 +1200,7 @@ \subsubsection{Instance Models} Input & $\mathit{LR}$, $q$ \\ \midrule \\ -Output & $\mathit{is_safeLR}$ +Output & $\mathit{is\_safeLR}$ \\ \midrule \\ Input Constraints & \begin{displaymath} @@ -1213,16 +1213,16 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is_safeLR}=\mathit{LR}\gt{}q + \mathit{is\_safeLR}=\mathit{LR}\gt{}q \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is_safeLR}$ is the 3 second load equivalent resistance safety requirement (Unitless)} + \item{$\mathit{is\_safeLR}$ is the 3 second load equivalent resistance safety requirement (Unitless)} \item{$\mathit{LR}$ is the load resistance (${\text{Pa}}$)} \item{$q$ is the applied load (demand) (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is_safeLR}$, the glass is considered safe. $\mathit{is_safePb}$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $\mathit{is_safeLR}$ are either both True or both False. +Notes & If $\mathit{is\_safeLR}$, the glass is considered safe. $\mathit{is\_safePb}$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $\mathit{is\_safeLR}$ are either both True or both False. $\mathit{LR}$ is defined in \hyperref[DD:calofCapacity]{DD:calofCapacity} and is also called capacity. @@ -1296,7 +1296,7 @@ \subsection{Functional Requirements} \item[System-Set-Values-Following-Assumptions:\phantomsection\label{sysSetValsFollowingAssumps}]{The system shall set the known values as described in the table for \hyperref[Table:ReqAssignments]{Required Assignments}.} \item[Check-Input-with-Data\_Constraints:\phantomsection\label{checkInputWithDataCons}]{The system shall check the entered input values to ensure that they do not exceed the \hyperref[Sec:DataConstraints]{data constraints}. If any of the input values are out of bounds, an error message is displayed and the calculations stop.} \item[Output-Values-and-Known-Values:\phantomsection\label{outputValsAndKnownValues}]{Output the input values from \hyperref[inputValues]{FR:Input-Values} and the known values from \hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions}.} -\item[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $\mathit{is_safePb}\land{}\mathit{is_safeLR}$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $\mathit{is\_safePb}\land{}\mathit{is\_safeLR}$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Output-Values:\phantomsection\label{outputValues}]{Output the values from the table for \hyperref[Table:ReqOutputs]{Required Outputs}.} \end{itemize} \begin{longtabu}{l X[l] l} @@ -1373,9 +1373,9 @@ \subsection{Functional Requirements} \\ $h$ & Minimum thickness & \hyperref[DD:minThick]{DD:minThick} & ${\text{m}}$ \\ -$\mathit{is_safeLR}$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- +$\mathit{is\_safeLR}$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- \\ -$\mathit{is_safePb}$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- +$\mathit{is\_safePb}$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- \\ $J$ & Stress distribution factor (Function) & \hyperref[DD:stressDistFac]{DD:stressDistFac} & -- \\ From cb3529243f094cafdc6c96edc5c6ef6d847bf520 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Tue, 26 Oct 2021 15:44:33 -0400 Subject: [PATCH 5/9] Update TODO note regarding previous commit. --- code/drasil-printers/lib/Language/Drasil/TeX/Print.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs index 8e275675c7..d731fd598b 100644 --- a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs +++ b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs @@ -117,7 +117,11 @@ data OpenClose = Open | Close -- (Since this is all implicitly in Math, leave it as String for now) -- | Escape all special TeX characters. --- TODO: This function should be improved. +-- TODO: This function should be improved. It should escape all special +-- TeX symbols that would affect rendering. For example, `_` +-- turns the RHS of text into subscript, and `^` would turn it +-- into superscript. This will need to be much more comprehensive. +-- e.g., `%`, `&`, `#`, etc escapeIdentSymbols :: String -> String escapeIdentSymbols ('_':ss) = '\\' : '_' : escapeIdentSymbols ss escapeIdentSymbols (s:ss) = s : escapeIdentSymbols ss From 0ae8097c7580135c0f0b19e06ded29188860525a Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Tue, 26 Oct 2021 16:04:49 -0400 Subject: [PATCH 6/9] Stabilize SSP as well --- code/stable/ssp/SRS/HTML/SSP_SRS.html | 6 +++--- code/stable/ssp/SRS/PDF/SSP_SRS.tex | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/stable/ssp/SRS/HTML/SSP_SRS.html b/code/stable/ssp/SRS/HTML/SSP_SRS.html index bb4b6bd1d5..12cc645739 100644 --- a/code/stable/ssp/SRS/HTML/SSP_SRS.html +++ b/code/stable/ssp/SRS/HTML/SSP_SRS.html @@ -3295,8 +3295,8 @@

          Data Definitions

          Equation \[\symbf{f}=\begin{cases} - 1, & \mathit{const_f}\\ - \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}\mathit{const_f} + 1, & \mathit{const\_f}\\ + \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}\mathit{const\_f} \end{cases}\] @@ -4348,7 +4348,7 @@

          Equation - \[{{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},\mathit{const_f}\right)\] + \[{{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},\mathit{const\_f}\right)\] diff --git a/code/stable/ssp/SRS/PDF/SSP_SRS.tex b/code/stable/ssp/SRS/PDF/SSP_SRS.tex index fb626f915b..7b73b60268 100644 --- a/code/stable/ssp/SRS/PDF/SSP_SRS.tex +++ b/code/stable/ssp/SRS/PDF/SSP_SRS.tex @@ -84,7 +84,7 @@ \subsection{Table of Symbols} \\ $c'$ & Effective Cohesion: The internal pressure that sticks particles of soil together. & ${\text{Pa}}$ \\ -$\mathit{const_f}$ & Decision on F: A Boolean decision on which form of f the user desires: constant if true, or half-sine if false. & -- +$\mathit{const\_f}$ & Decision on F: A Boolean decision on which form of f the user desires: constant if true, or half-sine if false. & -- \\ ${F_{\text{n}}}$ & Total Normal Force: Component of a force in the normal direction. & ${\text{N}}$ \\ @@ -1809,8 +1809,8 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} \symbf{f}=\begin{cases} - 1, & \mathit{const_f}\\ - \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}\mathit{const_f} + 1, & \mathit{const\_f}\\ + \sin\left(π \frac{{\symbf{x}_{\text{slip},i}}-{\symbf{x}_{\text{slip},0}}}{{\symbf{x}_{\text{slip},n}}-{\symbf{x}_{\text{slip},0}}}\right), & \neg{}\mathit{const\_f} \end{cases} \end{displaymath} \\ \midrule \\ @@ -1820,7 +1820,7 @@ \subsubsection{Data Definitions} \item{${\symbf{x}_{\text{slip}}}$ is the $x$-coordinates of the slip surface (${\text{m}}$)} \item{$i$ is the index (Unitless)} \item{$n$ is the number of slices (Unitless)} - \item{$\mathit{const_f}$ is the decision on f (Unitless)} + \item{$\mathit{const\_f}$ is the decision on f (Unitless)} \end{symbDescription} \\ \midrule \\ Source & \cite{fredlund1977} @@ -2082,7 +2082,7 @@ \subsubsection{Instance Models} Label & Factor of safety \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const_f}$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const\_f}$ \\ \midrule \\ Output & ${F_{\text{S}}}$ @@ -2244,7 +2244,7 @@ \subsubsection{Instance Models} Label & Normal and shear force proportionality constant \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const_f}$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const\_f}$ \\ \midrule \\ Output & $λ$ @@ -2370,7 +2370,7 @@ \subsubsection{Instance Models} Label & Normal and shear force proportionality constant denominator \\ \midrule \\ -Input & ${\symbf{x}_{\text{slip}}}$, $\mathit{const_f}$ +Input & ${\symbf{x}_{\text{slip}}}$, $\mathit{const\_f}$ \\ \midrule \\ Output & ${\symbf{C}_{\text{den}}}$ @@ -2423,7 +2423,7 @@ \subsubsection{Instance Models} Label & Interslice normal forces \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const_f}$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, ${\symbf{x}_{\text{slip}}}$, ${\symbf{y}_{\text{slip}}}$, $\mathit{const\_f}$ \\ \midrule \\ Output & $\symbf{G}$ @@ -2488,7 +2488,7 @@ \subsubsection{Instance Models} Label & Critical slip surface identification \\ \midrule \\ -Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{x}_{\text{wt}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, $\mathit{const_f}$ +Input & ${\symbf{x}_{\text{slope}}}$, ${\symbf{y}_{\text{slope}}}$, ${\symbf{x}_{\text{wt}}}$, ${\symbf{y}_{\text{wt}}}$, $c'$, $φ'$, ${γ_{\text{dry}}}$, ${γ_{\text{sat}}}$, ${γ_{w}}$, $\mathit{const\_f}$ \\ \midrule \\ Output & ${{F_{\text{S}}}^{\text{min}}}$ @@ -2499,7 +2499,7 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - {{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},\mathit{const_f}\right) + {{F_{\text{S}}}^{\text{min}}}=Υ\left({\symbf{x}_{\text{slope}}},{\symbf{y}_{\text{slope}}},{\symbf{x}_{\text{wt}}},{\symbf{y}_{\text{wt}}},c',φ',{γ_{\text{dry}}},{γ_{\text{sat}}},{γ_{w}},\mathit{const\_f}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -2514,7 +2514,7 @@ \subsubsection{Instance Models} \item{${γ_{\text{dry}}}$ is the soil dry unit weight ($\frac{\text{N}}{\text{m}^{3}}$)} \item{${γ_{\text{sat}}}$ is the soil saturated unit weight ($\frac{\text{N}}{\text{m}^{3}}$)} \item{${γ_{w}}$ is the unit weight of water ($\frac{\text{N}}{\text{m}^{3}}$)} - \item{$\mathit{const_f}$ is the decision on f (Unitless)} + \item{$\mathit{const\_f}$ is the decision on f (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & The minimization function must enforce the constraints on the critical slip surface expressed in \hyperref[assumpSSC]{A:Slip-Surface-Concave} and \hyperref[Sec:CorSolProps]{Sec:Properties of a Correct Solution}. The sizes of ${\symbf{x}_{\text{wt}}}$ and ${\symbf{y}_{\text{wt}}}$ must be equal and not 1. The sizes of ${\symbf{x}_{\text{slope}}}$ and ${\symbf{y}_{\text{slope}}}$ must be equal and at least 2. The first and last ${\symbf{x}_{\text{wt}}}$ values must be equal to the first and last ${\symbf{x}_{\text{slope}}}$ values. ${\symbf{x}_{\text{wt}}}$ and ${\symbf{x}_{\text{slope}}}$ values must be monotonically increasing. ${{x_{\text{slip}}}^{\text{maxExt}}}$, ${{x_{\text{slip}}}^{\text{maxEtr}}}$, ${{x_{\text{slip}}}^{\text{minExt}}}$, and ${{x_{\text{slip}}}^{\text{minEtr}}}$ must be between or equal to the minimum and maximum ${\symbf{x}_{\text{slope}}}$ values. ${{y_{\text{slip}}}^{\text{max}}}$ cannot be below the minimum ${\symbf{y}_{\text{slope}}}$ value. ${{y_{\text{slip}}}^{\text{min}}}$ cannot be above the maximum ${\symbf{y}_{\text{slope}}}$ value. All $x$ values of ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must be between ${{x_{\text{slip}}}^{\text{minEtr}}}$ and ${{x_{\text{slip}}}^{\text{maxExt}}}$. All $y$ values of ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must not be below ${{y_{\text{slip}}}^{\text{min}}}$. For any given vertex in ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ the $y$ value must not exceed the ${\symbf{y}_{\text{slope}}}$ value corresponding to the same $x$ value. The first and last vertices in ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must each be equal to one of the vertices formed by ${\symbf{x}_{\text{slope}}}$ and ${\symbf{y}_{\text{slope}}}$. The slope between consecutive vertices must be always increasing as $x$ increases. The internal angle between consecutive vertices in ${\symbf{x}_{\text{cs}}}\text{,}{\symbf{y}_{\text{cs}}}$ must not be below 110 degrees. @@ -2621,7 +2621,7 @@ \subsection{Functional Requirements} \\ $c'$ & Effective cohesion & ${\text{Pa}}$ \\ -$\mathit{const_f}$ & Decision on f & -- +$\mathit{const\_f}$ & Decision on f & -- \\ ${{x_{\text{slip}}}^{\text{maxEtr}}}$ & Maximum entry $x$-coordinate & ${\text{m}}$ \\ @@ -2661,7 +2661,7 @@ \subsection{Functional Requirements} \\ \midrule \endhead -$\mathit{const_f}$ & decision on f +$\mathit{const\_f}$ & decision on f \\ ${{x_{\text{slip}}}^{\text{maxExt}}}$ & maximum exit $x$-coordinate \\ From 7dad2a014512fa718fc5edd5facb4ba256ad3d55 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Wed, 27 Oct 2021 13:05:54 -0400 Subject: [PATCH 7/9] Reconcile symbol function from drasil-printers/../Tex/Print.hs with that of Symbol.hs --- .../lib/Language/Drasil/TeX/Print.hs | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs index d731fd598b..931c3159de 100644 --- a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs +++ b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs @@ -79,35 +79,6 @@ lo (Cell _) _ = empty print :: PrintingInformation -> [LayoutObj] -> D print sm = foldr (($+$) . (`lo` sm)) empty ------------------- Symbol ---------------------------- - --- TODO: It seems that there's a disconnect from this function and that of Symbol.hs? - --- | Converts a symbol into a printable document form. -symbol :: LD.Symbol -> D -symbol (LD.Variable s) = pure $ text s -symbol (LD.Label s) = pure $ text s -symbol (LD.Integ n) = pure $ text $ show n -symbol (LD.Special s) = pure $ text $ unPL $ L.special s -symbol (LD.Concat sl) = foldl (<>) empty $ map symbol sl --- --- handle the special cases first, then general case -symbol (LD.Corners [] [] [x] [] s) = br $ symbol s <> pure hat <> br (symbol x) -symbol (LD.Corners [] [] [] [x] s) = br $ symbol s <> pure unders <> br (symbol x) -symbol (LD.Corners [_] [] [] [] _) = error "rendering of ul prescript" -symbol (LD.Corners [] [_] [] [] _) = error "rendering of ll prescript" -symbol LD.Corners{} = error "rendering of Corners (general)" -symbol (LD.Atop f s) = sFormat f s -symbol LD.Empty = empty - --- | Converts a decorated symbol into a printable document form. -sFormat :: L.Decoration -> L.Symbol -> D -sFormat LD.Hat s = commandD "hat" (symbol s) -sFormat LD.Vector s = commandD "symbf" (symbol s) -sFormat LD.Prime s = symbol s <> pure (text "'") -sFormat LD.Delta s = symbol LD.cDelta <> symbol s -sFormat LD.Magnitude s = fence Open Norm <> symbol s <> fence Open Norm - -- | Determine wether braces and brackets are opening or closing. data OpenClose = Open | Close @@ -349,7 +320,7 @@ pUnit (L.US ls) = formatu t b pow (n,p) = toMath $ superscript (p_symb n) (pure $ text $ show p) -- printing of unit symbols is done weirdly... FIXME? p_symb (LD.Concat s) = foldl (<>) empty $ map p_symb s - p_symb n = let cn = symbolNeeds n in switch (const cn) $ symbol n + p_symb n = let cn = symbolNeeds n in switch (const cn) $ pExpr $ I.symbol n ----------------------------------------------------------------- ------------------ DATA DEFINITION PRINTING----------------- From 8d1badb9a1277033bc635be4787b4e554fc658e7 Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Wed, 27 Oct 2021 13:16:02 -0400 Subject: [PATCH 8/9] Remove an excess import --- code/drasil-printers/lib/Language/Drasil/TeX/Print.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs index 931c3159de..6c2424abfd 100644 --- a/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs +++ b/code/drasil-printers/lib/Language/Drasil/TeX/Print.hs @@ -10,7 +10,6 @@ import Numeric (showEFloat) import Control.Arrow (second) import qualified Language.Drasil as L -import qualified Language.Drasil.ShortHands as LD (cDelta) import qualified Language.Drasil.Display as LD import Utils.Drasil (checkValidStr, foldNums) From 8eeac6b1c9dde0e09a1a7e8ffb0f23ca140c223d Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Fri, 29 Oct 2021 11:21:17 -0400 Subject: [PATCH 9/9] GlassBR: use camelCase for isSafe variables; is_safeX -> isSafeX --- .../glassbr/lib/Drasil/GlassBR/Unitals.hs | 8 ++-- code/stable/glassbr/SRS/HTML/GlassBR_SRS.html | 42 +++++++++---------- code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex | 42 +++++++++---------- code/stable/glassbr/src/cpp/Calculations.cpp | 8 ++-- code/stable/glassbr/src/cpp/Calculations.hpp | 4 +- code/stable/glassbr/src/cpp/Control.cpp | 14 +++---- code/stable/glassbr/src/cpp/OutputFormat.cpp | 18 ++++---- code/stable/glassbr/src/cpp/OutputFormat.hpp | 6 +-- .../stable/glassbr/src/csharp/Calculations.cs | 8 ++-- code/stable/glassbr/src/csharp/Control.cs | 14 +++---- .../stable/glassbr/src/csharp/OutputFormat.cs | 22 +++++----- .../src/java/GlassBR/Calculations.java | 8 ++-- .../glassbr/src/java/GlassBR/Control.java | 14 +++---- .../src/java/GlassBR/OutputFormat.java | 22 +++++----- .../stable/glassbr/src/python/Calculations.py | 8 ++-- code/stable/glassbr/src/python/Control.py | 14 +++---- .../stable/glassbr/src/python/OutputFormat.py | 22 +++++----- .../glassbr/src/swift/Calculations.swift | 8 ++-- .../glassbr/src/swift/OutputFormat.swift | 22 +++++----- code/stable/glassbr/src/swift/main.swift | 14 +++---- 20 files changed, 159 insertions(+), 159 deletions(-) diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs index 22b3055ac7..9099b6ac48 100644 --- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs +++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs @@ -243,13 +243,13 @@ dimlessLoad = vc "dimlessLoad" (nounPhraseSP "dimensionless load") (hat lQ) Real gTF = dqdNoUnit glTyFac (variable "GTF") Real isSafePb = vc "isSafePb" (nounPhraseSP "probability of glass breakage safety requirement") - (variable "is_safePb") Boolean + (variable "isSafePb") Boolean isSafeProb = vc "isSafeProb" (nounPhraseSP "probability of failure safety requirement") - (variable "is_safeProb") Boolean + (variable "isSafeProb") Boolean isSafeLR = vc "isSafeLR" (nounPhraseSP "3 second load equivalent resistance safety requirement") - (variable "is_safeLR") Boolean + (variable "isSafeLR") Boolean isSafeLoad = vc "isSafeLoad" (nounPhraseSP "load resistance safety requirement") - (variable "is_safeLoad") Boolean + (variable "isSafeLoad") Boolean lDurFac = vc'' loadDurFactor (variable "LDF") Real loadSF = dqdNoUnit loadShareFac (variable "LSF") Real diff --git a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html index 432d6b571d..17f07b32cb 100644 --- a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html +++ b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html @@ -247,22 +247,22 @@

          Table of Symbols

          -- - is_safeLoad + isSafeLoad Load resistance safety requirement -- - is_safeLR + isSafeLR 3 second load equivalent resistance safety requirement -- - is_safePb + isSafePb Probability of glass breakage safety requirement -- - is_safeProb + isSafeProb Probability of failure safety requirement -- @@ -884,7 +884,7 @@

          Theoretical Models

          Equation - \[\mathit{is\_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] + \[\mathit{isSafeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}}\] @@ -892,7 +892,7 @@

          Theoretical Models

          • - is_safeProb is the probability of failure safety requirement (Unitless) + isSafeProb is the probability of failure safety requirement (Unitless)
          • Pf is the probability of failure (Unitless) @@ -907,7 +907,7 @@

            Theoretical Models

            Notes

            - If is_safeProb, the structure is considered safe. + If isSafeProb, the structure is considered safe.

            @@ -938,7 +938,7 @@

            Theoretical Models

            Equation - \[\mathit{is\_safeLoad}=\mathit{capacity}\gt{}\mathit{Load}\] + \[\mathit{isSafeLoad}=\mathit{capacity}\gt{}\mathit{Load}\] @@ -946,7 +946,7 @@

            Theoretical Models

            • - is_safeLoad is the load resistance safety requirement (Unitless) + isSafeLoad is the load resistance safety requirement (Unitless)
            • capacity is the capacity or load resistance (Pa) @@ -961,7 +961,7 @@

              Theoretical Models

              Notes

              - If is_safeLoad, the structure is considered safe. + If isSafeLoad, the structure is considered safe.

              @@ -2022,7 +2022,7 @@

              Instance Models

              Output -

              is_safePb

              +

              isSafePb

              Input Constraints @@ -2038,7 +2038,7 @@

              Instance Models

              Equation - \[\mathit{is\_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] + \[\mathit{isSafePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}}\] @@ -2046,7 +2046,7 @@

              Instance Models

              • - is_safePb is the probability of glass breakage safety requirement (Unitless) + isSafePb is the probability of glass breakage safety requirement (Unitless)
              • Pb is the probability of breakage (Unitless) @@ -2061,7 +2061,7 @@

                Instance Models

                Notes

                - If is_safePb, the glass is considered safe. is_safePb and is_safePb (from IM:isSafeLR) are either both True or both False. + If isSafePb, the glass is considered safe. isSafePb and isSafePb (from IM:isSafeLR) are either both True or both False.

                Pb is defined in DD:probOfBreak. @@ -2099,7 +2099,7 @@

                Instance Models

                Output -

                is_safeLR

                +

                isSafeLR

                Input Constraints @@ -2114,14 +2114,14 @@

                Instance Models

                Equation - \[\mathit{is\_safeLR}=\mathit{LR}\gt{}q\] + \[\mathit{isSafeLR}=\mathit{LR}\gt{}q\] Description
                • - is_safeLR is the 3 second load equivalent resistance safety requirement (Unitless) + isSafeLR is the 3 second load equivalent resistance safety requirement (Unitless)
                • LR is the load resistance (Pa)
                • q is the applied load (demand) (Pa)
                  • @@ -2132,7 +2132,7 @@

                  Instance Models

                  Notes

                  - If is_safeLR, the glass is considered safe. is_safePb (from IM:isSafePb) and is_safeLR are either both True or both False. + If isSafeLR, the glass is considered safe. isSafePb (from IM:isSafePb) and isSafeLR are either both True or both False.

                  LR is defined in DD:calofCapacity and is also called capacity. @@ -2305,7 +2305,7 @@

                  Functional Requirements

                  - Check-Glass-Safety: If is_safePb ∧ is_safeLR (from TM:isSafeProb and TM:isSafeLoad), 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 isSafePb ∧ isSafeLR (from TM:isSafeProb and TM:isSafeLoad), 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."

                  @@ -2484,13 +2484,13 @@

                  Functional Requirements

                  m - is_safeLR + isSafeLR Safety Req-LR IM:isSafeLR -- - is_safePb + isSafePb Safety Req-Pb IM:isSafePb -- diff --git a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex index 9a17330188..0a617cddf8 100644 --- a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex @@ -96,13 +96,13 @@ \subsection{Table of Symbols} \\ $\mathit{interpZ}$ & InterpZ & -- \\ -$\mathit{is\_safeLoad}$ & Load resistance safety requirement & -- +$\mathit{isSafeLoad}$ & Load resistance safety requirement & -- \\ -$\mathit{is\_safeLR}$ & 3 second load equivalent resistance safety requirement & -- +$\mathit{isSafeLR}$ & 3 second load equivalent resistance safety requirement & -- \\ -$\mathit{is\_safePb}$ & Probability of glass breakage safety requirement & -- +$\mathit{isSafePb}$ & Probability of glass breakage safety requirement & -- \\ -$\mathit{is\_safeProb}$ & Probability of failure safety requirement & -- +$\mathit{isSafeProb}$ & Probability of failure safety requirement & -- \\ $J$ & Stress distribution factor (Function) & -- \\ @@ -406,16 +406,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is\_safeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} + \mathit{isSafeProb}={P_{\text{f}}}\lt{}{P_{\text{f}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is\_safeProb}$ is the probability of failure safety requirement (Unitless)} + \item{$\mathit{isSafeProb}$ is the probability of failure safety requirement (Unitless)} \item{${P_{\text{f}}}$ is the probability of failure (Unitless)} \item{${P_{\text{f}\text{tol}}}$ is the tolerable probability of failure (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is\_safeProb}$, the structure is considered safe. +Notes & If $\mathit{isSafeProb}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -438,16 +438,16 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is\_safeLoad}=\mathit{capacity}\gt{}\mathit{Load} + \mathit{isSafeLoad}=\mathit{capacity}\gt{}\mathit{Load} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is\_safeLoad}$ is the load resistance safety requirement (Unitless)} + \item{$\mathit{isSafeLoad}$ is the load resistance safety requirement (Unitless)} \item{$\mathit{capacity}$ is the capacity or load resistance (${\text{Pa}}$)} \item{$\mathit{Load}$ is the applied load (demand) or pressure (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is\_safeLoad}$, the structure is considered safe. +Notes & If $\mathit{isSafeLoad}$, the structure is considered safe. \\ \midrule \\ Source & \cite{astm2009} @@ -1149,7 +1149,7 @@ \subsubsection{Instance Models} Input & ${P_{\text{b}}}$, ${P_{\text{b}\text{tol}}}$ \\ \midrule \\ -Output & $\mathit{is\_safePb}$ +Output & $\mathit{isSafePb}$ \\ \midrule \\ Input Constraints & \begin{displaymath} @@ -1162,16 +1162,16 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is\_safePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} + \mathit{isSafePb}={P_{\text{b}}}\lt{}{P_{\text{b}\text{tol}}} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is\_safePb}$ is the probability of glass breakage safety requirement (Unitless)} + \item{$\mathit{isSafePb}$ is the probability of glass breakage safety requirement (Unitless)} \item{${P_{\text{b}}}$ is the probability of breakage (Unitless)} \item{${P_{\text{b}\text{tol}}}$ is the tolerable probability of breakage (Unitless)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is\_safePb}$, the glass is considered safe. $\mathit{is\_safePb}$ and $\mathit{is\_safePb}$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. +Notes & If $\mathit{isSafePb}$, the glass is considered safe. $\mathit{isSafePb}$ and $\mathit{isSafePb}$ (from \hyperref[IM:isSafeLR]{IM:isSafeLR}) are either both True or both False. ${P_{\text{b}}}$ is defined in \hyperref[DD:probOfBreak]{DD:probOfBreak}. @@ -1200,7 +1200,7 @@ \subsubsection{Instance Models} Input & $\mathit{LR}$, $q$ \\ \midrule \\ -Output & $\mathit{is\_safeLR}$ +Output & $\mathit{isSafeLR}$ \\ \midrule \\ Input Constraints & \begin{displaymath} @@ -1213,16 +1213,16 @@ \subsubsection{Instance Models} Output Constraints & \\ \midrule \\ Equation & \begin{displaymath} - \mathit{is\_safeLR}=\mathit{LR}\gt{}q + \mathit{isSafeLR}=\mathit{LR}\gt{}q \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$\mathit{is\_safeLR}$ is the 3 second load equivalent resistance safety requirement (Unitless)} + \item{$\mathit{isSafeLR}$ is the 3 second load equivalent resistance safety requirement (Unitless)} \item{$\mathit{LR}$ is the load resistance (${\text{Pa}}$)} \item{$q$ is the applied load (demand) (${\text{Pa}}$)} \end{symbDescription} \\ \midrule \\ -Notes & If $\mathit{is\_safeLR}$, the glass is considered safe. $\mathit{is\_safePb}$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $\mathit{is\_safeLR}$ are either both True or both False. +Notes & If $\mathit{isSafeLR}$, the glass is considered safe. $\mathit{isSafePb}$ (from \hyperref[IM:isSafePb]{IM:isSafePb}) and $\mathit{isSafeLR}$ are either both True or both False. $\mathit{LR}$ is defined in \hyperref[DD:calofCapacity]{DD:calofCapacity} and is also called capacity. @@ -1296,7 +1296,7 @@ \subsection{Functional Requirements} \item[System-Set-Values-Following-Assumptions:\phantomsection\label{sysSetValsFollowingAssumps}]{The system shall set the known values as described in the table for \hyperref[Table:ReqAssignments]{Required Assignments}.} \item[Check-Input-with-Data\_Constraints:\phantomsection\label{checkInputWithDataCons}]{The system shall check the entered input values to ensure that they do not exceed the \hyperref[Sec:DataConstraints]{data constraints}. If any of the input values are out of bounds, an error message is displayed and the calculations stop.} \item[Output-Values-and-Known-Values:\phantomsection\label{outputValsAndKnownValues}]{Output the input values from \hyperref[inputValues]{FR:Input-Values} and the known values from \hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions}.} -\item[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $\mathit{is\_safePb}\land{}\mathit{is\_safeLR}$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Check-Glass-Safety:\phantomsection\label{checkGlassSafety}]{If $\mathit{isSafePb}\land{}\mathit{isSafeLR}$ (from \hyperref[TM:isSafeProb]{TM:isSafeProb} and \hyperref[TM:isSafeLoad]{TM:isSafeLoad}), 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[Output-Values:\phantomsection\label{outputValues}]{Output the values from the table for \hyperref[Table:ReqOutputs]{Required Outputs}.} \end{itemize} \begin{longtabu}{l X[l] l} @@ -1373,9 +1373,9 @@ \subsection{Functional Requirements} \\ $h$ & Minimum thickness & \hyperref[DD:minThick]{DD:minThick} & ${\text{m}}$ \\ -$\mathit{is\_safeLR}$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- +$\mathit{isSafeLR}$ & Safety Req-LR & \hyperref[IM:isSafeLR]{IM:isSafeLR} & -- \\ -$\mathit{is\_safePb}$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- +$\mathit{isSafePb}$ & Safety Req-Pb & \hyperref[IM:isSafePb]{IM:isSafePb} & -- \\ $J$ & Stress distribution factor (Function) & \hyperref[DD:stressDistFac]{DD:stressDistFac} & -- \\ diff --git a/code/stable/glassbr/src/cpp/Calculations.cpp b/code/stable/glassbr/src/cpp/Calculations.cpp index 37932ffe5b..788b1aa9ff 100644 --- a/code/stable/glassbr/src/cpp/Calculations.cpp +++ b/code/stable/glassbr/src/cpp/Calculations.cpp @@ -125,10 +125,10 @@ double func_LR(InputParameters &inParams, double NFL) { return NFL * inParams.GTF * 1.0; } -bool func_is_safeLR(double LR, double q) { +bool func_isSafeLR(double LR, double q) { ofstream outfile; outfile.open("log.txt", std::fstream::app); - outfile << "function func_is_safeLR called with inputs: {" << std::endl; + outfile << "function func_isSafeLR called with inputs: {" << std::endl; outfile << " LR = "; outfile << LR; outfile << ", " << std::endl; @@ -152,10 +152,10 @@ double func_P_b(double B) { return 1.0 - exp(-B); } -bool func_is_safePb(InputParameters &inParams, double P_b) { +bool func_isSafePb(InputParameters &inParams, double P_b) { ofstream outfile; outfile.open("log.txt", std::fstream::app); - outfile << "function func_is_safePb called with inputs: {" << std::endl; + outfile << "function func_isSafePb called with inputs: {" << std::endl; outfile << " inParams = "; outfile << "Instance of InputParameters object"; outfile << ", " << std::endl; diff --git a/code/stable/glassbr/src/cpp/Calculations.hpp b/code/stable/glassbr/src/cpp/Calculations.hpp index 14b1865880..0875d899b3 100644 --- a/code/stable/glassbr/src/cpp/Calculations.hpp +++ b/code/stable/glassbr/src/cpp/Calculations.hpp @@ -71,7 +71,7 @@ double func_LR(InputParameters &inParams, double NFL); \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return 3 second load equivalent resistance safety requirement */ -bool func_is_safeLR(double LR, double q); +bool func_isSafeLR(double LR, double q); /** \brief Calculates probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) \param B risk of failure @@ -84,6 +84,6 @@ double func_P_b(double B); \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) \return probability of glass breakage safety requirement */ -bool func_is_safePb(InputParameters &inParams, double P_b); +bool func_isSafePb(InputParameters &inParams, double P_b); #endif diff --git a/code/stable/glassbr/src/cpp/Control.cpp b/code/stable/glassbr/src/cpp/Control.cpp index 7668c50ea6..7b17e07774 100644 --- a/code/stable/glassbr/src/cpp/Control.cpp +++ b/code/stable/glassbr/src/cpp/Control.cpp @@ -81,10 +81,10 @@ int main(int argc, const char *argv[]) { outfile << LR; outfile << " in module Control" << std::endl; outfile.close(); - bool is_safeLR = func_is_safeLR(LR, q); + bool isSafeLR = func_isSafeLR(LR, q); outfile.open("log.txt", std::fstream::app); - outfile << "var 'is_safeLR' assigned "; - outfile << is_safeLR; + outfile << "var 'isSafeLR' assigned "; + outfile << isSafeLR; outfile << " in module Control" << std::endl; outfile.close(); double P_b = func_P_b(B); @@ -93,13 +93,13 @@ int main(int argc, const char *argv[]) { outfile << P_b; outfile << " in module Control" << std::endl; outfile.close(); - bool is_safePb = func_is_safePb(inParams, P_b); + bool isSafePb = func_isSafePb(inParams, P_b); outfile.open("log.txt", std::fstream::app); - outfile << "var 'is_safePb' assigned "; - outfile << is_safePb; + outfile << "var 'isSafePb' assigned "; + outfile << isSafePb; outfile << " in module Control" << std::endl; outfile.close(); - write_output(is_safePb, is_safeLR, P_b, J); + write_output(isSafePb, isSafeLR, P_b, J); return 0; } diff --git a/code/stable/glassbr/src/cpp/OutputFormat.cpp b/code/stable/glassbr/src/cpp/OutputFormat.cpp index 25b8522f82..4e52030fce 100644 --- a/code/stable/glassbr/src/cpp/OutputFormat.cpp +++ b/code/stable/glassbr/src/cpp/OutputFormat.cpp @@ -7,15 +7,15 @@ using std::ofstream; using std::string; -void write_output(bool is_safePb, bool is_safeLR, double P_b, double J) { +void write_output(bool isSafePb, bool isSafeLR, double P_b, double J) { ofstream outfile; outfile.open("log.txt", std::fstream::app); outfile << "function write_output called with inputs: {" << std::endl; - outfile << " is_safePb = "; - outfile << is_safePb; + outfile << " isSafePb = "; + outfile << isSafePb; outfile << ", " << std::endl; - outfile << " is_safeLR = "; - outfile << is_safeLR; + outfile << " isSafeLR = "; + outfile << isSafeLR; outfile << ", " << std::endl; outfile << " P_b = "; outfile << P_b; @@ -27,10 +27,10 @@ void write_output(bool is_safePb, bool is_safeLR, double P_b, double J) { ofstream outputfile; outputfile.open("output.txt", std::fstream::out); - outputfile << "is_safePb = "; - outputfile << is_safePb << std::endl; - outputfile << "is_safeLR = "; - outputfile << is_safeLR << std::endl; + outputfile << "isSafePb = "; + outputfile << isSafePb << std::endl; + outputfile << "isSafeLR = "; + outputfile << isSafeLR << std::endl; outputfile << "P_b = "; outputfile << P_b << std::endl; outputfile << "J = "; diff --git a/code/stable/glassbr/src/cpp/OutputFormat.hpp b/code/stable/glassbr/src/cpp/OutputFormat.hpp index a1c478f7b6..057c41fb12 100644 --- a/code/stable/glassbr/src/cpp/OutputFormat.hpp +++ b/code/stable/glassbr/src/cpp/OutputFormat.hpp @@ -11,11 +11,11 @@ using std::ofstream; using std::string; /** \brief Writes the output values to output.txt - \param is_safePb probability of glass breakage safety requirement - \param is_safeLR 3 second load equivalent resistance safety requirement + \param isSafePb probability of glass breakage safety requirement + \param isSafeLR 3 second load equivalent resistance safety requirement \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) \param J stress distribution factor (Function) */ -void write_output(bool is_safePb, bool is_safeLR, double P_b, double J); +void write_output(bool isSafePb, bool isSafeLR, double P_b, double J); #endif diff --git a/code/stable/glassbr/src/csharp/Calculations.cs b/code/stable/glassbr/src/csharp/Calculations.cs index ef3422d12f..d777845d8d 100644 --- a/code/stable/glassbr/src/csharp/Calculations.cs +++ b/code/stable/glassbr/src/csharp/Calculations.cs @@ -164,10 +164,10 @@ public static double func_LR(InputParameters inParams, double NFL) { \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return 3 second load equivalent resistance safety requirement */ - public static Boolean func_is_safeLR(double LR, double q) { + public static Boolean func_isSafeLR(double LR, double q) { StreamWriter outfile; outfile = new StreamWriter("log.txt", true); - outfile.WriteLine("function func_is_safeLR called with inputs: {"); + outfile.WriteLine("function func_isSafeLR called with inputs: {"); outfile.Write(" LR = "); outfile.Write(LR); outfile.WriteLine(", "); @@ -200,10 +200,10 @@ public static double func_P_b(double B) { \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) \return probability of glass breakage safety requirement */ - public static Boolean func_is_safePb(InputParameters inParams, double P_b) { + public static Boolean func_isSafePb(InputParameters inParams, double P_b) { StreamWriter outfile; outfile = new StreamWriter("log.txt", true); - outfile.WriteLine("function func_is_safePb called with inputs: {"); + outfile.WriteLine("function func_isSafePb called with inputs: {"); outfile.Write(" inParams = "); outfile.Write("Instance of InputParameters object"); outfile.WriteLine(", "); diff --git a/code/stable/glassbr/src/csharp/Control.cs b/code/stable/glassbr/src/csharp/Control.cs index 4a5b40500e..9c6dc9229b 100644 --- a/code/stable/glassbr/src/csharp/Control.cs +++ b/code/stable/glassbr/src/csharp/Control.cs @@ -70,10 +70,10 @@ public static void Main(string[] args) { outfile.Write(LR); outfile.WriteLine(" in module Control"); outfile.Close(); - Boolean is_safeLR = Calculations.func_is_safeLR(LR, q); + Boolean isSafeLR = Calculations.func_isSafeLR(LR, q); outfile = new StreamWriter("log.txt", true); - outfile.Write("var 'is_safeLR' assigned "); - outfile.Write(is_safeLR); + outfile.Write("var 'isSafeLR' assigned "); + outfile.Write(isSafeLR); outfile.WriteLine(" in module Control"); outfile.Close(); double P_b = Calculations.func_P_b(B); @@ -82,12 +82,12 @@ public static void Main(string[] args) { outfile.Write(P_b); outfile.WriteLine(" in module Control"); outfile.Close(); - Boolean is_safePb = Calculations.func_is_safePb(inParams, P_b); + Boolean isSafePb = Calculations.func_isSafePb(inParams, P_b); outfile = new StreamWriter("log.txt", true); - outfile.Write("var 'is_safePb' assigned "); - outfile.Write(is_safePb); + outfile.Write("var 'isSafePb' assigned "); + outfile.Write(isSafePb); outfile.WriteLine(" in module Control"); outfile.Close(); - OutputFormat.write_output(is_safePb, is_safeLR, P_b, J); + OutputFormat.write_output(isSafePb, isSafeLR, P_b, J); } } diff --git a/code/stable/glassbr/src/csharp/OutputFormat.cs b/code/stable/glassbr/src/csharp/OutputFormat.cs index be2d2a22d4..b8a060ae7d 100644 --- a/code/stable/glassbr/src/csharp/OutputFormat.cs +++ b/code/stable/glassbr/src/csharp/OutputFormat.cs @@ -8,20 +8,20 @@ public class OutputFormat { /** \brief Writes the output values to output.txt - \param is_safePb probability of glass breakage safety requirement - \param is_safeLR 3 second load equivalent resistance safety requirement + \param isSafePb probability of glass breakage safety requirement + \param isSafeLR 3 second load equivalent resistance safety requirement \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) \param J stress distribution factor (Function) */ - public static void write_output(Boolean is_safePb, Boolean is_safeLR, double P_b, double J) { + public static void write_output(Boolean isSafePb, Boolean isSafeLR, double P_b, double J) { StreamWriter outfile; outfile = new StreamWriter("log.txt", true); outfile.WriteLine("function write_output called with inputs: {"); - outfile.Write(" is_safePb = "); - outfile.Write(is_safePb); + outfile.Write(" isSafePb = "); + outfile.Write(isSafePb); outfile.WriteLine(", "); - outfile.Write(" is_safeLR = "); - outfile.Write(is_safeLR); + outfile.Write(" isSafeLR = "); + outfile.Write(isSafeLR); outfile.WriteLine(", "); outfile.Write(" P_b = "); outfile.Write(P_b); @@ -33,10 +33,10 @@ public static void write_output(Boolean is_safePb, Boolean is_safeLR, double P_b StreamWriter outputfile; outputfile = new StreamWriter("output.txt", false); - outputfile.Write("is_safePb = "); - outputfile.WriteLine(is_safePb); - outputfile.Write("is_safeLR = "); - outputfile.WriteLine(is_safeLR); + outputfile.Write("isSafePb = "); + outputfile.WriteLine(isSafePb); + outputfile.Write("isSafeLR = "); + outputfile.WriteLine(isSafeLR); outputfile.Write("P_b = "); outputfile.WriteLine(P_b); outputfile.Write("J = "); diff --git a/code/stable/glassbr/src/java/GlassBR/Calculations.java b/code/stable/glassbr/src/java/GlassBR/Calculations.java index cbd449a954..0246e63369 100644 --- a/code/stable/glassbr/src/java/GlassBR/Calculations.java +++ b/code/stable/glassbr/src/java/GlassBR/Calculations.java @@ -169,10 +169,10 @@ public static double func_LR(InputParameters inParams, double NFL) throws IOExce \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return 3 second load equivalent resistance safety requirement */ - public static boolean func_is_safeLR(double LR, double q) throws IOException { + public static boolean func_isSafeLR(double LR, double q) throws IOException { PrintWriter outfile; outfile = new PrintWriter(new FileWriter(new File("log.txt"), true)); - outfile.println("function func_is_safeLR called with inputs: {"); + outfile.println("function func_isSafeLR called with inputs: {"); outfile.print(" LR = "); outfile.print(LR); outfile.println(", "); @@ -205,10 +205,10 @@ public static double func_P_b(double B) throws IOException { \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) \return probability of glass breakage safety requirement */ - public static boolean func_is_safePb(InputParameters inParams, double P_b) throws IOException { + public static boolean func_isSafePb(InputParameters inParams, double P_b) throws IOException { PrintWriter outfile; outfile = new PrintWriter(new FileWriter(new File("log.txt"), true)); - outfile.println("function func_is_safePb called with inputs: {"); + outfile.println("function func_isSafePb called with inputs: {"); outfile.print(" inParams = "); outfile.print("Instance of InputParameters object"); outfile.println(", "); diff --git a/code/stable/glassbr/src/java/GlassBR/Control.java b/code/stable/glassbr/src/java/GlassBR/Control.java index 034f9b7aef..9366fe7d91 100644 --- a/code/stable/glassbr/src/java/GlassBR/Control.java +++ b/code/stable/glassbr/src/java/GlassBR/Control.java @@ -75,10 +75,10 @@ public static void main(String[] args) throws Exception, FileNotFoundException, outfile.print(LR); outfile.println(" in module Control"); outfile.close(); - boolean is_safeLR = Calculations.func_is_safeLR(LR, q); + boolean isSafeLR = Calculations.func_isSafeLR(LR, q); outfile = new PrintWriter(new FileWriter(new File("log.txt"), true)); - outfile.print("var 'is_safeLR' assigned "); - outfile.print(is_safeLR); + outfile.print("var 'isSafeLR' assigned "); + outfile.print(isSafeLR); outfile.println(" in module Control"); outfile.close(); double P_b = Calculations.func_P_b(B); @@ -87,12 +87,12 @@ public static void main(String[] args) throws Exception, FileNotFoundException, outfile.print(P_b); outfile.println(" in module Control"); outfile.close(); - boolean is_safePb = Calculations.func_is_safePb(inParams, P_b); + boolean isSafePb = Calculations.func_isSafePb(inParams, P_b); outfile = new PrintWriter(new FileWriter(new File("log.txt"), true)); - outfile.print("var 'is_safePb' assigned "); - outfile.print(is_safePb); + outfile.print("var 'isSafePb' assigned "); + outfile.print(isSafePb); outfile.println(" in module Control"); outfile.close(); - OutputFormat.write_output(is_safePb, is_safeLR, P_b, J); + OutputFormat.write_output(isSafePb, isSafeLR, P_b, J); } } diff --git a/code/stable/glassbr/src/java/GlassBR/OutputFormat.java b/code/stable/glassbr/src/java/GlassBR/OutputFormat.java index 94a2953f63..282332cf29 100644 --- a/code/stable/glassbr/src/java/GlassBR/OutputFormat.java +++ b/code/stable/glassbr/src/java/GlassBR/OutputFormat.java @@ -12,20 +12,20 @@ public class OutputFormat { /** \brief Writes the output values to output.txt - \param is_safePb probability of glass breakage safety requirement - \param is_safeLR 3 second load equivalent resistance safety requirement + \param isSafePb probability of glass breakage safety requirement + \param isSafeLR 3 second load equivalent resistance safety requirement \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) \param J stress distribution factor (Function) */ - public static void write_output(boolean is_safePb, boolean is_safeLR, double P_b, double J) throws IOException { + public static void write_output(boolean isSafePb, boolean isSafeLR, double P_b, double J) throws IOException { PrintWriter outfile; outfile = new PrintWriter(new FileWriter(new File("log.txt"), true)); outfile.println("function write_output called with inputs: {"); - outfile.print(" is_safePb = "); - outfile.print(is_safePb); + outfile.print(" isSafePb = "); + outfile.print(isSafePb); outfile.println(", "); - outfile.print(" is_safeLR = "); - outfile.print(is_safeLR); + outfile.print(" isSafeLR = "); + outfile.print(isSafeLR); outfile.println(", "); outfile.print(" P_b = "); outfile.print(P_b); @@ -37,10 +37,10 @@ public static void write_output(boolean is_safePb, boolean is_safeLR, double P_b PrintWriter outputfile; outputfile = new PrintWriter(new FileWriter(new File("output.txt"), false)); - outputfile.print("is_safePb = "); - outputfile.println(is_safePb); - outputfile.print("is_safeLR = "); - outputfile.println(is_safeLR); + outputfile.print("isSafePb = "); + outputfile.println(isSafePb); + outputfile.print("isSafeLR = "); + outputfile.println(isSafeLR); outputfile.print("P_b = "); outputfile.println(P_b); outputfile.print("J = "); diff --git a/code/stable/glassbr/src/python/Calculations.py b/code/stable/glassbr/src/python/Calculations.py index f7d13aefb9..dc19c51359 100644 --- a/code/stable/glassbr/src/python/Calculations.py +++ b/code/stable/glassbr/src/python/Calculations.py @@ -137,9 +137,9 @@ def func_LR(inParams, NFL): # \param LR load resistance: the uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009 (Pa) # \param q applied load (demand): 3 second duration equivalent pressure (Pa) # \return 3 second load equivalent resistance safety requirement -def func_is_safeLR(LR, q): +def func_isSafeLR(LR, q): outfile = open("log.txt", "a") - print("function func_is_safeLR called with inputs: {", file=outfile) + print("function func_isSafeLR called with inputs: {", file=outfile) print(" LR = ", end="", file=outfile) print(LR, end="", file=outfile) print(", ", file=outfile) @@ -167,9 +167,9 @@ def func_P_b(B): # \param inParams structure holding the input values # \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) # \return probability of glass breakage safety requirement -def func_is_safePb(inParams, P_b): +def func_isSafePb(inParams, P_b): outfile = open("log.txt", "a") - print("function func_is_safePb called with inputs: {", file=outfile) + print("function func_isSafePb called with inputs: {", file=outfile) print(" inParams = ", end="", file=outfile) print("Instance of InputParameters object", end="", file=outfile) print(", ", file=outfile) diff --git a/code/stable/glassbr/src/python/Control.py b/code/stable/glassbr/src/python/Control.py index ecb6a4e11e..be982c3fd0 100644 --- a/code/stable/glassbr/src/python/Control.py +++ b/code/stable/glassbr/src/python/Control.py @@ -68,10 +68,10 @@ print(LR, end="", file=outfile) print(" in module Control", file=outfile) outfile.close() -is_safeLR = Calculations.func_is_safeLR(LR, q) +isSafeLR = Calculations.func_isSafeLR(LR, q) outfile = open("log.txt", "a") -print("var 'is_safeLR' assigned ", end="", file=outfile) -print(is_safeLR, end="", file=outfile) +print("var 'isSafeLR' assigned ", end="", file=outfile) +print(isSafeLR, end="", file=outfile) print(" in module Control", file=outfile) outfile.close() P_b = Calculations.func_P_b(B) @@ -80,10 +80,10 @@ print(P_b, end="", file=outfile) print(" in module Control", file=outfile) outfile.close() -is_safePb = Calculations.func_is_safePb(inParams, P_b) +isSafePb = Calculations.func_isSafePb(inParams, P_b) outfile = open("log.txt", "a") -print("var 'is_safePb' assigned ", end="", file=outfile) -print(is_safePb, end="", file=outfile) +print("var 'isSafePb' assigned ", end="", file=outfile) +print(isSafePb, end="", file=outfile) print(" in module Control", file=outfile) outfile.close() -OutputFormat.write_output(is_safePb, is_safeLR, P_b, J) +OutputFormat.write_output(isSafePb, isSafeLR, P_b, J) diff --git a/code/stable/glassbr/src/python/OutputFormat.py b/code/stable/glassbr/src/python/OutputFormat.py index f78936971e..8898685d51 100644 --- a/code/stable/glassbr/src/python/OutputFormat.py +++ b/code/stable/glassbr/src/python/OutputFormat.py @@ -2,18 +2,18 @@ # \author Nikitha Krithnan and W. Spencer Smith # \brief Provides the function for writing outputs ## \brief Writes the output values to output.txt -# \param is_safePb probability of glass breakage safety requirement -# \param is_safeLR 3 second load equivalent resistance safety requirement +# \param isSafePb probability of glass breakage safety requirement +# \param isSafeLR 3 second load equivalent resistance safety requirement # \param P_b probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) # \param J stress distribution factor (Function) -def write_output(is_safePb, is_safeLR, P_b, J): +def write_output(isSafePb, isSafeLR, P_b, J): outfile = open("log.txt", "a") print("function write_output called with inputs: {", file=outfile) - print(" is_safePb = ", end="", file=outfile) - print(is_safePb, end="", file=outfile) + print(" isSafePb = ", end="", file=outfile) + print(isSafePb, end="", file=outfile) print(", ", file=outfile) - print(" is_safeLR = ", end="", file=outfile) - print(is_safeLR, end="", file=outfile) + print(" isSafeLR = ", end="", file=outfile) + print(isSafeLR, end="", file=outfile) print(", ", file=outfile) print(" P_b = ", end="", file=outfile) print(P_b, end="", file=outfile) @@ -24,10 +24,10 @@ def write_output(is_safePb, is_safeLR, P_b, J): outfile.close() outputfile = open("output.txt", "w") - print("is_safePb = ", end="", file=outputfile) - print(is_safePb, file=outputfile) - print("is_safeLR = ", end="", file=outputfile) - print(is_safeLR, file=outputfile) + print("isSafePb = ", end="", file=outputfile) + print(isSafePb, file=outputfile) + print("isSafeLR = ", end="", file=outputfile) + print(isSafeLR, file=outputfile) print("P_b = ", end="", file=outputfile) print(P_b, file=outputfile) print("J = ", end="", file=outputfile) diff --git a/code/stable/glassbr/src/swift/Calculations.swift b/code/stable/glassbr/src/swift/Calculations.swift index a63169b17b..a44e6da2ed 100644 --- a/code/stable/glassbr/src/swift/Calculations.swift +++ b/code/stable/glassbr/src/swift/Calculations.swift @@ -463,7 +463,7 @@ func func_LR(_ inParams: inout InputParameters, _ NFL: Double) throws -> Double - Parameter q: applied load (demand): 3 second duration equivalent pressure (Pa) - Returns: 3 second load equivalent resistance safety requirement */ -func func_is_safeLR(_ LR: Double, _ q: Double) throws -> Bool { +func func_isSafeLR(_ LR: Double, _ q: Double) throws -> Bool { var outfile: FileHandle do { outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt")) @@ -472,7 +472,7 @@ func func_is_safeLR(_ LR: Double, _ q: Double) throws -> Bool { throw "Error opening file." } do { - try outfile.write(contentsOf: Data("function func_is_safeLR called with inputs: {".utf8)) + try outfile.write(contentsOf: Data("function func_isSafeLR called with inputs: {".utf8)) try outfile.write(contentsOf: Data("\n".utf8)) } catch { throw "Error printing to file." @@ -568,7 +568,7 @@ func func_P_b(_ B: Double) throws -> Double { - Parameter P_b: probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) - Returns: probability of glass breakage safety requirement */ -func func_is_safePb(_ inParams: inout InputParameters, _ P_b: Double) throws -> Bool { +func func_isSafePb(_ inParams: inout InputParameters, _ P_b: Double) throws -> Bool { var outfile: FileHandle do { outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt")) @@ -577,7 +577,7 @@ func func_is_safePb(_ inParams: inout InputParameters, _ P_b: Double) throws -> throw "Error opening file." } do { - try outfile.write(contentsOf: Data("function func_is_safePb called with inputs: {".utf8)) + try outfile.write(contentsOf: Data("function func_isSafePb called with inputs: {".utf8)) try outfile.write(contentsOf: Data("\n".utf8)) } catch { throw "Error printing to file." diff --git a/code/stable/glassbr/src/swift/OutputFormat.swift b/code/stable/glassbr/src/swift/OutputFormat.swift index 0ee49b9c76..2044588e74 100644 --- a/code/stable/glassbr/src/swift/OutputFormat.swift +++ b/code/stable/glassbr/src/swift/OutputFormat.swift @@ -5,12 +5,12 @@ import Foundation /** Writes the output values to output.txt - - Parameter is_safePb: probability of glass breakage safety requirement - - Parameter is_safeLR: 3 second load equivalent resistance safety requirement + - Parameter isSafePb: probability of glass breakage safety requirement + - Parameter isSafeLR: 3 second load equivalent resistance safety requirement - Parameter P_b: probability of breakage: the fraction of glass lites or plies that would break at the first occurrence of a specified load and duration, typically expressed in lites per 1000 (Ref: astm2016) - Parameter J: stress distribution factor (Function) */ -func write_output(_ is_safePb: Bool, _ is_safeLR: Bool, _ P_b: Double, _ J: Double) throws -> Void { +func write_output(_ isSafePb: Bool, _ isSafeLR: Bool, _ P_b: Double, _ J: Double) throws -> Void { var outfile: FileHandle do { outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt")) @@ -25,12 +25,12 @@ func write_output(_ is_safePb: Bool, _ is_safeLR: Bool, _ P_b: Double, _ J: Doub throw "Error printing to file." } do { - try outfile.write(contentsOf: Data(" is_safePb = ".utf8)) + try outfile.write(contentsOf: Data(" isSafePb = ".utf8)) } catch { throw "Error printing to file." } do { - try outfile.write(contentsOf: Data(String(is_safePb).utf8)) + try outfile.write(contentsOf: Data(String(isSafePb).utf8)) } catch { throw "Error printing to file." } @@ -41,12 +41,12 @@ func write_output(_ is_safePb: Bool, _ is_safeLR: Bool, _ P_b: Double, _ J: Doub throw "Error printing to file." } do { - try outfile.write(contentsOf: Data(" is_safeLR = ".utf8)) + try outfile.write(contentsOf: Data(" isSafeLR = ".utf8)) } catch { throw "Error printing to file." } do { - try outfile.write(contentsOf: Data(String(is_safeLR).utf8)) + try outfile.write(contentsOf: Data(String(isSafeLR).utf8)) } catch { throw "Error printing to file." } @@ -102,23 +102,23 @@ func write_output(_ is_safePb: Bool, _ is_safeLR: Bool, _ P_b: Double, _ J: Doub throw "Error opening file." } do { - try outputfile.write(contentsOf: Data("is_safePb = ".utf8)) + try outputfile.write(contentsOf: Data("isSafePb = ".utf8)) } catch { throw "Error printing to file." } do { - try outputfile.write(contentsOf: Data(String(is_safePb).utf8)) + try outputfile.write(contentsOf: Data(String(isSafePb).utf8)) try outputfile.write(contentsOf: Data("\n".utf8)) } catch { throw "Error printing to file." } do { - try outputfile.write(contentsOf: Data("is_safeLR = ".utf8)) + try outputfile.write(contentsOf: Data("isSafeLR = ".utf8)) } catch { throw "Error printing to file." } do { - try outputfile.write(contentsOf: Data(String(is_safeLR).utf8)) + try outputfile.write(contentsOf: Data(String(isSafeLR).utf8)) try outputfile.write(contentsOf: Data("\n".utf8)) } catch { throw "Error printing to file." diff --git a/code/stable/glassbr/src/swift/main.swift b/code/stable/glassbr/src/swift/main.swift index 4877b754cd..05cfa2e269 100644 --- a/code/stable/glassbr/src/swift/main.swift +++ b/code/stable/glassbr/src/swift/main.swift @@ -263,7 +263,7 @@ do { } catch { throw "Error closing file." } -var is_safeLR: Bool = try func_is_safeLR(LR, q) +var isSafeLR: Bool = try func_isSafeLR(LR, q) do { outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt")) try outfile.seekToEnd() @@ -271,12 +271,12 @@ do { throw "Error opening file." } do { - try outfile.write(contentsOf: Data("var 'is_safeLR' assigned ".utf8)) + try outfile.write(contentsOf: Data("var 'isSafeLR' assigned ".utf8)) } catch { throw "Error printing to file." } do { - try outfile.write(contentsOf: Data(String(is_safeLR).utf8)) + try outfile.write(contentsOf: Data(String(isSafeLR).utf8)) } catch { throw "Error printing to file." } @@ -319,7 +319,7 @@ do { } catch { throw "Error closing file." } -var is_safePb: Bool = try func_is_safePb(&inParams, P_b) +var isSafePb: Bool = try func_isSafePb(&inParams, P_b) do { outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt")) try outfile.seekToEnd() @@ -327,12 +327,12 @@ do { throw "Error opening file." } do { - try outfile.write(contentsOf: Data("var 'is_safePb' assigned ".utf8)) + try outfile.write(contentsOf: Data("var 'isSafePb' assigned ".utf8)) } catch { throw "Error printing to file." } do { - try outfile.write(contentsOf: Data(String(is_safePb).utf8)) + try outfile.write(contentsOf: Data(String(isSafePb).utf8)) } catch { throw "Error printing to file." } @@ -347,4 +347,4 @@ do { } catch { throw "Error closing file." } -try write_output(is_safePb, is_safeLR, P_b, J) +try write_output(isSafePb, isSafeLR, P_b, J)