Removed deprecated note from FR1 in GlassBR; closes #877

JacquesCarette · May 1, 2019 · c510e42 · c510e42
1 parent f8fbd05
commit c510e42
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/code/drasil-example/Drasil/GlassBR/Requirements.hs b/code/drasil-example/Drasil/GlassBR/Requirements.hs
@@ -19,7 +19,6 @@ import Data.Drasil.Concepts.Software (errMsg)
 
 import Data.Drasil.SentenceStructures (FoldType(List), SepType(Comma), andThe, 
   foldlList, foldlSent, foldlSent_, follows, ofThe, sAnd, sOf)
-import Data.Drasil.SI_Units (metre, millimetre)
 import Data.Drasil.Utils (bulletFlat)
 
 import Drasil.GlassBR.Assumptions (assumpSV, assumpGL, assumptionConstants)
@@ -64,12 +63,10 @@ inputGlassPropsDesc, checkInputWithDataConsDesc, outputValsAndKnownQuantsDesc ::
 checkGlassSafetyDesc :: NamedChunk -> Sentence
 
 inputGlassPropsDesc = foldlSent [at_start input_, S "the", plural quantity, S "from",
-  makeRef2S inputGlassPropsTable `sC` S "which define the" +:+. foldlList Comma List
+  makeRef2S inputGlassPropsTable `sC` S "which define the" +:+ foldlList Comma List
   [phrase glass +:+ plural dimension, (glassTy ^. defn), S "tolerable" +:+
   phrase probability `sOf` phrase failure, (plural characteristic `ofThe` 
-  phrase blast)] +: S "Note", ch plate_len `sAnd` ch plate_width,
-  S "will be input in terms of", plural millimetre `sAnd`
-  S "will be converted to the equivalent value in", plural metre]
+  phrase blast)]]
 
 inputGlassPropsTable :: LabelledContent
 inputGlassPropsTable = llcc (makeTabRef "InputGlassPropsReqInputs") $ 

diff --git a/code/drasil-example/drasil-example.cabal b/code/drasil-example/drasil-example.cabal
@@ -1,5 +1,5 @@
 Name:		drasil-example
-Version:	0.1.19
+Version:	0.1.20
 Cabal-Version:  >= 1.18
 Author:		Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith
 build-type:     Simple

diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex
@@ -1025,7 +1025,7 @@ \subsection{Functional Requirements}
 \label{Sec:FRs}
 The following section provides the functional requirements, the business tasks that the software is expected to complete.
 \begin{itemize}
-\item[Input-Glass-Props:\phantomsection\label{inputGlassProps}]Input the quantities from \hyperref[Table:InputGlassPropsReqInputs]{Table:InputGlassPropsReqInputs}, which define the glass dimensions, type of glass, tolerable probability of failure, and the characteristics of the blast. Note: $a$ and $b$ will be input in terms of millimetres and will be converted to the equivalent value in metres.
+\item[Input-Glass-Props:\phantomsection\label{inputGlassProps}]Input the quantities from \hyperref[Table:InputGlassPropsReqInputs]{Table:InputGlassPropsReqInputs}, which define the glass dimensions, type of glass, tolerable probability of failure, and the characteristics of the blast.
 \item[System-Set-Values-Following-Assumptions:\phantomsection\label{sysSetValsFollowingAssumps}]The system shall set the known values as follows:
                                                                                                 \begin{itemize}
                                                                                                 \item{$m$, $k$, $E$, and ${t_{d}}$ following \hyperref[assumpSV]{A: standardValues}}

diff --git a/code/stable/glassbr/Website/GlassBR_SRS.html b/code/stable/glassbr/Website/GlassBR_SRS.html
@@ -3328,7 +3328,7 @@ <h2>
 <div class="list">
 <p>
 <div id="inputGlassProps">
-Input-Glass-Props: Input the quantities from <a href=#Table:InputGlassPropsReqInputs>Table:InputGlassPropsReqInputs</a>, which define the glass dimensions, type of glass, tolerable probability of failure, and the characteristics of the blast. Note: <em>a</em> and <em>b</em> will be input in terms of millimetres and will be converted to the equivalent value in metres.
+Input-Glass-Props: Input the quantities from <a href=#Table:InputGlassPropsReqInputs>Table:InputGlassPropsReqInputs</a>, which define the glass dimensions, type of glass, tolerable probability of failure, and the characteristics of the blast.
 </div>
 </p>
 <p>