\#2892 : Remove infinity QuantityDicts, and replace usage (e.g., defi…

…nite integration with infinite bounds to indefinite integration)

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]

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"))