diff --git a/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs b/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs index 44f0e40a06..945a3f4901 100644 --- a/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs +++ b/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs @@ -216,24 +216,24 @@ charsOfReader = [phrase undergraduate +:+ S "level 2" +:+ phrase Doc.physics, sysCtxIntro :: CI -> Contents sysCtxIntro prog = foldlSP [refS sysCtxFig1, S "shows the" +:+. phrase sysCont, - S "A circle represents an entity external to the", phrase software + S "A circle represents an entity external" `S.toThe` phrase software `sC` phraseNP (the user), S "in this case. A rectangle represents the", phrase softwareSys, S "itself", sParen (short prog) +:+. EmptyS, - S "Arrows are used to show the data flow between the", phraseNP (system + S "Arrows" `S.are` S "used to show the data flow between the", phraseNP (system `andIts` environment)] sysCtxDesc :: Contents sysCtxDesc = foldlSPCol [S "The interaction between the", phraseNP (product_ `andThe` user), S "is through an application programming" +:+. - phrase interface, S "The responsibilities of the", phraseNP (user + phrase interface, S "The responsibilities" `S.ofThe` phraseNP (user `andThe` system), S "are as follows"] sysCtxUsrResp :: CI -> [Sentence] sysCtxUsrResp prog = [S "Provide initial" +:+ pluralNP (condition `ofThePS` - physical) +:+ S "state of the" +:+ phrase motion +:+ S "and the" +:+ plural inDatum +:+ S "related to the" +:+ + physical) +:+ S "state" `S.ofThe` phrase motion +:+ S "and the" +:+ plural inDatum +:+ S "related to the" +:+ phrase prog `sC` S "ensuring no errors in the" +:+ plural datum +:+. S "entry", - S "Ensure that consistent units are used for" +:+. pluralNP (combineNINI input_ Doc.variable), + S "Ensure that consistent units" `S.are` S "used for" +:+. pluralNP (combineNINI input_ Doc.variable), S "Ensure required" +:+ namedRef (SRS.assumpt ([]::[Contents]) ([]::[Section])) (phrase software +:+ plural assumption) +:+ S "are appropriate for any particular" +:+ @@ -241,7 +241,7 @@ sysCtxUsrResp prog = [S "Provide initial" +:+ pluralNP (condition `ofThePS` sysCtxSysResp :: [Sentence] sysCtxSysResp = [S "Detect data type mismatch, such as a string of characters" +:+ - phrase input_ +:+. S "instead of a floating point number", + phrase input_ +:+. (S "instead" `S.ofA` S "floating point number"), S "Determine if the" +:+ plural input_ +:+ S "satisfy the required" +:+. pluralNP (physical `and_` softwareConstraint), S "Calculate the required" +:+. plural output_, diff --git a/code/drasil-example/dblpend/lib/Drasil/DblPend/IMods.hs b/code/drasil-example/dblpend/lib/Drasil/DblPend/IMods.hs index ad7b366879..fabbb97c75 100644 --- a/code/drasil-example/dblpend/lib/Drasil/DblPend/IMods.hs +++ b/code/drasil-example/dblpend/lib/Drasil/DblPend/IMods.hs @@ -32,7 +32,7 @@ angleDerivSent1, angleDerivSent2, angleDerivSent3, angleDerivSent4, angleDerivSent5, angleDerivSent6 :: Sentence angleDerivSent1 = foldlSentCol [S "By solving equations" +:+ refS xForceGD_2 `S.and_` refS yForceGD_2 `S.for` eS forceDerivExpr1 `S.and_` eS forceDerivExpr2 `S.and_` S "then substituting into equation" +:+ - refS xForceGD_1 `S.and_` refS yForceGD_1 +:+ S ", We can get equations 1 and 2"] + refS xForceGD_1 `S.and_` refS yForceGD_1 +:+ S ", we can get equations 1 and 2"] angleDerivSent2 = foldlSentCol [S "Multiply the equation 1 by" +:+ eS cosAngleExpr1 `S.and_` S "the equation 2 by" +:+ eS sinAngleExpr1 `S.and_` S "rearrange to get"] diff --git a/code/stable/dblpend/SRS/HTML/DblPend_SRS.html b/code/stable/dblpend/SRS/HTML/DblPend_SRS.html index d6fcb38faf..80819cea75 100644 --- a/code/stable/dblpend/SRS/HTML/DblPend_SRS.html +++ b/code/stable/dblpend/SRS/HTML/DblPend_SRS.html @@ -2325,7 +2325,7 @@

Instance Models

Detailed derivation of angle of the second rod:

- By solving equations GD:xForce2 and GD:yForce2 for T2 sin(θ2) and T2 cos(θ2) and then substituting into equation GD:xForce1 and GD:yForce1 , We can get equations 1 and 2: + By solving equations GD:xForce2 and GD:yForce2 for T2 sin(θ2) and T2 cos(θ2) and then substituting into equation GD:xForce1 and GD:yForce1 , we can get equations 1 and 2:

\[{m_{1}}\,{a_{\text{x}1}}=-{\symbf{T}_{1}}\,\sin\left({θ_{1}}\right)-{m_{2}}\,{a_{\text{x}2}}\]

diff --git a/code/stable/dblpend/SRS/Jupyter/DblPend_SRS.ipynb b/code/stable/dblpend/SRS/Jupyter/DblPend_SRS.ipynb index f85c6b146f..de554d5203 100644 --- a/code/stable/dblpend/SRS/Jupyter/DblPend_SRS.ipynb +++ b/code/stable/dblpend/SRS/Jupyter/DblPend_SRS.ipynb @@ -1916,7 +1916,7 @@ "#### Detailed derivation of angle of the second rod:\n", "\n", "\n", - "By solving equations [GD:xForce2](#GD:xForce2) and [GD:yForce2](#GD:yForce2) for $T_2sin(θ_2)$ and $T_2cos(θ_2)$ and then substituting into equation [GD:xForce1](#GD:xForce1) and [GD:yForce1](#GD:yForce1) , We can get equations 1 and 2:\n", + "By solving equations [GD:xForce2](#GD:xForce2) and [GD:yForce2](#GD:yForce2) for $T_2sin(θ_2)$ and $T_2cos(θ_2)$ and then substituting into equation [GD:xForce1](#GD:xForce1) and [GD:yForce1](#GD:yForce1) , we can get equations 1 and 2:\n", "$${m_{1}}\\,{a_{\\text{x}1}}=-{\\symbf{T}_{1}}\\,\\sin\\left({θ_{1}}\\right)-{m_{2}}\\,{a_{\\text{x}2}}$$\n", "\n", "\n", diff --git a/code/stable/dblpend/SRS/PDF/DblPend_SRS.tex b/code/stable/dblpend/SRS/PDF/DblPend_SRS.tex index de58eb36d5..cca5558c20 100644 --- a/code/stable/dblpend/SRS/PDF/DblPend_SRS.tex +++ b/code/stable/dblpend/SRS/PDF/DblPend_SRS.tex @@ -1441,7 +1441,7 @@ \subsubsection{Instance Models} \paragraph{Detailed derivation of angle of the second rod:} \label{IM:calOfAngle2Deriv} -By solving equations \hyperref[GD:xForce2]{GD:xForce2} and \hyperref[GD:yForce2]{GD:yForce2} for ${\symbf{T}_{2}}\,\sin\left({θ_{2}}\right)$ and ${\symbf{T}_{2}}\,\cos\left({θ_{2}}\right)$ and then substituting into equation \hyperref[GD:xForce1]{GD:xForce1} and \hyperref[GD:yForce1]{GD:yForce1} , We can get equations 1 and 2: +By solving equations \hyperref[GD:xForce2]{GD:xForce2} and \hyperref[GD:yForce2]{GD:yForce2} for ${\symbf{T}_{2}}\,\sin\left({θ_{2}}\right)$ and ${\symbf{T}_{2}}\,\cos\left({θ_{2}}\right)$ and then substituting into equation \hyperref[GD:xForce1]{GD:xForce1} and \hyperref[GD:yForce1]{GD:yForce1} , we can get equations 1 and 2: \begin{displaymath} \resizeExpression{{m_{1}}\,{a_{\text{x}1}}=-{\symbf{T}_{1}}\,\sin\left({θ_{1}}\right)-{m_{2}}\,{a_{\text{x}2}}} diff --git a/code/stable/dblpend/SRS/mdBook/src/SecIMs.md b/code/stable/dblpend/SRS/mdBook/src/SecIMs.md index 7bb357e157..ca2c2a4275 100644 --- a/code/stable/dblpend/SRS/mdBook/src/SecIMs.md +++ b/code/stable/dblpend/SRS/mdBook/src/SecIMs.md @@ -42,7 +42,7 @@ This section transforms the problem defined in the [problem description](./SecPr #### Detailed derivation of angle of the second rod: {#IM:calOfAngle2Deriv} -By solving equations [GD:xForce2](./SecGDs.md#GD:xForce2) and [GD:yForce2](./SecGDs.md#GD:yForce2) for \\({\boldsymbol{T}\_{2}}\\,\sin\left({θ\_{2}}\right)\\) and \\({\boldsymbol{T}\_{2}}\\,\cos\left({θ\_{2}}\right)\\) and then substituting into equation [GD:xForce1](./SecGDs.md#GD:xForce1) and [GD:yForce1](./SecGDs.md#GD:yForce1) , We can get equations 1 and 2: +By solving equations [GD:xForce2](./SecGDs.md#GD:xForce2) and [GD:yForce2](./SecGDs.md#GD:yForce2) for \\({\boldsymbol{T}\_{2}}\\,\sin\left({θ\_{2}}\right)\\) and \\({\boldsymbol{T}\_{2}}\\,\cos\left({θ\_{2}}\right)\\) and then substituting into equation [GD:xForce1](./SecGDs.md#GD:xForce1) and [GD:yForce1](./SecGDs.md#GD:yForce1) , we can get equations 1 and 2: \\[{m\_{1}}\\,{a\_{\text{x}1}}=-{\boldsymbol{T}\_{1}}\\,\sin\left({θ\_{1}}\right)-{m\_{2}}\\,{a\_{\text{x}2}}\\]