rename f.go=>fermi.go after fixing nvim problem

README.md

@@ -90,6 +90,13 @@ help
     exit
 ```
 
+You can also specify the number of samples to draw when algebraic manipulations are not sufficient: 
+
+```
+$ fermi -n 1000000
+$ fermi -n 1_000_000
+```
+
 ## Tips & tricks
 
 - It's conceptually clearer to have all the multiplications first and then all the divisions
@@ -99,7 +106,7 @@ help
 
 ## Different levels of complexity
 
-The top level f.go file (400 lines) has a bunch of complexity: variables, parenthesis, samples, beta distributions. In the simple/ folder:
+The top level f.go file (420 lines) has a bunch of complexity: variables, parenthesis, samples, beta distributions, number of samples, etc. In the simple/ folder:
 
 - f_simple.go (370 lines) strips variables and parenthesis, but keeps beta distributions, samples, and addition and substraction
 - f_minimal.go (140 lines) strips everything that isn't lognormal and scalar multiplication and addition, plus a few debug options.
@@ -135,10 +142,10 @@ Done:
 - [x] Maintain *both* a more complex thing that's more featureful *and* the more simple multiplication of lognormals thing.
 - [x] Allow input with K/M/T
 - [x] Document parenthesis syntax
+- [x] Specify number of samples as a command line option
 
 To (possibly) do:
 
-- [ ] Specify number of samples as a command line option
 - [ ] Figure out how to make models executable, by adding a #!/bin/bash-style command at the top?
 - [ ] Add functions. Now easier to do with an explicit representation of the stakc
 - [ ] Think about how to draw a histogram from samples

makefile

@@ -1,17 +1,11 @@
-run:
-	go run f.go
-
 build:
-	go build f.go
+	go build fermi.go
 
-install: f 
+run:
+	go run fermi.go
+
+install: fermi 
 	rm /usr/bin/fermi
 	rm /usr/bin/f
-	sudo mv f /usr/bin/f
-	sudo ln -s /usr/bin/f /usr/bin/fermi
-
-install_xl: f 
-	rm /usr/bin/fermixl
-	rm /usr/bin/fxl
-	sudo mv f /usr/bin/fxl
-	sudo ln -s /usr/bin/fxl /usr/bin/fermixl
+	sudo mv fermi /usr/bin/fermi
+	sudo ln -s /usr/bin/fermi /usr/bin/f