Merge with NewMech

Author: erikdsjostrom

Book/.gitignore

@@ -0,0 +1,2 @@
+# Ignore the built files
+build/

Book/Makefile

@@ -0,0 +1,3 @@
+
+run :
+	python3 build.py

Book/build.py

@@ -109,6 +109,7 @@ def build_index(sources):
         ("Differential calculus", "Physics/src/Calculus/DifferentialCalc.lhs"),
         ("Integral calculus", "Physics/src/Calculus/IntegralCalc.lhs"),
         ("Plotting graphs", "Physics/src/Calculus/VisVerApp.lhs"),
+        ("Syntax trees", "Physics/src/Calculus/SyntaxTree.lhs"),
     ]),
     ("Linear algebra", [
         ("Vectors", "Physics/src/Vector/Vector.lhs")
@@ -123,6 +124,19 @@ def build_index(sources):
         ("Testing of Quantities",
         "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", [
     #     ("Gungbräda", "Physics/src/Examples/Gungbraeda.lhs"),

Book/includes/type.html

@@ -0,0 +1,34 @@
+> {-# LANGUAGE GADTs #-}
+> module Body.TypedVectors where
+
+In order to do some physics we have to imbue our vectors with a dimension.
+
+> import Vector.Vector as V
+> import Dimensions.ValueLevel as Val
+
+> data TypedVector = TV Vector2 Dim
+
+> velocity :: TypedVector
+> velocity = TV (V2 0 0) (Val.length `Val.div` time)
+
+> instance Show TypedVector where
+>   show (TV vec dim) = show (V.magnitude vec) ++ " " ++ show dim
+
+We can add vectors together
+
+> data TVOps where
+>   Add        :: TypedVector  -> TypedVector -> TVOps
+>   Scale      :: Scalar       -> TypedVector -> TVOps
+
+
+> add :: TypedVector -> TypedVector -> TVOps
+> add = Add
+
+> eval :: TVOps -> IO TypedVector
+> eval (Add (TV vec1 dim1) (TV vec2 dim2)) = case dim1 == dim2 of
+>   True  -> return $ TV (V.add vec1 vec2) dim1
+>   False -> error "Dimensions are different"
+> eval (Scale s (TV vec dim)) = return $ TV (V.scale s vec) dim
+
+
+

Book/test.html

@@ -1,6 +1,4 @@
 module Main where
 
---import Lib
-
 main :: IO ()
 main = undefined

Physics/Hatlab/package.cache

@@ -17,11 +17,13 @@ extra-source-files:
 # To avoid duplicated efforts in documentation and dealing with the
 # complications of embedding Haddock markup inside cabal files, it is
 # common to point users to the README.md file.
-description:         Please see the README on Github at <https://github.com/githubuser/Physics#readme>
+description: Please see the README on Github at <https://github.com/githubuser/Physics#readme>
 
 dependencies:
 - base >= 4.7 && < 5
 - Hatlab
+- containers
+- pretty-tree
 - QuickCheck
 - numtype-dk