From e0f30e483bf3247a47d25ad64fa599ec666a14bd Mon Sep 17 00:00:00 2001 From: Jacques Carette Date: Wed, 1 Aug 2018 15:41:49 -0400 Subject: [PATCH] Fix the symptom of #891. It does not fix the issue of ExprRelat itself, but may result in more relToQD being removed, so that the issue may become less important. --- code/drasil-example/Drasil/GlassBR/Body.hs | 4 ++-- code/drasil-example/Drasil/GlassBR/TMods.hs | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/drasil-example/Drasil/GlassBR/Body.hs b/code/drasil-example/Drasil/GlassBR/Body.hs index 0f25061e0f..9ba528d6ed 100644 --- a/code/drasil-example/Drasil/GlassBR/Body.hs +++ b/code/drasil-example/Drasil/GlassBR/Body.hs @@ -62,7 +62,7 @@ import Drasil.GlassBR.DataDefs (aspRat, dataDefns, gbQDefns, hFromt, strDisFac, import Drasil.GlassBR.ModuleDefs (allMods) import Drasil.GlassBR.References (rbrtsn2012) import Drasil.GlassBR.Symbols (this_symbols) -import Drasil.GlassBR.TMods (gbrTMods, pbIsSafe, lrIsSafe, tModels, lrSafetyReq, pbSafetyReq) +import Drasil.GlassBR.TMods (gbrTMods, pbIsSafe, lrIsSafe, lrSafetyReq, pbSafetyReq) import Drasil.GlassBR.IMods (probOfBreak, calofCapacity, calofDemand, gbrIMods) @@ -176,7 +176,7 @@ glassSystInfo = SI { _quants = this_symbols, _concepts = [] :: [DefinedQuantityDict], _definitions = (map (relToQD gbSymbMap) gbrIMods) ++ - --(map (relToQD gbSymbMap) tModels{-gbrTMods-}) ++ --FIXME: #891 + (concatMap (^. defined_quant) gbrTMods) ++ [wtntWithEqn, sdWithEqn], -- wtntWithEqn is defined in Unitals but only appears -- in the description of the Calculation of Demand instance model; -- should this be included as a Data Definition? diff --git a/code/drasil-example/Drasil/GlassBR/TMods.hs b/code/drasil-example/Drasil/GlassBR/TMods.hs index 402b334333..0d18c6c5c0 100644 --- a/code/drasil-example/Drasil/GlassBR/TMods.hs +++ b/code/drasil-example/Drasil/GlassBR/TMods.hs @@ -1,4 +1,4 @@ -module Drasil.GlassBR.TMods (gbrTMods, tModels, pbSafetyReq, lrSafetyReq, pbIsSafe, lrIsSafe) where +module Drasil.GlassBR.TMods (gbrTMods, pbSafetyReq, lrSafetyReq, pbIsSafe, lrIsSafe) where import Drasil.GlassBR.Unitals (demand, demandq, is_safePb, is_safeLR, lRe, pb_tol, prob_br) @@ -12,10 +12,6 @@ import Data.Drasil.SentenceStructures (foldlSent, isThe, sAnd) {--} ---FIXME: should be removed with closure of #891 -tModels :: [RelationConcept] -tModels = [pbSafetyReq, lrSafetyReq] - gbrTMods :: [TheoryModel] gbrTMods = [pbIsSafe, lrIsSafe]