Skip to content

Commit

Permalink
Erroneous use of nounPhraseSP (#3831)
Browse files Browse the repository at this point in the history
* glassbr use of nounPhraseSP

* glassbr nounPhraseSP

* changed some nounPhraseSP to plural

* rm bad examples

* nounPhraseSP

* small fix
  • Loading branch information
NoahCardoso committed Jul 7, 2024
1 parent 7370fe5 commit 72ae024
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions code/drasil-example/glassbr/lib/Drasil/GlassBR/Concepts.hs
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ nFL = commonIdeaWithDict "nFL" (nounPhraseSP "non-factored l

beam, blastRisk, cantilever, edge, glaPlane, glaSlab, plane,
glass, ptOfExplsn, responseTy :: IdeaDict
beam = nc "beam" (nounPhraseSP "beam")
beam = nc "beam" (cn' "beam")
blastRisk = nc "blastRisk" (nounPhraseSP "blast risk")
cantilever = nc "cantilever" (nounPhraseSP "cantilever")
edge = nc "edge" (cn' "edge")
glass = nc "glass" (nounPhraseSP "glass")
glaSlab = nc "glaSlab" (nounPhraseSP "glass slab")
plane = nc "plane" (nounPhraseSP "plane")
glaSlab = nc "glaSlab" (cn' "glass slab")
plane = nc "plane" (cn' "plane")

ptOfExplsn = nc "ptOfExplsn" (cn' "point of explosion")

Expand Down
8 changes: 4 additions & 4 deletions code/drasil-example/glassbr/lib/Drasil/GlassBR/Unitals.hs
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,14 @@ aspectRatioCon = cc aR
"sides, the ratio of the length of one of the supported edges " ++
"perpendicular to the free edge, to the length of the free edge, is " ++
"equal to or greater than 0.5")
blast = dcc "blast" (nounPhraseSP "blast")
blast = dcc "blast" (cn' "blast")
"any kind of man-made explosion"
blastResisGla = dcc "blastResisGla" (nounPhraseSP "blast resistant glazing")
"glazing that provides protection against air blast pressure generated by explosions"
blastTy = dcc "blastTy" (nounPhraseSP "blast type")
blastTy = dcc "blastTy" (cn' "blast type")
("the blast type input includes parameters like weight of charge, TNT " ++
"equivalent factor, and stand off distance from the point of explosion")
bomb = dcc "bomb" (nounPhraseSP "bomb") ("a container filled " ++
bomb = dcc "bomb" (cn' "bomb") ("a container filled " ++
"with a destructive substance designed to exlode on impact or via detonation")
capacity = dcc "capacity" (nounPhraseSP "capacity or load resistance")
"load resistance calculated"
Expand All @@ -321,7 +321,7 @@ 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])
glassGeo = dccWDS "glassGeo" (nounPhraseSP "glass geometry")
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])
glassTy = dcc "glassTy" (cn' "glass type") "type of glass"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ derControl
"of the output signal (proportional to a derivative of the error signal)")

simulation
= dcc "simulation" (nounPhraseSP "simulation")
= dcc "simulation" (cn' "simulation")
"Simulation of the PD controller"

ccFrequencyDomain
Expand Down
2 changes: 1 addition & 1 deletion code/drasil-example/ssp/lib/Drasil/SSP/Unitals.hs
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ effectiveStress = uc' "sigma'" (cn' "effective stress")
"average stress carried by the soil skeleton")
(prime lSigma) Real pascal

effNormStress = uc' "sigmaN'" (cn' "effective normal stress")
effNormStress = uc' "sigmaN'" (nounPhraseSP "effective normal stress")
(S $ "the normal stress in a soil mass that is effective in causing volume " ++
"changes; represents the average normal stress carried by the soil skeleton")
(prime $ sub lSigma cN) Real pascal
Expand Down

0 comments on commit 72ae024

Please sign in to comment.