diff --git a/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs b/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs index 4cfb1163c7e..950367c18a0 100644 --- a/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs +++ b/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs @@ -45,7 +45,7 @@ import Data.Drasil.ExternalLibraries.ODELibraries (scipyODESymbols, osloSymbols, apacheODESymbols, odeintSymbols, odeInfoChunks) import Drasil.DblPend.ODEs (dblPenODEInfo) -import Drasil.System (SystemKind(Specification), mkSystem) +import Drasil.System (SystemKind(RunnableSoftware), mkSystem) srs :: Document srs = mkDoc mkSRS (S.forGen titleize phrase) si @@ -104,7 +104,7 @@ mkSRS = [TableOfContents, -- This creates the Table of Contents ] si :: System -si = mkSystem progName Specification [dong] +si = mkSystem progName RunnableSoftware [dong] [purp] [background] [scope] [motivation] symbolsAll tMods genDefns dataDefs iMods diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs index d2b4cc8ea1c..1b9741703d9 100644 --- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs +++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs @@ -46,7 +46,7 @@ import Drasil.GlassBR.Unitals (blast, blastTy, bomb, explosion, constants, glassTypes, glBreakage, lateralLoad, load, loadTypes, pbTol, probBr, stressDistFac, probBreak, sD, termsWithAccDefn, termsWithDefsOnly, concepts, dataConstraints) -import Drasil.System (SystemKind(Specification), mkSystem) +import Drasil.System (SystemKind(RunnableSoftware), mkSystem) import Data.Drasil.Quantities.PhysicalProperties (physicalquants) srs :: Document @@ -59,7 +59,7 @@ printSetting :: PrintingInformation printSetting = piSys fullSI Equational defaultConfiguration si :: System -si = mkSystem progName Specification +si = mkSystem progName RunnableSoftware [nikitha, spencerSmith] [purp] [background] [scope] [] symbolsForSymbolTable tMods [] GB.dataDefs iMods diff --git a/code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs b/code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs index a495afd8f69..3a3729ff98c 100644 --- a/code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs +++ b/code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs @@ -37,7 +37,7 @@ import Drasil.PDController.Unitals (symbols, inputs, outputs, inputsUC, inpConstrained, pidConstants) import Drasil.PDController.ODEs (pidODEInfo) -import Drasil.System (SystemKind(Specification), mkSystem) +import Drasil.System (SystemKind(RunnableSoftware), mkSystem) naveen :: Person naveen = person "Naveen Ganesh" "Muralidharan" @@ -94,7 +94,7 @@ mkSRS si :: System si = mkSystem - progName Specification [naveen] + progName RunnableSoftware [naveen] [purp] [background] [scope] [motivation] symbolsAll theoreticalModels genDefns dataDefinitions instanceModels diff --git a/code/drasil-example/projectile/lib/Drasil/Projectile/Body.hs b/code/drasil-example/projectile/lib/Drasil/Projectile/Body.hs index 6e4c93eeb3b..0a719aa8ed0 100644 --- a/code/drasil-example/projectile/lib/Drasil/Projectile/Body.hs +++ b/code/drasil-example/projectile/lib/Drasil/Projectile/Body.hs @@ -8,6 +8,8 @@ import Language.Drasil.Chunk.Concept.NamedCombinators import qualified Language.Drasil.NounPhrase.Combinators as NP import qualified Language.Drasil.Sentence.Combinators as S import qualified Drasil.DocLang.SRS as SRS +import Theory.Drasil (TheoryModel) +import Drasil.System (SystemKind(RunnableSoftware), mkSystem) import Data.Drasil.Concepts.Computation (inDatum) import Data.Drasil.Concepts.Documentation (analysis, physics, @@ -45,10 +47,6 @@ import Drasil.Projectile.References (citations) import Drasil.Projectile.Requirements (funcReqs, nonfuncReqs) import Drasil.Projectile.Unitals -import Theory.Drasil (TheoryModel) - -import Drasil.System (SystemKind(Specification), mkSystem) - srs :: Document srs = mkDoc mkSRS (S.forGen titleize phrase) si @@ -130,7 +128,7 @@ projectileExamples = [S "ballistics" +:+ plural problem +:+ sParen (S "missiles" S "etc.")] si :: System -si = mkSystem progName Specification +si = mkSystem progName RunnableSoftware [samCrawford, brooks, spencerSmith] [purp] [background] [scope] [motivation] symbols tMods genDefns dataDefs iMods diff --git a/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs b/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs index 2344a9cfae8..a8e7e9b865b 100644 --- a/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs +++ b/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs @@ -62,7 +62,7 @@ import Drasil.SWHSNoPCM.References (citations) import Drasil.SWHSNoPCM.Unitals (inputs, constrained, unconstrained, specParamValList) -import Drasil.System (SystemKind(Specification), mkSystem) +import Drasil.System (SystemKind(RunnableSoftware), mkSystem) srs :: Document srs = mkDoc mkSRS S.forT si @@ -158,10 +158,10 @@ stdFields = [DefiningEquation, Description Verbose IncludeUnits, Notes, Source, si :: System si = mkSystem - progName Specification [thulasi] + progName RunnableSoftware [thulasi] [purp] [introStartNoPCM] [scope] [motivation] -- FIXME: Everything after (and including) \\ should be removed when - -- #1658 is resolved. Basically, _quants is used here, but + -- #1658 is resolved. Basically, _quants is used here, but -- tau does not appear in the document and thus should not be displayed. ((map dqdWr unconstrained ++ symbolsAll) \\ [dqdWr tau]) tMods genDefs NoPCM.dataDefs NoPCM.iMods @@ -344,7 +344,7 @@ dataConstListOut = [tempW, watE] -- Traceabilty Graphs -- ------------------------ --- Using the SWHS graphs as place holders until ones can be generated for NoPCM +-- Using the SWHS graphs as place holders until ones can be generated for NoPCM ------------------------------------------ --Section 8: SPECIFICATION PARAMETER VALUE