Fill chunk refs

code/drasil-data/lib/Data/Drasil/SI_Units.hs

@@ -7,13 +7,18 @@ import Language.Drasil.ShortHands (cOmega)
 
 -- * Lists of Units
 
+-- Keep fundamentals alphabetical.
 fundamentals :: [UnitDefn]
-fundamentals = [metre, kilogram, second, kelvin, mole, ampere, candela]
+fundamentals = [ampere, candela, kelvin, kilogram, metre, mole, second]
 
+-- Derived units must be inserted after every unit they depend on
+-- so that `insert0` (Database.Drasil.ChunkDB) can resolve their references.
+-- Within each dependency level we keep alphabetical order to make the list easy to audit.
 derived :: [UnitDefn]
-derived = [becquerel, calorie, centigrade, coulomb, farad, gray, henry, hertz, joule,
-  katal, kilopascal, kilowatt, litre, lumen, lux,  millimetre, newton, ohm,
-  pascal, radian, siemens, sievert, steradian, tesla, volt, watt, weber]
+derived = [becquerel, centigrade, coulomb, hertz, joule, katal, litre,
+  millimetre, newton, pascal, radian, steradian, watt, kilowatt, volt, weber,
+  tesla, henry, calorie, gray, sievert, kilopascal, lumen, lux, farad, ohm,
+  siemens]
 
 common :: [UnitDefn]
 common = [s_2, m_2, m_3]

code/drasil-database/lib/Database/Drasil/ChunkDB.hs

@@ -261,8 +261,13 @@ insertAllOutOfOrder12 strtr as bs cs ds es fs gs hs is js lcs rs =
                    fs', gs', hs', is', js']
     calt = concat altogether
 
-    -- Calculate what chunks are depended on (i.e., UID -> Dependants)
-    chDpdts = invert $ M.fromList $ map (\c -> (c ^. uid, S.toList $ chunkRefs c)) calt
+    -- Calculate what chunks are depended on (i.e., UID -> Dependants), but only
+    -- keep dependencies that correspond to chunks we are actually inserting or
+    -- that already exist in the chunk table. References/LabelledContent live in
+    -- separate tables and are handled elsewhere.
+    allowedDeps = S.fromList (M.keys (chunkTable strtr) ++ map (^. uid) calt)
+    chDpdts = invert $ M.fromList $
+      map (\c -> (c ^. uid, S.toList $ S.filter (`S.member` allowedDeps) (chunkRefs c))) calt
 
     -- Insert all incoming chunks with the existing chunk table, asserting that
     -- none of the inserted chunks were already inserted.

code/drasil-example/dblpend/lib/Drasil/DblPend/Body.hs

@@ -150,7 +150,7 @@ symbMap = cdb (map (^. output) iMods ++ symbolsAll) ideaDicts conceptChunks []
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref (labelledContent ++ funcReqsTables)
 
 stdFields :: Fields
 stdFields = [DefiningEquation, Description Verbose IncludeUnits, Notes, Source, RefBy]

code/drasil-example/dblpend/lib/Drasil/DblPend/DataDefs.hs

@@ -9,9 +9,9 @@ import qualified Language.Drasil.Sentence.Combinators as S
 import Theory.Drasil (DataDefinition, ddENoRefs, ddMENoRefs)
 
 import Drasil.DblPend.LabelledContent (figMotion)
-import Drasil.DblPend.Unitals (pendDisAngle_1, pendDisAngle_2, lenRod_1, lenRod_2, xPos_1, yPos_1, xPos_2, yPos_2)
+import Drasil.DblPend.Unitals (forceVec, pendDisAngle_1, pendDisAngle_2, lenRod_1, lenRod_2, xPos_1, yPos_1, xPos_2, yPos_2)
 import Drasil.DblPend.Concepts (horizontalPos, verticalPos)
-import Data.Drasil.Quantities.Physics (velocity, position, time, acceleration, force)
+import Data.Drasil.Quantities.Physics (velocity, position, time, acceleration)
 import Data.Drasil.Quantities.PhysicalProperties (mass)
 
 dataDefs :: [DataDefinition]
@@ -120,7 +120,7 @@ forceGDD :: DataDefinition
 forceGDD = ddENoRefs forceGQD Nothing "forceGDD" []
 
 forceGQD :: SimpleQDef
-forceGQD = mkQuantDef force forceGEqn
+forceGQD = mkQuantDef forceVec forceGEqn
 
 forceGEqn :: PExpr
 forceGEqn = vScale (sy mass) (sy acceleration)

code/drasil-example/dblpend/lib/Drasil/DblPend/References.hs

@@ -2,11 +2,11 @@ module Drasil.DblPend.References (citations, koothoor2013,
   smithEtAl2007, smithLai2005, smithKoothoor2016) where
 
 import Language.Drasil
-import Data.Drasil.Citations (cartesianWiki, accelerationWiki, velocityWiki,
+import Data.Drasil.Citations (accelerationWiki, velocityWiki,
  parnasClements1986, hibbeler2004, koothoor2013, smithEtAl2007, smithLai2005,
  smithKoothoor2016)
 
 citations :: BibRef
-citations = [accelerationWiki, velocityWiki, hibbeler2004, cartesianWiki,
+citations = [accelerationWiki, velocityWiki, hibbeler2004,
              parnasClements1986, koothoor2013, smithEtAl2007, smithLai2005,
              smithKoothoor2016]

code/drasil-example/dblpend/lib/Drasil/DblPend/Unitals.hs

@@ -45,14 +45,14 @@ unitalChunks = [
   lenRod_1, lenRod_2, massObj_1, massObj_2, angularVel_1, angularVel_2,
   xVel_1, xVel_2, yVel_1, yVel_2, xPos_1, xPos_2, yPos_1, yPos_2, xAccel_1,
   yAccel_1, xAccel_2, yAccel_2, angularAccel_1, angularAccel_2, tension_1,
-  tension_2, QPP.mass, QP.force, QP.gravitationalAccel, QP.tension, QP.acceleration,
+  tension_2, QPP.mass, QP.force, forceVec, QP.gravitationalAccel, QP.tension, QP.acceleration,
   QP.time, QP.velocity, QP.position]
 
 lenRod_1, lenRod_2, massObj_1, massObj_2, angularVel_1, angularVel_2,
   pendDisAngle_1, pendDisAngle_2,
   xPos_1, xPos_2, yPos_1, yPos_2, xVel_1, yVel_1, xVel_2, yVel_2, xAccel_1,
   yAccel_1, xAccel_2, yAccel_2,
-  angularAccel_1, angularAccel_2, tension_1, tension_2 :: UnitalChunk
+  angularAccel_1, angularAccel_2, tension_1, tension_2, forceVec :: UnitalChunk
 
 lenRod_1 = uc' "l_1" (len `ofThe` firstRod)
         (D.toSent $ phraseNP (len `the_ofThe` firstRod)) -- Fix me, can have more information
@@ -186,3 +186,8 @@ pendDisAngle = cuc' "pendDisAngle"
   "column vector of displacement of rods with its derivatives"
   lTheta' radian (Vect Real)
   [physRange $ UpFrom (Inc, exactDbl 0)] (exactDbl 0)
+
+forceVec = uc' "forceVec"
+  (nounPhraseSP "force vector")
+  (phrase QP.force `S.ofThe` S "system in vector form")
+  (vec (prime cF)) (Vect Real) newton

code/drasil-example/gamephysics/lib/Drasil/GamePhysics/Body.hs

@@ -156,7 +156,7 @@ abbreviationsList =
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef, pymunk] ++ uriReferences ++ offShelfSolRefs
+allRefs = [externalLinkRef, pymunk] ++ SRS.sectionReferences ++ uriReferences ++ offShelfSolRefs
 
 --FIXME: The SRS has been partly switched over to the new docLang, so some of
 -- the sections below are now redundant. I have not removed them yet, because

code/drasil-example/gamephysics/lib/Drasil/GamePhysics/References.hs

@@ -2,9 +2,9 @@ module Drasil.GamePhysics.References where
 
 import Language.Drasil
 
-import Data.Drasil.Citations (cartesianWiki, koothoor2013,
+import Data.Drasil.Citations (koothoor2013,
   parnasClements1986, smithEtAl2007, smithLai2005, smithKoothoor2016,
-  lineSource, pointSource, dampingSource)
+  dampingSource)
 import Data.Drasil.People (bWaugh, cTitus, dParnas, daAruliah, epWhite, gWilson,
   imMitchell, jBueche, kdHuff, mDavis, mdPlumblet, nChueHong, pWilson, rGuy, shdHaddock,
   wikiAuthors)
@@ -15,7 +15,7 @@ chaslesWiki, jfBeucheIntro, parnas1978, sciComp2013 :: Citation
 citations :: BibRef
 citations = [parnas1978, sciComp2013, chaslesWiki, parnasClements1986,
   koothoor2013, smithEtAl2007, smithLai2005, smithKoothoor2016, jfBeucheIntro,
-  cartesianWiki, lineSource, pointSource, dampingSource]
+  dampingSource]
 
 --FIXME: check for references made within document
 

code/drasil-example/glassbr/lib/Drasil/GlassBR/Assumptions.hs

@@ -5,6 +5,7 @@ module Drasil.GlassBR.Assumptions (assumpGT, assumpGC, assumpES, assumpSV,
 import Language.Drasil hiding (organization)
 import qualified Language.Drasil.Development as D
 import qualified Drasil.DocLang.SRS as SRS (valsOfAuxCons)
+import Control.Lens (view)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.NounPhrase.Combinators as NP
 import qualified Language.Drasil.Sentence.Combinators as S
@@ -68,7 +69,7 @@ standardValuesDesc :: UnitalChunk -> Sentence
 standardValuesDesc mainIdea = foldlSent [D.toSent $ atStartNP' (the value), S "provided in",
   refS $ SRS.valsOfAuxCons ([]::[Contents]) ([]::[Section]), S "are assumed for the", phrase mainIdea,
   sParen (ch mainIdea) `sC` S "and the", plural materialProprty `S.of_`
-  foldlList Comma List (map ch (take 3 assumptionConstants))]
+  foldlList Comma List (map (ch . view defLhs) assumptionConstants)]
 
 glassLiteDesc :: Sentence
 glassLiteDesc = foldlSent [atStart glass, S "under consideration is assumed to be a single",

code/drasil-example/glassbr/lib/Drasil/GlassBR/Body.hs

@@ -10,7 +10,7 @@ import Drasil.Metadata as M (dataDefn, inModel, thModel)
 import Drasil.SRSDocument
 import Drasil.DocLang (auxSpecSent, termDefnF')
 import Drasil.Generator (cdb)
-import qualified Drasil.DocLang.SRS as SRS (reference, assumpt, inModel)
+import qualified Drasil.DocLang.SRS as SRS (reference, assumpt, inModel, sectionReferences)
 import Language.Drasil.Chunk.Concept.NamedCombinators
 import qualified Language.Drasil.Sentence.Combinators as S
 import Drasil.System (SystemKind(Specification), mkSystem)
@@ -114,10 +114,14 @@ background = foldlSent_ [phrase explosion, S "in downtown areas are dangerous fr
 
 ideaDicts :: [IdeaDict]
 ideaDicts =
-  -- IdeaDicts
-  [lateralLoad, materialProprty] ++ con' ++
-  -- CIs
-  map nw [progName, iGlass, lGlass] ++ map nw mathcon'
+  filter (\idc -> (idc ^. uid) `notElem` conceptChunkUIDs) baseIdeaDicts
+  where
+    baseIdeaDicts =
+      -- IdeaDicts
+      [lateralLoad, materialProprty] ++ con' ++
+      -- CIs
+      map nw [progName, iGlass, lGlass] ++ map nw mathcon'
+    conceptChunkUIDs = map (^. uid) conceptChunks
 
 conceptChunks :: [ConceptChunk]
 conceptChunks =
@@ -139,7 +143,7 @@ symbMap = cdb thisSymbols ideaDicts conceptChunks ([] :: [UnitDefn])
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref (funcReqsTables ++ figures)
 
 concIns :: [ConceptInstance]
 concIns = assumptions ++ goals ++ likelyChgs ++ unlikelyChgs ++ funcReqs ++ nonfuncReqs

code/drasil-example/glassbr/lib/Drasil/GlassBR/References.hs

@@ -1,9 +1,12 @@
-module Drasil.GlassBR.References where
+module Drasil.GlassBR.References (
+  citations,
+  astm2009, astm2012, astm2016, beasonEtAl1998
+) where
 
 import Language.Drasil
 
-import Data.Drasil.Citations (campidelli, koothoor2013, smithEtAl2007,
-  smithLai2005, smithKoothoor2016, parnasClements1986)
+import Data.Drasil.Citations (campidelli, koothoor2013,
+  smithEtAl2007, smithLai2005, smithKoothoor2016, parnasClements1986)
 import Data.Drasil.People (jmBracci, tlKohutek, wlBeason)
 
 astm2009, astm2016, astm2012, beasonEtAl1998 :: Citation

code/drasil-example/glassbr/lib/Drasil/GlassBR/Symbols.hs

@@ -1,15 +1,17 @@
 module Drasil.GlassBR.Symbols where
 
-import Language.Drasil (DefinedQuantityDict, dqdWr, cnstrw')
+import Language.Drasil (DefinedQuantityDict, dqdWr, cnstrw', defLhs)
 import Language.Drasil.Code (Mod(Mod), asVC)
 
 import Drasil.GlassBR.ModuleDefs (allMods, implVars)
+import Drasil.GlassBR.Assumptions (assumptionConstants)
 import Drasil.GlassBR.Unitals (specParamVals, modElas,
   tmSymbols, interps, derivedInputDataConstraints, unitless, probBr,
   stressDistFac, nomThick, sdVector, inputsWUnitsUncrtn, inputsWUncrtn,
-  glassTypeCon, unitalSymbols)
+  glassTypeCon, unitalSymbols, loadDur)
 
 import Data.List ((\\))
+import Control.Lens (view)
 
 symbolsForSymbolTable :: [DefinedQuantityDict]
 symbolsForSymbolTable = symbolsForTermTable ++ map dqdWr unitalSymbols ++
@@ -18,8 +20,8 @@ symbolsForSymbolTable = symbolsForTermTable ++ map dqdWr unitalSymbols ++
 
 symbolsForTermTable :: [DefinedQuantityDict]
 symbolsForTermTable = map dqdWr inputsWUnitsUncrtn ++ map dqdWr inputsWUncrtn ++
-  map dqdWr sdVector ++ tmSymbols ++ map dqdWr specParamVals ++
-  [dqdWr modElas] ++ interps
+  map dqdWr sdVector ++ tmSymbols ++ dqdWr loadDur : map (view defLhs) specParamVals ++
+  map (view defLhs) assumptionConstants ++ [dqdWr modElas] ++ interps
 
   -- include all module functions as symbols
 thisSymbols :: [DefinedQuantityDict]

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

@@ -301,11 +301,11 @@ lFail  = label "f"
 lTol   = label "tol"
 
 concepts :: [ConceptChunk]
-concepts = [glBreakage, lite, annealedGl, fTemperedGl, hStrengthGl, lateral,
+concepts = [glBreakage, lite, annealedGl, laminatedGl, fTemperedGl, hStrengthGl, lateral,
   specDeLoad, longDurLoad, glassWL, shortDurLoad, specA, blastResisGla, blast,
   blastTy, glassGeo, safeMessage, notSafe, bomb, explosion]
 
-aspectRatioCon, glBreakage, lite, glassTy, annealedGl, fTemperedGl, hStrengthGl,
+aspectRatioCon, glBreakage, lite, glassTy, annealedGl, laminatedGl, fTemperedGl, hStrengthGl,
   glTyFac, lateral, load, specDeLoad, loadDurFac, loadResis, longDurLoad, modE, nonFactoredL,
   glassWL, shortDurLoad, loadShareFac, probBreak, specA, blastResisGla, eqTNTChar,
   sD, blast, blastTy, glassGeo, capacity, demandq, safeMessage, notSafe, bomb,
@@ -343,6 +343,10 @@ fTemperedGl   = cc' fullyT
   S "been subjected to a special heat treatment process where the residual",
   S "surface compression is not less than 69 MPa (10 000 psi) or the edge",
   S "compression not less than 67 MPa (9700 psi), as defined in", refS astm2012])
+laminatedGl   = cc' lGlass
+  (foldlSent_ [S "glass composed of two or more plies bonded together with an interlayer",
+  S "to improve strength and safety characteristics, particularly for blast resistant",
+  S "applications"])
 glassGeo      = dccWDS "glassGeo"    (cnIES "glass geometry")
   (S "the glass geometry based inputs include the dimensions of the" +:+
     foldlList Comma List [phrase glaPlane, phrase glassTy, phrase responseTy])

code/drasil-example/pdcontroller/lib/Drasil/PDController/Body.hs

@@ -4,7 +4,7 @@ import Language.Drasil
 import Drasil.Metadata (dataDefn)
 import Drasil.SRSDocument
 import Drasil.Generator (cdb)
-import qualified Drasil.DocLang.SRS as SRS (inModel)
+import qualified Drasil.DocLang.SRS as SRS (inModel, sectionReferences)
 import qualified Language.Drasil.Sentence.Combinators as S
 import Drasil.System (SystemKind(Specification), mkSystem)
 
@@ -141,7 +141,7 @@ symbMap = cdb (map dqdWr physicscon ++ symbolsAll ++ [dqdWr mass, dqdWr posInf,
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref (labelledContent ++ funcReqsTables)
 
 abbreviationsList  :: [IdeaDict]
 abbreviationsList  =

code/drasil-example/projectile/lib/Drasil/Projectile/Assumptions.hs

@@ -19,9 +19,10 @@ import Data.Drasil.Concepts.Physics (acceleration, collision, distance, gravity,
 import Drasil.Projectile.Concepts (launcher, projectile, target, projMotion)
 
 assumptions :: [ConceptInstance]
-assumptions = [twoDMotion, cartSyst, yAxisGravity, launchOrigin, targetXAxis,
-  posXDirection, constAccel, accelXZero, accelYGravity, neglectDrag, pointMass,
-  freeFlight, neglectCurv, timeStartZero, gravAccelValue]
+-- Order matters: each assumption appears after those it references so generated SRS links work.
+assumptions = [twoDMotion, neglectCurv, cartSyst, yAxisGravity, accelYGravity,
+  launchOrigin, targetXAxis, posXDirection, neglectDrag, pointMass,
+  freeFlight, accelXZero, constAccel, timeStartZero, gravAccelValue]
 
 twoDMotion, cartSyst, yAxisGravity, launchOrigin, targetXAxis,
   posXDirection, constAccel, accelXZero, accelYGravity, neglectDrag,

code/drasil-example/projectile/lib/Drasil/Projectile/Body.hs

@@ -171,7 +171,7 @@ abbreviationsList  =
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref (labelledContent ++ funcReqsTables)
 
 stdFields :: Fields
 stdFields = [DefiningEquation, Description Verbose IncludeUnits, Notes, Source, RefBy]
@@ -293,4 +293,3 @@ constrained = [flightDur, landPos, launAngle, launSpeed, offset, targPos]
 acronyms :: [CI]
 acronyms = [oneD, twoD, assumption, dataDefn, genDefn, goalStmt, inModel,
   physSyst, requirement, Doc.srs, refBy, refName, thModel, typUnc]
-

code/drasil-example/projectile/lib/Drasil/Projectile/References.hs

@@ -1,11 +1,11 @@
 module Drasil.Projectile.References where
 
 import Language.Drasil
-import Data.Drasil.Citations (cartesianWiki, accelerationWiki, velocityWiki,
+import Data.Drasil.Citations (accelerationWiki, velocityWiki,
  hibbeler2004, parnasClements1986, koothoor2013, smithKoothoor2016, smithEtAl2007,
  smithLai2005)
 
 citations :: BibRef
-citations = [accelerationWiki, velocityWiki, hibbeler2004, cartesianWiki,
+citations = [accelerationWiki, velocityWiki, hibbeler2004,
              parnasClements1986, koothoor2013, smithKoothoor2016, smithEtAl2007,
              smithLai2005]

code/drasil-example/sglpend/lib/Drasil/SglPend/Body.hs

@@ -128,7 +128,7 @@ symbMap = cdb (map (^. output) iMods ++ symbols) ideaDicts conceptChunks []
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef]
+allRefs = externalLinkRef : SRS.sectionReferences ++ map ref (labelledContent ++ funcReqsTables)
 
 concIns :: [ConceptInstance]
 concIns = assumpSingle ++ goals ++ funcReqs ++ nonFuncReqs

code/drasil-example/ssp/lib/Drasil/SSP/Body.hs

@@ -8,7 +8,7 @@ import qualified Language.Drasil.Development as D
 import Drasil.SRSDocument
 import Drasil.Generator (cdb)
 import qualified Drasil.DocLang.SRS as SRS (inModel, assumpt,
-  genDefn, dataDefn, datCon)
+  genDefn, dataDefn, datCon, sectionReferences)
 import Drasil.Metadata (inModel)
 import Drasil.System (SystemKind(Specification), mkSystem)
 
@@ -114,12 +114,15 @@ purp = foldlSent_ [S "evaluate the", phrase fs `S.ofA` phrasePoss slope,
   S "as well as the", phrase intrslce, D.toSent (phraseNP (normForce `and_` shearForce)),
   S "along the", phrase crtSlpSrf]
 
+labeledWithReqs :: [LabelledContent]
+labeledWithReqs = funcReqTables ++ figures
+
+figures :: [LabelledContent]
+figures = [sysCtxFig1, figPhysSyst, figIndexConv, figForceActing]
+
 concIns :: [ConceptInstance]
 concIns = goals ++ assumptions ++ funcReqs ++ nonFuncReqs ++ likelyChgs ++ unlikelyChgs
 
-labCon :: [LabelledContent]
-labCon = [figPhysSyst, figIndexConv, figForceActing, sysCtxFig1] ++ funcReqTables
-
 stdFields :: Fields
 stdFields = [DefiningEquation, Description Verbose IncludeUnits, Notes, Source, RefBy]
 
@@ -142,7 +145,7 @@ conceptChunks =
 
 symbMap :: ChunkDB
 symbMap = cdb symbols ideaDicts conceptChunks
-  [degree] dataDefs iMods generalDefinitions tMods concIns citations labCon allRefs
+  [degree] dataDefs iMods generalDefinitions tMods concIns citations labeledWithReqs allRefs
 
 abbreviationsList :: [IdeaDict]
 abbreviationsList =
@@ -155,7 +158,7 @@ abbreviationsList =
 
 -- | Holds all references and links used in the document.
 allRefs :: [Reference]
-allRefs = [externalLinkRef, weightSrc, hsPressureSrc]
+allRefs = externalLinkRef : weightSrc : hsPressureSrc : SRS.sectionReferences ++ map ref labeledWithReqs
 
 -- SECTION 1 --
 --automatically generated in mkSRS -

code/drasil-example/swhs/lib/Drasil/SWHS/Assumptions.hs

@@ -31,8 +31,9 @@ import Drasil.SWHS.Unitals (wVol, volHtGen, tempC, tempInit, tempW,
 -------------------------
 
 assumptions :: [ConceptInstance]
+-- Order matters: each assumption appears after those it references so generated SRS links work.
 assumptions = [assumpTEO, assumpHTCC, assumpCWTAT, assumpTPCAV, assumpDWPCoV, assumpSHECoV,
-  assumpLCCCW, assumpTHCCoT, assumpTHCCoL, assumpLCCWP, assumpCTNOD, assumpSITWP,
+  assumpLCCCW, assumpTHCCoT, assumpTHCCoL, assumpLCCWP, assumpSITWP, assumpCTNOD,
   assumpPIS, assumpWAL, assumpPIT, assumpNIHGBWP, assumpVCMPN, assumpNGSP,
   assumpAPT, assumpVCN]