diff --git a/code/drasil-example/pdcontroller/lib/Drasil/PDController/TModel.hs b/code/drasil-example/pdcontroller/lib/Drasil/PDController/TModel.hs index 176af87c3c..e0786b32ee 100644 --- a/code/drasil-example/pdcontroller/lib/Drasil/PDController/TModel.hs +++ b/code/drasil-example/pdcontroller/lib/Drasil/PDController/TModel.hs @@ -20,23 +20,23 @@ theoreticalModels = [tmLaplace, tmInvLaplace, tmSOSystem] tmLaplace :: TheoryModel tmLaplace = tm (othModel' laplaceRC) - [qw qdLaplaceTransform, qw qdFreqDomain, qw time, qw qdPosInf, + [qw qdLaplaceTransform, qw qdFreqDomain, qw time, qw qdFxnTDomain] ([] :: [ConceptChunk]) [] - [express laplaceRel] + [laplaceME] [] [dRef laplaceWiki] "laplaceTransform" [laplaceDesc] laplaceRC :: RelationConcept -laplaceRC = makeRC "laplaceRC" (cn' "Laplace Transform") EmptyS laplaceRel +laplaceRC = makeRC "laplaceRC" (cn' "Laplace Transform") EmptyS laplaceME -laplaceRel :: Relation -laplaceRel +laplaceME :: ModelExpr +laplaceME = sy qdLaplaceTransform $= - defint (eqSymb time) (sy qdNegInf) (sy qdPosInf) (sy qdFxnTDomain + intAll (eqSymb time) (sy qdFxnTDomain `mulRe` DrasilLang.exp (neg (sy qdFreqDomain) `mulRe` sy time)) laplaceDesc :: Sentence @@ -52,8 +52,7 @@ laplaceDesc tmInvLaplace :: TheoryModel tmInvLaplace = tm (othModel' invlaplaceRC) - [qw qdLaplaceTransform, qw qdFreqDomain, qw time, qw qdPosInf, - qw qdFxnTDomain] + [qw qdLaplaceTransform, qw qdFreqDomain, qw time, qw qdFxnTDomain] ([] :: [ConceptChunk]) [] [express invLaplaceRel] diff --git a/code/drasil-example/pdcontroller/lib/Drasil/PDController/Unitals.hs b/code/drasil-example/pdcontroller/lib/Drasil/PDController/Unitals.hs index 07aad4f82c..a9d5e6217c 100644 --- a/code/drasil-example/pdcontroller/lib/Drasil/PDController/Unitals.hs +++ b/code/drasil-example/pdcontroller/lib/Drasil/PDController/Unitals.hs @@ -7,13 +7,11 @@ import Language.Drasil.Chunk.Concept.NamedCombinators import Drasil.PDController.Concepts -syms, symFS, symFt, symnegInf, symposInf, syminvLaplace, symKd, symKp, +syms, symFS, symFt, syminvLaplace, symKd, symKp, symYT, symYS, symYrT, symYrS, symET, symES, symPS, symDS, symHS, symCT, symCS, symTStep, symTSim, symAbsTol, symRelTol, symDampingCoeff, symStifnessCoeff :: Symbol -symnegInf = variable "-∞" -symposInf = variable "∞" symFS = sub (variable "F") $ label "s" syminvLaplace = variable "L⁻¹[F(s)]" syms = variable "s" @@ -40,14 +38,14 @@ symStifnessCoeff = variable "k" symbols :: [QuantityDict] symbols - = [qdLaplaceTransform, qdFreqDomain, qdFxnTDomain, qdNegInf, qdPosInf, + = [qdLaplaceTransform, qdFreqDomain, qdFxnTDomain, qdInvLaplaceTransform, qdPropGain, qdDerivGain, qdSetPointTD, qdSetPointFD, qdProcessVariableTD, qdProcessVariableFD, qdProcessErrorTD, qdProcessErrorFD, qdDerivativeControlFD, qdPropControlFD, qdTransferFunctionFD, qdCtrlVarTD, qdCtrlVarFD, qdStepTime, qdSimTime, qdDampingCoeff, qdStiffnessCoeff] -qdLaplaceTransform, qdFreqDomain, qdFxnTDomain, qdNegInf, qdPosInf, +qdLaplaceTransform, qdFreqDomain, qdFxnTDomain, qdInvLaplaceTransform, qdPropGain, qdDerivGain, qdSetPointTD, qdSetPointFD, qdProcessVariableTD, qdProcessVariableFD, qdProcessErrorTD, qdProcessErrorFD, @@ -166,11 +164,6 @@ qdFxnTDomain = vc "qdFxnTDomain" (nounPhraseSent (S "Function in the time domain")) symFt Real -qdNegInf - = vc "qdNegInf" (nounPhraseSent (S "Negative Infinity")) symnegInf Real - -qdPosInf = vc "qdPosInf" (nounPhraseSent (S "Infinity")) symposInf Real - qdInvLaplaceTransform = vc "qInvLaplaceTransform" (nounPhraseSent (S "Inverse Laplace Transform of a function")) diff --git a/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html b/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html index 2a51240c53..147875e97f 100644 --- a/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html +++ b/code/stable/pdcontroller/SRS/HTML/PDController_SRS.html @@ -147,11 +147,6 @@

Table of Symbols

Description Units - - -∞ - Negative Infinity - -- - AbsTol Absolute Tolerance @@ -277,11 +272,6 @@

Table of Symbols

Process Variable -- - - - Infinity - -- -

Table of Symbols

@@ -669,9 +659,7 @@

Theoretical Models

Equation - - \[{F_{\text{s}}}=\int_{\mathit{-∞}}^{∞}{{f_{\text{t}}} e^{-s t}}\,dt\] - + \[{F_{\text{s}}}=\int_{t}{{f_{\text{t}}} e^{-s t}}\,dt\] Description diff --git a/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex b/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex index 33219372c0..bd2f7219c8 100644 --- a/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex +++ b/code/stable/pdcontroller/SRS/PDF/PDController_SRS.tex @@ -62,8 +62,6 @@ \subsection{Table of Symbols} \\ \midrule \endhead -$\mathit{-∞}$ & Negative Infinity & -- -\\ $\mathit{AbsTol}$ & Absolute Tolerance & -- \\ ${C_{\text{s}}}$ & Control Variable in the frequency domain & -- @@ -114,8 +112,6 @@ \subsection{Table of Symbols} \\ ${y_{\text{t}}}$ & Process Variable & -- \\ -$∞$ & Infinity & -- -\\ \bottomrule \caption{Table of Symbols} \label{Table:ToS} @@ -321,7 +317,7 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Equation & \begin{displaymath} - {F_{\text{s}}}=\int_{\mathit{-∞}}^{∞}{{f_{\text{t}}} e^{-s t}}\,dt + {F_{\text{s}}}=\int_{t}{{f_{\text{t}}} e^{-s t}}\,dt \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription}