Fill chunk refs

code/drasil-data/lib/Data/Drasil/SI_Units.hs

@@ -11,9 +11,10 @@ fundamentals :: [UnitDefn]
 fundamentals = [metre, kilogram, second, kelvin, mole, ampere, candela]
 
 derived :: [UnitDefn]
-derived = [becquerel, calorie, centigrade, coulomb, farad, gray, henry, hertz, joule,
-  katal, kilopascal, kilowatt, litre, lumen, lux,  millimetre, newton, ohm,
-  pascal, radian, siemens, sievert, steradian, tesla, volt, watt, weber]
+derived = [becquerel, centigrade, coulomb, hertz, joule, katal, litre,
+  millimetre, newton, pascal, radian, steradian, watt, kilowatt, volt, weber,
+  tesla, henry, calorie, gray, sievert, kilopascal, lumen, lux, farad, ohm,
+  siemens]
 
 common :: [UnitDefn]
 common = [s_2, m_2, m_3]

code/drasil-docLang/lib/Drasil/DocLang.hs

@@ -55,7 +55,7 @@ module Drasil.DocLang (
   unitTableRef, tunit, tunit', tunitNone,
   -- ** Requirements
   -- Drasil.Sections.Requirements
-  inReq, mkInputPropsTable, mkQRTuple, mkQRTupleRef, 
+  inReq, inReqDesc, mkInputPropsTable, mkQRTuple, mkQRTupleRef, 
   mkValsSourceTable, reqInputsRef, mkMaintainableNFR, mkPortableNFR,
   mkCorrectNFR, mkVerifiableNFR, mkUnderstandableNFR, mkReusableNFR, 
   mkSecurityNFR,
@@ -93,7 +93,7 @@ import Drasil.Sections.AuxiliaryConstants (tableOfConstants)
 --import Drasil.Sections.GeneralSystDesc
 import Drasil.Sections.Introduction (purpDoc)
 import Drasil.Sections.ReferenceMaterial (intro, emptySectSentPlu, emptySectSentSing)
-import Drasil.Sections.Requirements (inReq, mkInputPropsTable,
+import Drasil.Sections.Requirements (inReq, inReqDesc, mkInputPropsTable,
   mkQRTuple, mkQRTupleRef, mkValsSourceTable, reqInputsRef, mkMaintainableNFR, mkPortableNFR, mkCorrectNFR,
   mkVerifiableNFR, mkUnderstandableNFR, mkReusableNFR, mkSecurityNFR)
 import Drasil.Sections.SpecificSystemDescription (auxSpecSent, termDefnF', inDataConstTbl, outDataConstTbl)

code/drasil-docLang/lib/Drasil/Sections/Requirements.hs

@@ -5,7 +5,7 @@ module Drasil.Sections.Requirements (
   -- * Functional Requirements
   fReqF,
   -- ** Input Requirements
-  fullReqs, fullTables, inReq,
+  fullReqs, fullTables, inReq, inReqDesc,
   mkInputPropsTable, mkQRTuple, mkQRTupleRef, mkValsSourceTable,
   -- * Non-functional Requirements
   nfReqF, mkMaintainableNFR, mkPortableNFR, mkCorrectNFR, mkVerifiableNFR, 

code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs

@@ -8,7 +8,8 @@ import Language.Drasil hiding (organization, section)
 import Theory.Drasil (TheoryModel, output)
 import Drasil.SRSDocument
 import Drasil.Generator (cdb)
-import qualified Drasil.DocLang.SRS as SRS
+import Drasil.DocLang (inReq, inReqDesc, mkInputPropsTable)
+import qualified Drasil.DocLang.SRS as SRS (assumpt, inModel, sectionReferences)
 import Drasil.System (SystemKind(Specification), mkSystem, systemdb)
 
 import Language.Drasil.Chunk.Concept.NamedCombinators
@@ -93,7 +94,7 @@ mkSRS = [TableOfContents, -- This creates the Table of Contents
         ]
       ],
   ReqrmntSec $ ReqsProg
-    [ FReqsSub EmptyS []
+    [ FReqsSub inputValuesDescription []
     , NonFReqsSub
     ],
   TraceabilitySec $ TraceabilityProg $ traceMatStandard si,
@@ -154,17 +155,32 @@ conceptChunks =
 
 symbMap :: ChunkDB
 symbMap = cdb (map (^. output) iMods ++ symbolsAll) ideaDicts conceptChunks []
-  dataDefs iMods genDefns tMods concIns labelledContent allRefs citations
+  dataDefs iMods genDefns tMods concIns labelledContentWithInputs allRefs citations
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref labelledContentWithInputs
 
 stdFields :: Fields
 stdFields = [DefiningEquation, Description Verbose IncludeUnits, Notes, Source, RefBy]
 
+labelledContentWithInputs :: [LabelledContent]
+labelledContentWithInputs = inputValuesTable : labelledContent
+
+inputValuesTable :: LabelledContent
+inputValuesTable = mkInputPropsTable inputs
+
+inputValuesDescription :: Sentence
+inputValuesDescription = S "the initial double pendulum configuration"
+
+inputValuesSentence :: Sentence
+inputValuesSentence = inReqDesc inputValuesTable inputValuesDescription
+
+inputValuesRequirement :: ConceptInstance
+inputValuesRequirement = inReq inputValuesSentence
+
 concIns :: [ConceptInstance]
-concIns = assumpDouble ++ goals ++ funcReqs ++ nonFuncReqs
+concIns = inputValuesRequirement : (assumpDouble ++ goals ++ funcReqs ++ nonFuncReqs)
 -- ++ likelyChgs ++ unlikelyChgs
 
 ------------------------------

code/drasil-example/dblpend/lib/Drasil/DblPend/DataDefs.hs

@@ -7,9 +7,9 @@ import Language.Drasil
 import qualified Language.Drasil.Sentence.Combinators as S
 import Theory.Drasil (DataDefinition, ddENoRefs, ddMENoRefs)
 import Drasil.DblPend.LabelledContent (figMotion)
-import Drasil.DblPend.Unitals (pendDisAngle_1, pendDisAngle_2, lenRod_1, lenRod_2, xPos_1, yPos_1, xPos_2, yPos_2)
+import Drasil.DblPend.Unitals (forceVec, pendDisAngle_1, pendDisAngle_2, lenRod_1, lenRod_2, xPos_1, yPos_1, xPos_2, yPos_2)
 import Drasil.DblPend.Concepts (horizontalPos, verticalPos)
-import Data.Drasil.Quantities.Physics (velocity, position, time, acceleration, force)
+import Data.Drasil.Quantities.Physics (velocity, position, time, acceleration)
 import Data.Drasil.Quantities.PhysicalProperties (mass)
 
 dataDefs :: [DataDefinition]
@@ -118,7 +118,7 @@ forceGDD :: DataDefinition
 forceGDD = ddENoRefs forceGQD Nothing "forceGDD" []
 
 forceGQD :: SimpleQDef
-forceGQD = mkQuantDef force forceGEqn
+forceGQD = mkQuantDef forceVec forceGEqn
 
 forceGEqn :: PExpr
 forceGEqn = vScale (sy mass) (sy acceleration)

code/drasil-example/dblpend/lib/Drasil/DblPend/Unitals.hs

@@ -44,14 +44,14 @@ unitalChunks = [
   lenRod_1, lenRod_2, massObj_1, massObj_2, angularVel_1, angularVel_2,
   xVel_1, xVel_2, yVel_1, yVel_2, xPos_1, xPos_2, yPos_1, yPos_2, xAccel_1,
   yAccel_1, xAccel_2, yAccel_2, angularAccel_1, angularAccel_2, tension_1,
-  tension_2, QPP.mass, QP.force, QP.gravitationalAccel, QP.tension, QP.acceleration,
+  tension_2, QPP.mass, QP.force, forceVec, QP.gravitationalAccel, QP.tension, QP.acceleration,
   QP.time, QP.velocity, QP.position]
 
 lenRod_1, lenRod_2, massObj_1, massObj_2, angularVel_1, angularVel_2, 
   pendDisAngle_1, pendDisAngle_2,
   xPos_1, xPos_2, yPos_1, yPos_2, xVel_1, yVel_1, xVel_2, yVel_2, xAccel_1,
   yAccel_1, xAccel_2, yAccel_2,
-  angularAccel_1, angularAccel_2, tension_1, tension_2 :: UnitalChunk
+  angularAccel_1, angularAccel_2, tension_1, tension_2, forceVec :: UnitalChunk
 
 lenRod_1 = uc' "l_1" (len `ofThe` firstRod)
         (phraseNP (len `the_ofThe` firstRod)) -- Fix me, can have more information 
@@ -185,3 +185,8 @@ pendDisAngle = cuc' "pendDisAngle"
   "column vector of displacement of rods with its derivatives"
   lTheta' radian (Vect Real)
   [physRange $ UpFrom (Inc, exactDbl 0)] (exactDbl 0)
+
+forceVec = uc' "forceVec"
+  (nounPhraseSP "force vector")
+  (phrase QP.force `S.ofThe` S "system in vector form")
+  (vec (prime cF)) (Vect Real) newton

code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Body.hs

@@ -150,7 +150,7 @@ abbreviationsList =
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef, pymunk] ++ uriReferences ++ offShelfSolRefs
+allRefs = [externalLinkRef, pymunk] ++ SRS.sectionReferences ++ uriReferences ++ offShelfSolRefs
 
 --FIXME: The SRS has been partly switched over to the new docLang, so some of
 -- the sections below are now redundant. I have not removed them yet, because

code/drasil-example/glassbr/lib/Drasil/GlassBR/Assumptions.hs

@@ -4,6 +4,7 @@ module Drasil.GlassBR.Assumptions (assumpGT, assumpGC, assumpES, assumpSV,
 
 import Language.Drasil hiding (organization)
 import qualified Drasil.DocLang.SRS as SRS (valsOfAuxCons)
+import Control.Lens (view)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.NounPhrase.Combinators as NP
 import qualified Language.Drasil.Sentence.Combinators as S
@@ -67,7 +68,7 @@ standardValuesDesc :: UnitalChunk -> Sentence
 standardValuesDesc mainIdea = foldlSent [atStartNP' (the value), S "provided in",
   refS $ SRS.valsOfAuxCons ([]::[Contents]) ([]::[Section]), S "are assumed for the", phrase mainIdea, 
   sParen (ch mainIdea) `sC` S "and the", plural materialProprty `S.of_` 
-  foldlList Comma List (map ch (take 3 assumptionConstants))]
+  foldlList Comma List (map (ch . view defLhs) assumptionConstants)]
 
 glassLiteDesc :: Sentence
 glassLiteDesc = foldlSent [atStart glass, S "under consideration is assumed to be a single", 

code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs

@@ -6,8 +6,9 @@ import Language.Drasil hiding (organization, section, variable)
 import Drasil.Metadata as M (dataDefn, inModel, thModel)
 import Drasil.SRSDocument
 import Drasil.Generator (cdb)
-import Drasil.DocLang (auxSpecSent, termDefnF')
-import qualified Drasil.DocLang.SRS as SRS (reference, assumpt, inModel)
+import Drasil.DocLang (auxSpecSent, termDefnF', inReq, mkInputPropsTable)
+import qualified Drasil.DocLang as DocLang (inReqDesc)
+import qualified Drasil.DocLang.SRS as SRS (reference, assumpt, inModel, sectionReferences)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.Sentence.Combinators as S
 import Drasil.System (SystemKind(Specification), mkSystem, systemdb)
@@ -39,14 +40,14 @@ import Drasil.GlassBR.LabelledContent
 import Drasil.GlassBR.Goals (goals)
 import Drasil.GlassBR.IMods (iMods, instModIntro)
 import Drasil.GlassBR.MetaConcepts (progName)
-import Drasil.GlassBR.References (astm2009, astm2012, astm2016, citations)
+import Drasil.GlassBR.References (astm2009, astm2012, astm2016, citations, cartesianWiki)
 import Drasil.GlassBR.Requirements (funcReqs, inReqDesc, funcReqsTables, nonfuncReqs)
 import Drasil.GlassBR.Symbols (symbolsForSymbolTable, thisSymbols)
 import Drasil.GlassBR.TMods (tMods)
 import Drasil.GlassBR.Unitals (blast, blastTy, bomb, explosion, constants,
   constrained, inputs, outputs, specParamVals, glassTy,
   glassTypes, glBreakage, lateralLoad, load, loadTypes, pbTol, probBr, stressDistFac, probBreak,
-  sD, termsWithAccDefn, termsWithDefsOnly, concepts, dataConstraints)
+  sD, termsWithAccDefn, termsWithDefsOnly, concepts, dataConstraints, unitalSymbols)
 
 srs :: Document
 srs = mkDoc mkSRS (S.forGen titleize phrase) fullSI
@@ -120,17 +121,21 @@ background = foldlSent_ [phrase explosion, S "in downtown areas are dangerous fr
 
 ideaDicts :: [IdeaDict]
 ideaDicts =
-  -- IdeaDicts
-  [lateralLoad, materialProprty] ++ con' ++
-  -- CIs
-  map nw [progName, iGlass, lGlass] ++ map nw mathcon'
+  filter (\idc -> (idc ^. uid) `notElem` conceptChunkUIDs) baseIdeaDicts
+  where
+    baseIdeaDicts =
+      -- IdeaDicts
+      [lateralLoad, materialProprty] ++ con' ++
+      -- CIs
+      map nw [progName, iGlass, lGlass] ++ map nw mathcon'
+    conceptChunkUIDs = map (^. uid) conceptChunks
 
 conceptChunks :: [ConceptChunk]
 conceptChunks = 
   -- ConceptChunks
   distance : concepts ++ softwarecon ++ physicalcon ++
   -- Unital Chunks
-  map cw mathunitals ++ map cw physicalquants ++
+  map cw mathunitals ++ map cw physicalquants ++ map cw unitalSymbols ++
   -- DefinedQuantityDicts
   map cw mathquants
 
@@ -145,13 +150,22 @@ symbMap = cdb thisSymbols ideaDicts conceptChunks ([] :: [UnitDefn])
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref (inputValuesTable : funcReqsTables)
+
+inputValuesTable :: LabelledContent
+inputValuesTable = mkInputPropsTable inputs
+
+inputValuesRequirement :: ConceptInstance
+inputValuesRequirement = inReq inputValuesSentence
+
+inputValuesSentence :: Sentence
+inputValuesSentence = DocLang.inReqDesc inputValuesTable inReqDesc
 
 concIns :: [ConceptInstance]
-concIns = assumptions ++ goals ++ likelyChgs ++ unlikelyChgs ++ funcReqs ++ nonfuncReqs
+concIns = inputValuesRequirement : (assumptions ++ goals ++ likelyChgs ++ unlikelyChgs ++ funcReqs ++ nonfuncReqs)
 
 labCon :: [LabelledContent]
-labCon = funcReqsTables ++ figures
+labCon = inputValuesTable : (funcReqsTables ++ figures)
 
 stdFields :: Fields
 stdFields = [DefiningEquation, Description Verbose IncludeUnits, Notes, Source, RefBy]

code/drasil-example/glassbr/lib/Drasil/GlassBR/References.hs

@@ -1,17 +1,21 @@
-module Drasil.GlassBR.References where
+module Drasil.GlassBR.References (
+  citations,
+  astm2009, astm2012, astm2016, beasonEtAl1998,
+  cartesianWiki
+) where
 
 import Language.Drasil
 
-import Data.Drasil.Citations (campidelli, koothoor2013, smithEtAl2007,
-  smithLai2005, smithKoothoor2016, parnasClements1986)
+import Data.Drasil.Citations (campidelli, cartesianWiki, koothoor2013,
+  smithEtAl2007, smithLai2005, smithKoothoor2016, parnasClements1986)
 import Data.Drasil.People (jmBracci, tlKohutek, wlBeason)
 
 astm2009, astm2016, astm2012, beasonEtAl1998 :: Citation
 
 citations :: BibRef
 citations = [campidelli, koothoor2013, smithEtAl2007, smithLai2005,
              smithKoothoor2016, astm2009, astm2016, astm2012, beasonEtAl1998,
-             parnasClements1986]
+             parnasClements1986, cartesianWiki]
 
 astm2009 = cMisc [author [mononym "ASTM"],
   title "Standard Practice for Determining Load Resistance of Glass in Buildings",

code/drasil-example/glassbr/lib/Drasil/GlassBR/Symbols.hs

@@ -1,15 +1,17 @@
 module Drasil.GlassBR.Symbols where
 
-import Language.Drasil (DefinedQuantityDict, dqdWr, cnstrw')
+import Language.Drasil (DefinedQuantityDict, dqdWr, cnstrw', defLhs)
 import Language.Drasil.Code (Mod(Mod), asVC)
 
 import Drasil.GlassBR.ModuleDefs (allMods, implVars)
+import Drasil.GlassBR.Assumptions (assumptionConstants)
 import Drasil.GlassBR.Unitals (specParamVals, modElas,
   tmSymbols, interps, derivedInputDataConstraints, unitless, probBr,
   stressDistFac, nomThick, sdVector, inputsWUnitsUncrtn, inputsWUncrtn,
   glassTypeCon, unitalSymbols)
 
 import Data.List ((\\))
+import Control.Lens (view)
 
 symbolsForSymbolTable :: [DefinedQuantityDict]
 symbolsForSymbolTable = symbolsForTermTable ++ map dqdWr unitalSymbols ++
@@ -19,7 +21,7 @@ symbolsForSymbolTable = symbolsForTermTable ++ map dqdWr unitalSymbols ++
 symbolsForTermTable :: [DefinedQuantityDict]
 symbolsForTermTable = map dqdWr inputsWUnitsUncrtn ++ map dqdWr inputsWUncrtn ++
   map dqdWr sdVector ++ tmSymbols ++ map dqdWr specParamVals ++ 
-  [dqdWr modElas] ++ interps
+  map (view defLhs) assumptionConstants ++ [dqdWr modElas] ++ interps
 
   -- include all module functions as symbols
 thisSymbols :: [DefinedQuantityDict]

code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs

@@ -300,11 +300,11 @@ lFail  = label "f"
 lTol   = label "tol"
 
 concepts :: [ConceptChunk]
-concepts = [glBreakage, lite, annealedGl, fTemperedGl, hStrengthGl, lateral,
+concepts = [glBreakage, lite, annealedGl, laminatedGl, fTemperedGl, hStrengthGl, lateral,
   specDeLoad, longDurLoad, glassWL, shortDurLoad, specA, blastResisGla, blast,
   blastTy, glassGeo, safeMessage, notSafe, bomb, explosion]
 
-aspectRatioCon, glBreakage, lite, glassTy, annealedGl, fTemperedGl, hStrengthGl,
+aspectRatioCon, glBreakage, lite, glassTy, annealedGl, laminatedGl, fTemperedGl, hStrengthGl,
   glTyFac, lateral, load, specDeLoad, loadDurFac, loadResis, longDurLoad, modE, nonFactoredL,
   glassWL, shortDurLoad, loadShareFac, probBreak, specA, blastResisGla, eqTNTChar,
   sD, blast, blastTy, glassGeo, capacity, demandq, safeMessage, notSafe, bomb,
@@ -342,6 +342,10 @@ fTemperedGl   = cc' fullyT
   S "been subjected to a special heat treatment process where the residual",
   S "surface compression is not less than 69 MPa (10 000 psi) or the edge",
   S "compression not less than 67 MPa (9700 psi), as defined in", refS astm2012])
+laminatedGl   = cc' lGlass
+  (foldlSent_ [S "glass composed of two or more plies bonded together with an interlayer",
+  S "to improve strength and safety characteristics, particularly for blast resistant",
+  S "applications"])
 glassGeo      = dccWDS "glassGeo"    (cnIES "glass geometry")
   (S "the glass geometry based inputs include the dimensions of the" +:+
     foldlList Comma List [phrase glaPlane, phrase glassTy, phrase responseTy])

code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs

@@ -6,10 +6,12 @@ import Language.Drasil
 import Drasil.Metadata (dataDefn)
 import Drasil.SRSDocument
 import Drasil.Generator (cdb)
-import qualified Drasil.DocLang.SRS as SRS (inModel)
+import Drasil.DocLang (inReq, inReqDesc, mkInputPropsTable)
+import qualified Drasil.DocLang.SRS as SRS (inModel, sectionReferences)
 import qualified Language.Drasil.Sentence.Combinators as S
 import Drasil.System (SystemKind(Specification), mkSystem, systemdb)
 
+import Data.Drasil.Concepts.Documentation (input_, value)
 import Data.Drasil.Concepts.Math (mathcon', ode)
 import Data.Drasil.ExternalLibraries.ODELibraries
        (apacheODESymbols, odeintSymbols, osloSymbols,
@@ -90,7 +92,7 @@ mkSRS
                  ShowDerivation,
                Constraints EmptyS inputsUC]],
 
-     ReqrmntSec $ ReqsProg [FReqsSub EmptyS [], NonFReqsSub], LCsSec,
+     ReqrmntSec $ ReqsProg [FReqsSub inputValuesDescription [], NonFReqsSub], LCsSec,
      TraceabilitySec $ TraceabilityProg $ traceMatStandard si, Bibliography]
 
 si :: System
@@ -146,13 +148,13 @@ symbMap = cdb (map dqdWr physicscon ++ symbolsAll ++ [dqdWr mass, dqdWr posInf,
   genDefns
   theoreticalModels
   conceptInstances
-  labelledContent
+  labelledContentWithInputs
   allRefs
   citations
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref labelledContentWithInputs
 
 abbreviationsList  :: [IdeaDict]
 abbreviationsList  =
@@ -161,8 +163,23 @@ abbreviationsList  =
   -- QuantityDicts
   map nw symbolsAll
 
+labelledContentWithInputs :: [LabelledContent]
+labelledContentWithInputs = inputValuesTable : labelledContent
+
+inputValuesTable :: LabelledContent
+inputValuesTable = mkInputPropsTable inputs
+
+inputValuesDescription :: Sentence
+inputValuesDescription = S "the tunable controller parameters"
+
+inputValuesSentence :: Sentence
+inputValuesSentence = inReqDesc inputValuesTable inputValuesDescription
+
+inputValuesRequirement :: ConceptInstance
+inputValuesRequirement = inReq inputValuesSentence
+
 conceptInstances :: [ConceptInstance]
-conceptInstances = assumptions ++ goals ++ funcReqs ++ nonfuncReqs ++ likelyChgs
+conceptInstances = inputValuesRequirement : (assumptions ++ goals ++ funcReqs ++ nonfuncReqs ++ likelyChgs)
 
 stdFields :: Fields
 stdFields