reasonable value improvements

code/drasil-docLang/Drasil/DocDecl.hs

@@ -78,7 +78,7 @@ data SCSSub where
  -- | Instance models.
  IMs :: [Sentence] -> Fields -> DL.DerivationDisplay -> SCSSub
  -- | Constraints.
- Constraints :: (HasUncertainty c, Quantity c, Constrained c, HasReasVal c, MayHaveUnit c) => Sentence -> [c] -> SCSSub
+ Constraints :: (HasUncertainty c, Quantity c, Constrained c, HasReasVal c, MayHaveReasVal c, MayHaveUnit c) => Sentence -> [c] -> SCSSub
  -- | Properties of a correct solution.
  CorrSolnPpties :: (Quantity c, Constrained c) => [c] -> [Contents] -> SCSSub
 

code/drasil-docLang/Drasil/DocumentLanguage/Core.hs

@@ -181,7 +181,7 @@ data SCSSub where
  -- | Instance Models.
  IMs :: [Sentence] -> Fields -> [InstanceModel] -> DerivationDisplay -> SCSSub
  -- | Constraints.
- Constraints :: (HasUncertainty c, Quantity c, Constrained c, HasReasVal c, MayHaveUnit c) => Sentence -> [c] -> SCSSub 
+ Constraints :: (HasUncertainty c, Quantity c, Constrained c, HasReasVal c, MayHaveReasVal c, MayHaveUnit c) => Sentence -> [c] -> SCSSub 
  -- Sentence -> [LabelledContent] Fields -> [UncertainWrapper] -> [ConstrainedChunk] -> SCSSub --FIXME: temporary definition?
  --FIXME: Work in Progress ^
  -- | Properties of a correct solution.

code/drasil-docLang/Drasil/Sections/SpecificSystemDescription.hs

@@ -18,7 +18,6 @@ module Drasil.Sections.SpecificSystemDescription
 import Language.Drasil hiding (variable)
 import Utils.Drasil
 import qualified Utils.Drasil.Sentence as S
-
 import Data.Drasil.Concepts.Documentation (assumption, column, constraint, corSol,
  datum, datumConstraint, inDatumConstraint, outDatumConstraint, definition, element, general, goalStmt, information,
  input_, limitation, model, output_, physical, physicalConstraint, physicalSystem,
@@ -157,7 +156,7 @@ inModelIntro r1 r2 r3 r4 = foldlSP [S "This", phrase section_,
  makeRef2S r4]
 
 -- | Constructor for Data Constraints section. Takes a trailing 'Sentence' (use 'EmptyS' if none) and data constraints.
-datConF :: (HasUncertainty c, Quantity c, Constrained c, HasReasVal c, MayHaveUnit c) => 
+datConF :: (HasUncertainty c, Quantity c, Constrained c, MayHaveReasVal c, MayHaveUnit c) => 
  Sentence -> [c] -> Section
 datConF _ [] = SRS.datCon [mkParagraph (S "There are no" +:+. plural datumConstraint)] []
 datConF t c = SRS.datCon [dataConstraintParagraph t, LlC $ inDataConstTbl c] []
@@ -210,7 +209,7 @@ mkDataConstraintTable col ref lab = llcc (makeTabRef ref) $ uncurry Table
  (mkTableFromColumns col) lab True
 
 -- | Creates the input Data Constraints Table.
-inDataConstTbl :: (HasUncertainty c, Quantity c, Constrained c, HasReasVal c, MayHaveUnit c) => 
+inDataConstTbl :: (HasUncertainty c, Quantity c, Constrained c, MayHaveReasVal c, MayHaveUnit c) => 
  [c] -> LabelledContent
 inDataConstTbl qlst = mkDataConstraintTable [(S "Var", map ch $ sortBySymbol qlst),
  (titleize' physicalConstraint, map fmtPhys $ sortBySymbol qlst),
@@ -219,7 +218,7 @@ inDataConstTbl qlst = mkDataConstraintTable [(S "Var", map ch $ sortBySymbol qls
  (short typUnc, map typUncr $ sortBySymbol qlst)] (inDatumConstraint ^. uid) $
  titleize' inDatumConstraint
  where
- getRVal c = fromMaybe (error $ "getRVal found no Expr for " ++ (c ^. uid)) (c ^. reasVal)
+ getRVal c = fromMaybe (error $ "getRVal found no Expr for " ++ (c ^. uid)) (maybeReasVal c)
 
 -- | Creates the output Data Constraints Table.
 outDataConstTbl :: (Quantity c, Constrained c) => [c] -> LabelledContent

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

@@ -5,14 +5,11 @@ import Language.Drasil.Display (Symbol(..))
 import Language.Drasil.ShortHands
 import Utils.Drasil
 import Utils.Drasil.Concepts
-
 import Prelude hiding (log)
-
 import Data.Drasil.Concepts.Math (xComp, yComp, zComp)
 import Data.Drasil.Constraints (gtZeroConstr, probConstr)
 import Data.Drasil.Quantities.Physics (subMax, subMin, subX, subY, subZ)
 import Data.Drasil.SI_Units (kilogram, metre, millimetre, pascal, second)
-
 import Drasil.GlassBR.Concepts (aR, annealed, fullyT, glaPlane, glassTypeFac, 
  heatS, iGlass, lGlass, lResistance, lShareFac, loadDurFactor, nFL, responseTy, 
  stdOffDist)
@@ -32,20 +29,20 @@ modElas = uc' "modElas" (nounPhraseSP "modulus of elasticity of glass")
 
 {--}
 
-constrained :: [ConstrainedChunk]
+constrained :: [ConstrReasQDef]
 constrained = map cnstrw inputDataConstraints ++ 
  [cnstrw probBr, cnstrw probFail, cnstrw stressDistFac] 
 
 plateLen, plateWidth, aspectRatio, charWeight, standOffDist :: UncertQ
 pbTol, tNT :: UncertainChunk
-nomThick :: ConstrainedChunk
+nomThick :: ConstrReasQDef
 glassTypeCon :: ConstrConcept
 
 {--}
 
 inputs :: [QuantityDict]
 inputs = map qw inputsWUnitsUncrtn ++ map qw inputsWUncrtn ++ 
- map qw inputsNoUncrtn ++ map qw sdVector
+ inputsNoUncrtn ++ map qw sdVector
 
 --inputs with units and uncertainties
 inputsWUnitsUncrtn :: [UncertQ]
@@ -64,8 +61,8 @@ derivedInsWUncrtn :: [UncertQ]
 derivedInsWUncrtn = [aspectRatio]
 
 --inputs with no uncertainties
-inputsNoUncrtn :: [ConstrainedChunk]
-inputsNoUncrtn = [cnstrw glassTypeCon, nomThick]
+inputsNoUncrtn ::[QuantityDict]
+inputsNoUncrtn = [qw glassTypeCon, qw nomThick]
 
 inputDataConstraints :: [UncertainChunk]
 inputDataConstraints = map uncrtnw inputsWUnitsUncrtn ++ 
@@ -105,7 +102,7 @@ standOffDist = uq (constrained' (dqd sD (variable "SD") Real metre)
  [ gtZeroConstr,
  sfwrc $ Bounded (Inc, sy sdMin) (Inc, sy sdMax)] (exactDbl 45)) defaultUncrt
 
-nomThick = cuc "nomThick" 
+nomThick = constrReasQD "nomThick" 
  (nounPhraseSent $ S "nominal thickness" +:+ displayDblConstrntsAsSet 
  nomThick nominalThicknesses)
  lT millimetre {-Discrete nominalThicknesses, but not implemented-} Rational 
@@ -122,21 +119,21 @@ outputs = map qw [isSafePb, isSafeLR] ++ map qw [probBr] ++ map qw [stressDistFa
 tmSymbols :: [QuantityDict]
 tmSymbols = map qw [probFail, pbTolfail] ++ map qw [isSafeProb, isSafeLoad]
 
-probBr, probFail, pbTolfail, stressDistFac :: ConstrainedChunk
-probBr = cvc "probBr" (nounPhraseSP "probability of breakage")
+probBr, probFail, pbTolfail, stressDistFac :: ConstrReasQDef
+probBr = constrReasQDNU "probBr" (nounPhraseSP "probability of breakage")
  (sub cP lBreak) Rational
- [probConstr] (Just $ dbl 0.4)
+ [probConstr] (dbl 0.4)
 
-stressDistFac = cvc "stressDistFac" (nounPhraseSP "stress distribution factor (Function)") 
- cJ Real [physc $ Bounded (Inc, sy stressDistFacMin) (Inc, sy stressDistFacMax)] (Just $ exactDbl 15)
+stressDistFac = constrReasQDNU "stressDistFac" (nounPhraseSP "stress distribution factor (Function)") 
+ cJ Real [physc $ Bounded (Inc, sy stressDistFacMin) (Inc, sy stressDistFacMax)] (exactDbl 15)
 
-probFail = cvc "probFail" (nounPhraseSP "probability of failure")
+probFail = constrReasQDNU "probFail" (nounPhraseSP "probability of failure")
  (sub cP lFail) Rational
- [probConstr] (Just $ dbl 0.4)
+ [probConstr] (dbl 0.4)
 
-pbTolfail = cvc "pbTolfail" (nounPhraseSP "tolerable probability of failure") 
+pbTolfail = constrReasQDNU "pbTolfail" (nounPhraseSP "tolerable probability of failure") 
  (sub cP (Concat [lFail, lTol])) Real
- [probConstr] (Just $ dbl 0.008) 
+ [probConstr] (dbl 0.008) 
 
 
  --FIXME: no typical value!

code/drasil-lang/Language/Drasil.hs

@@ -41,6 +41,7 @@ module Language.Drasil (
  , HasUnitSymbol(usymb)
  , HasReference(getReferences)
  , HasReasVal(reasVal)
+ , MayHaveReasVal(maybeReasVal)
  , HasDerivation(derivations)
  , Idea(getA)
  , Definition(defn)
@@ -70,9 +71,9 @@ module Language.Drasil (
  , physc, sfwrc, enumc , isPhysC, isSfwrC
  , Constraint(..), ConstraintReason(..)
  -- Chunk.Constrained
- , ConstrainedChunk(..), ConstrConcept(..)
+ , ConstrainedChunk(..), ConstrConcept(..), ReasonableValueQDef(..), ConstrainedQDef(..), ConstrReasQDef(..)
  , cuc, cvc, constrained', cuc', cuc'', constrainedNRV'
- , cnstrw, cnstrw'
+ , cnstrw, cnstrw', constrReasQD, constrReasQDNU
  -- Chunk.Eq
  , QDefinition, fromEqn, fromEqn', fromEqnSt, fromEqnSt', equat
  , mkQDefSt, mkQuantDef, mkQuantDef', ec
@@ -225,7 +226,7 @@ import Language.Drasil.Classes.Core2 (HasShortName(shortname))
 import Language.Drasil.Classes (NamedIdea(term), Idea(getA),
  Definition(defn), ConceptDomain(cdom), Concept, HasUnitSymbol(usymb),
  IsUnit(getUnits), CommonIdea(abrv), HasAdditionalNotes(getNotes), Constrained(constraints), 
- HasReasVal(reasVal), HasDerivation(derivations), 
+ HasReasVal(reasVal), MayHaveReasVal(maybeReasVal), HasDerivation(derivations), 
  HasReference(getReferences), HasSpace(typ),
  DefiningExpr(defnExpr), Quantity, HasUncertainty(unc), Callable, 
  IsArgumentName, Display(..))