diff --git a/code/drasil-example/projectile/lib/Drasil/Projectile/IMods.hs b/code/drasil-example/projectile/lib/Drasil/Projectile/IMods.hs index ee85dadd6a..c86fb7e020 100644 --- 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 index 913db57931..532b9db6b0 100644 --- 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 index 8b284b0492..09bc1d8082 100644 --- a/code/stable/projectile/Jupyter/Projectile_SRS.ipynb +++ b/code/stable/projectile/Jupyter/Projectile_SRS.ipynb @@ -1161,7 +1161,7 @@ "\n", "Input Constraints\n", "\n", - "$${d_{\\text{offset}}}\\gt{}-{p_{\\text{land}}}$$\n", + "$${d_{\\text{offset}}}\\gt{}-{p_{\\text{target}}}$$\n", "$${p_{\\text{target}}}\\gt{}0$$\n", "\n", "\n", @@ -1194,7 +1194,7 @@ "\n", "The constraint $p_target > 0$ is from [A:posXDirection](#posXDirection).\n", "\n", - "The constraint $d_offset > -p_land$ is from the fact that $p_land > 0$, from [A:posXDirection](#posXDirection).\n", + "The constraint $d_offset > -p_target$ is from the fact that $p_land > 0$, from [A:posXDirection](#posXDirection).\n", "\n", "$ε$ is defined in [Sec:Values of Auxiliary Constants](#Sec:AuxConstants).\n", "\n", @@ -1241,7 +1241,7 @@ "|Var|Physical Constraints|\n", "|:--- |:--- |\n", "|$p_land$|$p_land > 0$|\n", - "|$d_offset$|$d_offset > -p_land$|\n", + "|$d_offset$|$d_offset > -p_target$|\n", "\n", "\n", "# Requirements\n", diff --git a/code/stable/projectile/SRS/HTML/Projectile_SRS.html b/code/stable/projectile/SRS/HTML/Projectile_SRS.html index 43cebd5229..22da226760 100644 --- a/code/stable/projectile/SRS/HTML/Projectile_SRS.html +++ b/code/stable/projectile/SRS/HTML/Projectile_SRS.html @@ -1534,7 +1534,7 @@

Detailed derivation of landing position:

Input Constraints - \[{d_{\text{offset}}}\gt{}-{p_{\text{land}}}\] + \[{d_{\text{offset}}}\gt{}-{p_{\text{target}}}\] \[{p_{\text{target}}}\gt{}0\] @@ -1577,7 +1577,7 @@

Detailed derivation of landing position:

The constraint ptarget > 0 is from A:posXDirection.

- The constraint doffset > −pland is from the fact that pland > 0, from A:posXDirection. + The constraint doffset > −ptarget is from the fact that pland > 0, from A:posXDirection.

ε is defined in Sec:Values of Auxiliary Constants. @@ -1659,7 +1659,7 @@

Properties of a Correct Solution

doffset - doffset > −pland + doffset > −ptarget diff --git a/code/stable/projectile/SRS/PDF/Projectile_SRS.tex b/code/stable/projectile/SRS/PDF/Projectile_SRS.tex index 7167ad48c8..02a9e37410 100644 --- a/code/stable/projectile/SRS/PDF/Projectile_SRS.tex +++ b/code/stable/projectile/SRS/PDF/Projectile_SRS.tex @@ -901,7 +901,7 @@ \subsubsection{Instance Models} \\ \midrule \\ Input Constraints & \begin{displaymath} - {d_{\text{offset}}}\gt{}-{p_{\text{land}}} + {d_{\text{offset}}}\gt{}-{p_{\text{target}}} \end{displaymath} \begin{displaymath} {p_{\text{target}}}\gt{}0 @@ -928,7 +928,7 @@ \subsubsection{Instance Models} The constraint ${p_{\text{target}}}\gt{}0$ is from \hyperref[posXDirection]{A:posXDirection}. - The constraint ${d_{\text{offset}}}\gt{}-{p_{\text{land}}}$ is from the fact that ${p_{\text{land}}}\gt{}0$, from \hyperref[posXDirection]{A:posXDirection}. + The constraint ${d_{\text{offset}}}\gt{}-{p_{\text{target}}}$ is from the fact that ${p_{\text{land}}}\gt{}0$, from \hyperref[posXDirection]{A:posXDirection}. $ε$ is defined in \hyperref[Sec:AuxConstants]{Sec:Values of Auxiliary Constants}. @@ -974,7 +974,7 @@ \subsubsection{Properties of a Correct Solution} \endhead ${p_{\text{land}}}$ & ${p_{\text{land}}}\gt{}0$ \\ -${d_{\text{offset}}}$ & ${d_{\text{offset}}}\gt{}-{p_{\text{land}}}$ +${d_{\text{offset}}}$ & ${d_{\text{offset}}}\gt{}-{p_{\text{target}}}$ \\ \bottomrule \caption{Output Data Constraints} 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 index e8c275ef93..6ffb835802 100644 --- 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 @@ -15,4 +15,3 @@ Auxiliary Files selected as SampleInput ../../../datafiles/projectile/sampleInpu Code Concept pi selected as Pi. Successfully matched Real with Float. Successfully matched String with String. -Successfully matched Rational with Float. 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 index e8c275ef93..6ffb835802 100644 --- 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 @@ -15,4 +15,3 @@ Auxiliary Files selected as SampleInput ../../../datafiles/projectile/sampleInpu Code Concept pi selected as Pi. Successfully matched Real with Float. Successfully matched String with String. -Successfully matched Rational with Float. 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 index e8c275ef93..6ffb835802 100644 --- 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 @@ -15,4 +15,3 @@ Auxiliary Files selected as SampleInput ../../../datafiles/projectile/sampleInpu Code Concept pi selected as Pi. Successfully matched Real with Float. Successfully matched String with String. -Successfully matched Rational with Float. 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 index e62ebbc11c..c389279fd3 100644 --- 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 @@ -16,5 +16,3 @@ Code Concept pi selected as Pi. Language Python does not support code type Float, chosen as the match for the Real space. Trying next choice. Successfully matched Real with Double. Successfully matched String with String. -Language Python does not support code type Float, chosen as the match for the Rational space. Trying next choice. -Successfully matched Rational with Double. 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 index e8c275ef93..6ffb835802 100644 --- 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 @@ -15,4 +15,3 @@ Auxiliary Files selected as SampleInput ../../../datafiles/projectile/sampleInpu Code Concept pi selected as Pi. Successfully matched Real with Float. Successfully matched String with String. -Successfully matched Rational with Float.