stable

Author: sarrasoussia

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

@@ -44,12 +44,8 @@ import Drasil.DblPend.References (citations)
 import Data.Drasil.ExternalLibraries.ODELibraries (scipyODESymbols,
   osloSymbols, apacheODESymbols, odeintSymbols, odeInfoChunks)
 import Drasil.DblPend.ODEs (dblPenODEInfo)
-
-<<<<<<< HEAD
-=======
 import Drasil.System (SystemKind(Specification), mkSystem)
 
->>>>>>> main
 srs :: Document
 srs = mkDoc mkSRS (S.forGen titleize phrase) si
 

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

@@ -6,13 +6,8 @@ import Prelude hiding (sin, cos, sqrt)
 import Language.Drasil
 import qualified Language.Drasil.Sentence.Combinators as S
 import Theory.Drasil (DataDefinition, ddENoRefs, ddMENoRefs)
-<<<<<<< HEAD
-import Drasil.DblPend.Figures (figMotion)
-import Drasil.DblPend.Unitals (pendDisAngle_1, pendDisAngle_2, lenRod_1, lenRod_2, xPos_1, yPos_1, xPos_2, yPos_2, angularVel_1, angularVel_2, xVel_1, yVel_1)
-=======
 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)
->>>>>>> main
+import Drasil.DblPend.Unitals (pendDisAngle_1, pendDisAngle_2, lenRod_1, lenRod_2, xPos_1, yPos_1, xPos_2, yPos_2, angularVel_1, angularVel_2, xVel_1, yVel_1)
 import Drasil.DblPend.Concepts (horizontalPos, verticalPos)
 import Data.Drasil.Quantities.Physics (velocity, position, time, acceleration, force)
 import Data.Drasil.Quantities.PhysicalProperties (mass)

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

@@ -13,7 +13,7 @@ import Data.Drasil.Concepts.Documentation (assumption, goalStmt, physSyst,
 import Data.Drasil.Quantities.PhysicalProperties as QPP (len, mass)
 import Data.Drasil.SI_Units (metre, radian, kilogram, newton)
 import qualified Data.Drasil.Quantities.Physics as QP (position, force, velocity,
-  angularVelocity, angularAccel, gravitationalAccel, tension, acceleration, time)
+  angularVelocity, angularAccel, gravitationalAccel, tension, acceleration, time, gravitationalMagnitude)
 import Data.Drasil.Concepts.Physics (twoD)
 import Data.Drasil.Concepts.Math as CM (angle, xDir, yDir)
 import Data.Drasil.Quantities.Math as QM (unitVect, pi_)
@@ -42,18 +42,11 @@ constants = [gravitationalAccelConst]
 unitalChunks :: [UnitalChunk]
 unitalChunks = [ 
   lenRod_1, lenRod_2, massObj_1, massObj_2, angularVel_1, angularVel_2,
-<<<<<<< HEAD
   pendDisAngle_1, pendDisAngle_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.gravitationalMagnitude, QP.tension, QP.acceleration,
   QP.time, QP.velocity, QP.position, velocityVec_1, velocityVec_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,
-  QP.time, QP.velocity, QP.position]
->>>>>>> main
 
 lenRod_1, lenRod_2, massObj_1, massObj_2, angularVel_1, angularVel_2, 
   pendDisAngle_1, pendDisAngle_2,