Switch all case studies over to using the System smart constructor.

balacij · balacij · commit a3a3591ae089 · 2025-07-23T16:46:35.000-04:00
diff --git a/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs b/code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs
@@ -46,7 +46,7 @@ import Data.Drasil.ExternalLibraries.ODELibraries (scipyODESymbols,
 import Language.Drasil.Code (quantvar)
 import Drasil.DblPend.ODEs (dblPenODEInfo)
 
-import System.Drasil (SystemKind(Specification))
+import System.Drasil (SystemKind(Specification), mkSystem)
 
 srs :: Document
 srs = mkDoc mkSRS (S.forGen titleize phrase) si
@@ -105,26 +105,14 @@ mkSRS = [TableOfContents, -- This creates the Table of Contents
   ]
 
 si :: System
-si = SI {
-  _sys          = progName, 
-  _kind         = Specification,
-  _authors      = [dong],
-  _purpose      = [purp],
-  _background   = [background],
-  _motivation   = [motivation],
-  _scope        = [scope],
-  _quants       = symbolsAll,
-  _theoryModels = tMods,
-  _genDefns     = genDefns,
-  _dataDefns    = dataDefs,
-  _instModels   = iMods,
-  _configFiles  = [],
-  _inputs       = inputs,
-  _outputs      = outputs,
-  _constraints  = inConstraints,
-  _constants    = constants,
-  _systemdb     = symbMap
-}
+si = mkSystem progName Specification [dong]
+  [purp] [background] [scope] [motivation]
+  symbolsAll
+  tMods genDefns dataDefs iMods
+  []
+  inputs outputs inConstraints
+  constants
+  symbMap
 
 purp :: Sentence
 purp = foldlSent_ [S "predict the", phrase motion `S.ofA` S "double", phrase pendulum]
diff --git a/code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Body.hs b/code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Body.hs
@@ -42,7 +42,7 @@ import Drasil.GamePhysics.Unitals (symbolsAll, outputConstraints,
   inputSymbols, outputSymbols, inputConstraints, defSymbols)
 import Drasil.GamePhysics.GenDefs (generalDefns)
 
-import System.Drasil (SystemKind(Specification))
+import System.Drasil (SystemKind(Specification), mkSystem)
 
 srs :: Document
 srs = mkDoc mkSRS (S.forGen titleize short) si
@@ -96,30 +96,16 @@ mkSRS = [TableOfContents,
       where tableOfSymbols = [TSPurpose, TypogConvention[Vector Bold], SymbOrder, VectorUnits]
 
 si :: System
-si = SI {
-  _sys          = progName,
-  _kind         = Specification,
-  _authors      = [alex, luthfi, olu],
-  _purpose      = [purp],
-  _background   = [],
-  _motivation   = [],
-  _scope        = [],
+si = mkSystem progName Specification [alex, luthfi, olu]
+  [purp] [] [] [] ([] :: [QuantityDict])
   -- FIXME: The _quants field should be filled in with all the symbols, however
   -- #1658 is why this is empty, otherwise we end up with unused (and probably
   -- should be removed) symbols. But that's for another time. This is "fine"
   -- because _quants are only used relative to #1658.
-  _quants       = [] :: [QuantityDict],
-  _theoryModels = tMods,
-  _genDefns     = generalDefns,
-  _instModels   = iMods,
-  _dataDefns    = dataDefs,
-  _configFiles  = [],
-  _inputs       = inputSymbols,
-  _outputs      = outputSymbols, 
-  _constraints  = inputConstraints,
-  _constants    = [],
-  _systemdb     = symbMap
-}
+  tMods generalDefns dataDefs iMods
+  []
+  inputSymbols outputSymbols inputConstraints []
+  symbMap
 
 purp :: Sentence
 purp = foldlSent_ [S "simulate", short twoD, phrase CP.rigidBody,
diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs
@@ -47,7 +47,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 System.Drasil (SystemKind(Specification))
+import System.Drasil (SystemKind(Specification), mkSystem)
 
 srs :: Document
 srs = mkDoc mkSRS (S.forGen titleize phrase) si
@@ -59,27 +59,13 @@ printSetting :: PrintingInformation
 printSetting = piSys fullSI Equational defaultConfiguration
 
 si :: System
-si = SI {
-  _sys          = progName,
-  _kind         = Specification,
-  _authors      = [nikitha, spencerSmith],
-  _purpose      = [purp],
-  _background   = [background],
-  _motivation   = [],
-  _scope        = [scope],
-  _quants       = symbolsForSymbolTable,
-  _theoryModels = tMods,
-  _genDefns     = [],
-  _instModels   = iMods,
-  _dataDefns    = GB.dataDefs,
-  _configFiles  = configFp,
-  _inputs       = inputs,
-  _outputs      = outputs,
-  _constraints  = constrained,
-  _constants    = constants,
-  _systemdb     = symbMap
-}
-  --FIXME: All named ideas, not just acronyms.
+si = mkSystem progName Specification
+  [nikitha, spencerSmith] [purp] [background] [scope] []
+  symbolsForSymbolTable
+  tMods [] GB.dataDefs iMods
+  configFp
+  inputs outputs constrained constants
+  symbMap
 
 mkSRS :: SRSDecl
 mkSRS = [TableOfContents,
diff --git a/code/drasil-example/hghc/lib/Drasil/HGHC/Body.hs b/code/drasil-example/hghc/lib/Drasil/HGHC/Body.hs
@@ -1,20 +1,19 @@
 module Drasil.HGHC.Body (srs, si, symbMap, printSetting, fullSI) where
 
+import System.Drasil (mkSystem, SystemKind(Specification))
 import Language.Drasil hiding (Manual) -- Citation name conflict. FIXME: Move to different namespace
 import Drasil.SRSDocument
 import qualified Language.Drasil.Sentence.Combinators as S
 
-import Drasil.HGHC.HeatTransfer (fp, dataDefs, htInputs, htOutputs, 
+import Drasil.HGHC.HeatTransfer (fp, dataDefs, htInputs, htOutputs,
     nuclearPhys, symbols)
 import Drasil.HGHC.MetaConcepts (progName)
 
 import Data.Drasil.SI_Units (siUnits)
 import Data.Drasil.People (spencerSmith)
 import Data.Drasil.Concepts.Documentation (doccon, doccon')
 import Data.Drasil.Concepts.Math (mathcon)
-import Data.Drasil.Concepts.Thermodynamics as CT (heatTrans)  
- 
-import System.Drasil (SystemKind(Specification))
+import Data.Drasil.Concepts.Thermodynamics as CT (heatTrans)
 
 srs :: Document
 srs = mkDoc mkSRS S.forT si
@@ -26,27 +25,15 @@ printSetting :: PrintingInformation
 printSetting = piSys fullSI Equational defaultConfiguration
 
 si :: System
-si = SI {
-  _sys          = progName,
-  _kind         = Specification,
-  _authors      = [spencerSmith],
-  _quants       = symbols,
-  _purpose      = [purp],
-  _background   = [],
-  _motivation   = [],
-  _scope        = [],
-  _theoryModels = [],
-  _genDefns     = [],
-  _instModels   = [],
-  _dataDefns    = dataDefs,
-  _configFiles  = [],
-  _inputs       = htInputs,
-  _outputs      = htOutputs,
-  _constraints  = [] :: [ConstrainedChunk],
-  _constants    = [],
-  _systemdb     = symbMap
-}
-  
+si = mkSystem
+  progName Specification [spencerSmith]
+  [purp] [] [] []
+  symbols
+  [] [] dataDefs [] []
+  htInputs htOutputs ([] :: [ConstrConcept]) []
+  symbMap
+
+
 mkSRS :: SRSDecl
 mkSRS = [TableOfContents,
     RefSec $
@@ -73,4 +60,3 @@ ideaDicts =
 symbMap :: ChunkDB
 symbMap = cdb symbols ideaDicts mathcon
   siUnits dataDefs [] [] [] [] [] [] []
-
diff --git a/code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs b/code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs
@@ -41,7 +41,7 @@ import Drasil.PDController.Unitals (symbols, inputs, outputs, inputsUC,
 import Drasil.PDController.ODEs (pidODEInfo)
 import Language.Drasil.Code (quantvar)
 
-import System.Drasil (SystemKind(Specification))
+import System.Drasil (SystemKind(Specification), mkSystem)
 
 naveen :: Person
 naveen = person "Naveen Ganesh" "Muralidharan"
@@ -97,26 +97,14 @@ mkSRS
      TraceabilitySec $ TraceabilityProg $ traceMatStandard si, Bibliography]
 
 si :: System
-si = SI {
-  _sys = progName,
-  _kind = Specification,
-  _authors = [naveen],
-  _purpose = [purp],
-  _background  = [background],
-  _motivation  = [motivation],
-  _scope       = [scope],
-  _quants = symbolsAll,
-  _theoryModels = theoreticalModels,
-  _genDefns = genDefns,
-  _instModels = instanceModels,
-  _dataDefns = dataDefinitions,
-  _configFiles = [],
-  _inputs = inputs,
-  _outputs = outputs,
-  _constraints = map cnstrw inpConstrained,
-  _constants = pidConstants,
-  _systemdb = symbMap
-}
+si = mkSystem
+  progName Specification [naveen]
+  [purp] [background] [scope] [motivation]
+  symbolsAll
+  theoreticalModels genDefns dataDefinitions instanceModels
+  []
+  inputs outputs (map cnstrw inpConstrained)
+  pidConstants symbMap
 
 purp :: Sentence
 purp = foldlSent_ [S "provide a model" `S.ofA` phrase pidC,
diff --git a/code/drasil-example/projectile/lib/Drasil/Projectile/Lesson/Body.hs b/code/drasil-example/projectile/lib/Drasil/Projectile/Lesson/Body.hs
@@ -42,26 +42,13 @@ mkNB = [
   ]
 
 si :: System
-si = SI {
-  _sys          = projectileMotion,
-  _kind         = Notebook,
-  _authors      = [spencerSmith],
-  _purpose      = [],
-  _background   = [], 
-  _motivation   = [],
-  _scope        = [],
-  _quants       = [] :: [QuantityDict],
-  _theoryModels = [],
-  _genDefns     = [],
-  _instModels   = [],
-  _dataDefns    = [],
-  _configFiles  = [],
-  _inputs       = [] :: [QuantityDict],
-  _outputs      = [] :: [QuantityDict],
-  _constraints  = [] :: [ConstrainedChunk],
-  _constants    = [] :: [ConstQDef],
-  _systemdb     = symbMap
-}
+si = mkSystem
+  projectileMotion Notebook [spencerSmith]
+  [] [] [] []
+  ([] :: [QuantityDict])
+  [] [] [] [] []
+  ([] :: [QuantityDict]) ([] :: [QuantityDict]) ([] :: [ConstrConcept]) []
+  symbMap
 
 symbMap :: ChunkDB
 symbMap = cdb (map qw physicscon ++ symbols) (nw projectileMotion : map nw doccon ++ 
diff --git a/code/drasil-example/sglpend/lib/Drasil/SglPend/Body.hs b/code/drasil-example/sglpend/lib/Drasil/SglPend/Body.hs
@@ -42,7 +42,7 @@ import Drasil.SglPend.GenDefs (genDefns)
 import Drasil.SglPend.Unitals (inputs, outputs, inConstraints, outConstraints, symbols)
 import Drasil.SglPend.Requirements (funcReqs)
 
-import System.Drasil (SystemKind(Specification))
+import System.Drasil (SystemKind(Specification), mkSystem)
 
 srs :: Document
 srs = mkDoc mkSRS (S.forGen titleize phrase) si
@@ -101,26 +101,13 @@ mkSRS = [TableOfContents, -- This creates the Table of Contents
   ]
 
 si :: System
-si = SI {
-  _sys          = progName, 
-  _kind         = Specification,
-  _authors      = [olu],
-  _purpose      = [purp],
-  _background   = [],
-  _scope        = [],
-  _motivation   = [],
-  _quants       = symbols,
-  _theoryModels = tMods,
-  _genDefns     = genDefns,
-  _instModels   = iMods,
-  _dataDefns    = dataDefs,
-  _configFiles  = [],
-  _inputs       = inputs,
-  _outputs      = outputs,
-  _constraints  = inConstraints,
-  _constants    = [] :: [ConstQDef],
-  _systemdb     = symbMap
-}
+si = mkSystem progName Specification [olu]
+  [purp] [] [] []
+  symbols
+  tMods genDefns dataDefs iMods
+  []
+  inputs outputs inConstraints []
+  symbMap
 
 purp :: Sentence
 purp = foldlSent_ [S "predict the", phrase motion `S.ofA` S "single", phrase pendulum]
diff --git a/code/drasil-example/ssp/lib/Drasil/SSP/Body.hs b/code/drasil-example/ssp/lib/Drasil/SSP/Body.hs
@@ -1,16 +1,16 @@
 {-# LANGUAGE PostfixOperators #-}
 module Drasil.SSP.Body (srs, si, symbMap, printSetting, fullSI) where
 
+import Prelude hiding (sin, cos, tan)
+
 import Control.Lens ((^.))
 
+import System.Drasil (SystemKind(Specification), mkSystem)
 import Language.Drasil hiding (Verb, number, organization, section, variable)
 import Drasil.SRSDocument
 import qualified Drasil.DocLang.SRS as SRS (inModel, assumpt,
   genDefn, dataDefn, datCon)
 import Theory.Drasil (output)
-
-import Prelude hiding (sin, cos, tan)
-
 import Drasil.Metadata (inModel)
 
 import Language.Drasil.Chunk.Concept.NamedCombinators
@@ -54,8 +54,6 @@ import Drasil.SSP.TMods (tMods)
 import Drasil.SSP.Unitals (constrained, effCohesion, fricAngle, fs, index,
   inputs, inputsWUncrtn, outputs, symbols)
 
-import System.Drasil (SystemKind(Specification))
-
 --Document Setup--
 
 srs :: Document
@@ -71,26 +69,14 @@ resourcePath :: String
 resourcePath = "../../../../datafiles/ssp/"
 
 si :: System
-si = SI {
-  _sys          = progName, 
-  _kind         = Specification,
-  _authors      = [henryFrankis, brooks],
-  _purpose      = [purp],
-  _background   = [],
-  _motivation   = [],
-  _scope        = [],
-  _quants       = symbols,
-  _theoryModels = tMods,
-  _genDefns     = generalDefinitions, 
-  _instModels   = iMods,
-  _dataDefns    = dataDefs,
-  _configFiles  = [],
-  _inputs       = map qw inputs,
-  _outputs      = map qw outputs,
-  _constraints  = constrained,
-  _constants    = [],
-  _systemdb     = symbMap
-}
+si = mkSystem
+  progName Specification [henryFrankis, brooks]
+  [purp] [] [] []
+  symbols
+  tMods generalDefinitions dataDefs iMods
+  []
+  inputs outputs constrained []
+  symbMap
   
 mkSRS :: SRSDecl
 mkSRS = [TableOfContents,
diff --git a/code/drasil-example/swhs/lib/Drasil/SWHS/Body.hs b/code/drasil-example/swhs/lib/Drasil/SWHS/Body.hs
diff --git a/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs b/code/drasil-example/swhsnopcm/lib/Drasil/SWHSNoPCM/Body.hs
diff --git a/code/drasil-example/template/lib/Drasil/Template/Body.hs b/code/drasil-example/template/lib/Drasil/Template/Body.hs
diff --git a/code/drasil-website/lib/Drasil/Website/Body.hs b/code/drasil-website/lib/Drasil/Website/Body.hs
