Merge branch 'master' of https://github.com/DSLsofMath/BScProj2018

Author: Oskar Lundström

Book/build.py

@@ -125,23 +125,13 @@ def build_index(sources):
         "Physics/src/Dimensions/Quantity/Test.lhs"),
         ("Usage", "Physics/src/Dimensions/Usage.lhs"),
     ]),
-    ("Vectors", [
-        ("Vector", "Physics/src/Vector/Vector.lhs")
-    ]),
-    ("Calculus", [
-        ("Introduction", "Physics/src/Calculus/Intro.lhs"),
-        ("Function expressions", "Physics/src/Calculus/FunExpr.lhs"),
-        ("Differential calculus", "Physics/src/Calculus/DifferentialCalc.lhs"),
-        ("Integral calculus", "Physics/src/Calculus/IntegralCalc.lhs"),
-        ("Visualization, Verification, and Application", "Physics/src/Calculus/VisVerApp.lhs"),
-    ]),
     ("Newtonian Mechanics", [
         ("Single particle mechanics", "Physics/src/NewtonianMechanics/SingleParticle.lhs")
+    ]),
+    ("Examples", [
+        ("Box on an incline", "Physics/src/Examples/Box_incline.lhs"),
+        ("Teeter", "Physics/src/Examples/Teeter.lhs"),
     ])
-    # ("Examples", [
-    #     ("Gungbräda", "Physics/src/Examples/Gungbraeda.lhs"),
-    #     ("krafter på lådor", "Physics/src/Examples/krafter_pa_lador.lhs"),
-    # ])
 ]
 
 if not os.path.exists("build"):

Physics/src/Examples/krafter_pa_lador.lhs Physics/src/Examples/Box_incline.lhsPhysics/src/Examples/krafter_pa_lador.lhs renamed to Physics/src/Examples/Box_incline.lhs

@@ -13,19 +13,19 @@ All vectors are in newton.
 > m = 2
 > alpha = 30
 > 
-> unit_normal :: Double -> Vector2
+> unit_normal :: Double -> Vector2 Double
 > unit_normal a = V2 (cos a) (sin a)
 > 
-> f_l_ :: Vector2 -> Angle -> Vector2
+> f_l_ :: Vector2 Double -> Angle -> Vector2 Double
 > f_l_ fa a = scale ((magnitude fa) * (cos a)) (unit_normal (a-(pi/2)))
 > 
-> fn :: Vector2 -> Angle -> Vector2
+> fn :: Vector2 Double -> Angle -> Vector2 Double
 > fn fa a = negate (f_l_ fa a)
 
 Frictionfree incline:
 
 
-> fr :: Vector2 -> Angle -> Vector2
+> fr :: Vector2 Double -> Angle -> Vector2 Double
 > fr fa a = (fn fa a) + fa
 
 
@@ -99,29 +99,29 @@ We have the normal force and only needs the constants.
 
 The current speed does not affect the friction. However F*M = Nm = work = J -> racer cars burn tires.
 
-> motscalar :: FricConst -> Vector2 -> Scalar
+> motscalar :: FricConst -> Vector2 Double -> Scalar
 > motscalar u f = u * (magnitude f)
 
 Från en rörelse eller vekt, fixa komplementet
 
 
-> enh_vekt :: Vector2 -> Vector2
+> enh_vekt :: Vector2 Double -> Vector2 Double
 > enh_vekt v  | magnitude v == 0 = (V2 0 0)
 >             | otherwise = scale (1 / (magnitude v)) v
 > 
 > 
-> motkrafts :: FricConst -> Scalar -> Vector2 -> Vector2
+> motkrafts :: FricConst -> Scalar -> Vector2 Double -> Vector2 Double
 > motkrafts u s v = scale (u * s) (negate (enh_vekt v))
 > 
-> motkraftv :: FricConst -> Vector2 -> Vector2 -> Vector2
+> motkraftv :: FricConst -> Vector2 Double -> Vector2 Double -> Vector2 Double
 > motkraftv u n v = scale (u * (magnitude n)) (negate (enh_vekt v))
 
 Now we just need to sum the force vectors:
 
-> fru :: Vector2 -> Angle -> FricConst -> Vector2
+> fru :: Vector2 Double -> Angle -> FricConst -> Vector2 Double
 > fru fa a u = (fr fa a) + (motkraftv u (fn fa a) (fr fa a))
 > 
-> fru' :: Vector2 -> Angle -> FricConst -> Vector2
+> fru' :: Vector2 Double -> Angle -> FricConst -> Vector2 Double
 > fru' fa a u = (motkraftv u (fn fa a) (fr fa a))
 
 

Physics/src/Examples/Gungbraeda.lhs Physics/src/Examples/Teeter.lhsPhysics/src/Examples/Gungbraeda.lhs renamed to Physics/src/Examples/Teeter.lhs

@@ -1,4 +1,4 @@
-> module Examples.Gungbraeda where
+> module Examples.Teeter where
 
 Exam excercise 3, 2017-01-13