unified the two projects into one

Author: arademaker

.gitignore

@@ -1,4 +1,5 @@
 
 **/*.DS_Store
+**/*~
 
 /.lake

book/Fad.lean Book.leanbook/Fad.lean renamed to Book.lean

@@ -1,6 +1,6 @@
 import VersoManual
 
-import Fad.FP
+import Book.FP
 
 open Verso.Genre Manual
 open Verso Code External

Fad/Chapter5.lean

@@ -367,6 +367,11 @@ def subs (xs ys : List (a × Label)) : List (a × Pair) :=
 def switch : a × Pair → a × Pair
 | (x, (i, j)) => (-x, (j, i))
 
+-- this need to be checked, added to fix error in `sortWith`
+instance : Ord (a × Pair) where
+ compare p q :=
+   compare p.1 q.1
+
 def sortWith (abs : List (a × Pair)) (xis yis : List (a × Label))
   : List (a × Pair) :=
   let a := Std.HashMap.ofList (qsort₂ compare abs |>.map Prod.snd |>.zipIdx)

book/Main.lean MainBook.leanbook/Main.lean renamed to MainBook.lean

@@ -1,5 +1,5 @@
 import VersoManual
-import Fad
+import Book
 
 open Verso.Genre Manual
 open Verso Code External

book/.github/workflows/lean_action_ci.yml

@@ -1,5 +1,5 @@
 import VersoManual
-import Fad.Basic
+import Book.Basic
 
 open Verso.Genre Manual
 open Fad