Merge pull request #3192 from JacquesCarette/projOffsetConstraintFix

Fix `d_offset` constraint in Projectile
JacquesCarette · Dec 22, 2022 · 09365d7 · 09365d7
2 parents 62468cc + c0d2b52
commit 09365d7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 18 deletions.
diff --git a/code/drasil-example/projectile/lib/Drasil/Projectile/IMods.hs b/code/drasil-example/projectile/lib/Drasil/Projectile/IMods.hs
@@ -115,7 +115,7 @@ offsetQD = mkQuantDef offset E.offset'
 ---
 messageIM :: InstanceModel
 messageIM = imNoDerivNoRefs (equationalModelN (nounPhraseSP "output message") messageQD)
-  [qwC offset $ UpFrom (Exc, neg (sy landPos))
+  [qwC offset $ UpFrom (Exc, neg (sy targPos))
   ,qwC targPos $ UpFrom (Exc, exactDbl 0)]
   (qw message)
   [] "messageIM" [offsetNote, targPosConsNote, offsetConsNote, tolNote]
@@ -147,7 +147,7 @@ landPosConsNote = atStartNP (the constraint) +:+
 
 offsetNote = ch offset `S.is` S "from" +:+. refS offsetIM
 
-offsetConsNote = foldlSent [atStartNP (the constraint), eS (sy offset $> neg (sy landPos)) `S.is`
+offsetConsNote = foldlSent [atStartNP (the constraint), eS (sy offset $> neg (sy targPos)) `S.is`
   S "from the fact that", eS (sy landPos $> exactDbl 0) `sC` S "from", refS posXDirection]
 
 targPosConsNote = atStartNP (the constraint) +:+

diff --git a/code/drasil-example/projectile/lib/Drasil/Projectile/Unitals.hs b/code/drasil-example/projectile/lib/Drasil/Projectile/Unitals.hs
@@ -29,7 +29,7 @@ flightDur = constrainedNRV' (ucs'  C.flightDur (subStr lT "flight") Real second)
 landPos   = constrainedNRV' (ucs'  C.landPos   (subStr lP "land"  ) Real metre)   [gtZeroConstr]
 launAngle = constrained'    (dqd' C.launAngle (autoStage lTheta)   Real (Just radian)) [physc $ Bounded (Exc, exactDbl 0) (Exc, half $ sy pi_)] (sy pi_ $/ exactDbl 4)
 launSpeed = constrained'    (ucs'  C.launSpeed (subStr lV "launch") Real velU)    [gtZeroConstr] (exactDbl 100)
-offset    = constrainedNRV' (ucs'  C.offset    (subStr lD "offset") Real metre)   [physc $ UpFrom (Exc, neg $ sy landPos) ]
+offset    = constrainedNRV' (ucs'  C.offset    (subStr lD "offset") Real metre)   [physc $ UpFrom (Exc, neg $ sy targPos) ]
 targPos   = constrained'    (ucs' C.targPos   (subStr lP "target") Real metre)   [gtZeroConstr] (exactDbl 1000)
 
 ---

diff --git a/code/stable/projectile/Jupyter/Projectile_SRS.ipynb b/code/stable/projectile/Jupyter/Projectile_SRS.ipynb
diff --git a/code/stable/projectile/SRS/HTML/Projectile_SRS.html b/code/stable/projectile/SRS/HTML/Projectile_SRS.html
diff --git a/code/stable/projectile/SRS/PDF/Projectile_SRS.tex b/code/stable/projectile/SRS/PDF/Projectile_SRS.tex
diff --git a/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/cpp/designLog.txt b/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/cpp/designLog.txt
diff --git a/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/csharp/designLog.txt b/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/csharp/designLog.txt
diff --git a/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/java/designLog.txt b/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/java/designLog.txt
diff --git a/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/python/designLog.txt b/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/python/designLog.txt
diff --git a/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/swift/designLog.txt b/code/stable/projectile/projectile_s_l_nol_u_u_v_f/src/swift/designLog.txt