Index R functions. Add some explanatory text. Fix some misspelled words.

aphalo · Apr 9, 2017 · 85b0241 · 85b0241
1 parent 1ae1c61
commit 85b0241
Show file tree

Hide file tree

Showing 19 changed files with 290,454 additions and 75,185 deletions.
diff --git a/R.data.Rnw b/R.data.Rnw
diff --git a/R.maps.Rnw b/R.maps.Rnw
diff --git a/R.more.plotting.Rnw b/R.more.plotting.Rnw
diff --git a/R.plotting.Rnw b/R.plotting.Rnw
diff --git a/appendixes.prj b/appendixes.prj
@@ -6,38 +6,38 @@
 using-r-main.Rnw
 54
 15
-4
+1
 
-using-r-main.Rnw
-TeX:RNW:UTF-8
-152055803 0 -1 5594 -1 5595 208 208 1568 731 0 1 177 400 -1 -1 0 0 198 -1 -1 198 2 0 5595 -1 1 5579 -1  0 -1 0
 references.bib
 BibTeX
 1049586 0 104 7 193 1 0 0 820 242 0 1 41 320 -1 -1 0 0 23 0 0 23 1 0 1 193  0 -1 0
+using-r-main.Rnw
+TeX:RNW:UTF-8
+420491259 0 -1 5590 -1 5594 208 208 1568 731 0 1 169 944 -1 -1 0 0 198 -1 -1 198 2 0 5594 -1 1 5579 -1  0 -1 0
 R.data.Rnw
 TeX:RNW
-17838075 0 -1 79222 -1 79224 26 26 977 443 1 1 697 512 -1 -1 0 0 31 -1 -1 31 2 0 79224 -1 1 72647 -1  0 -1 0
+17838075 0 -1 33656 -1 33864 26 26 977 443 1 1 329 432 -1 -1 0 0 31 -1 -1 31 2 0 33864 -1 1 74181 -1  0 -1 0
 C:\Users\aphalo\AppData\Roaming\WinEdt Team\_history\D\aphalo\Documents\Own_manuscripts\Books\using-r\using-r-main.tex.sav
 TeX
-1060859 0 -1 141167 -1 141168 26 26 838 264 0 1 201 272 -1 -1 0 0 73 -1 -1 73 1 0 141168 -1  0 -1 0
+1060859 0 -1 141167 -1 141168 26 26 838 264 0 1 201 256 -1 -1 0 0 73 -1 -1 73 1 0 141168 -1  0 -1 0
 usingr.sty
 TeX:STY
-269496306 0 44 50 44 53 234 234 1598 724 0 0 441 368 -1 -1 0 0 25 0 0 25 1 0 53 44  0 0 0
+1060850 0 75 13 74 80 234 234 1598 724 0 0 657 240 -1 -1 0 0 25 0 0 25 1 0 80 74  0 0 0
 R.more.plotting.Rnw
 TeX:RNW
-17838075 0 -1 69815 -1 69815 26 26 924 603 1 1 161 304 -1 -1 0 0 30 -1 -1 30 1 0 69815 -1  0 -1 0
+17838075 2 -1 44811 -1 44821 26 26 924 603 1 1 697 208 -1 -1 0 0 30 -1 -1 30 1 0 44821 -1  0 -1 0
 R.friends.Rnw
 TeX:RNW
-17838075 0 -1 924 -1 1041 104 104 853 490 0 1 385 272 -1 -1 0 0 31 -1 -1 31 1 0 1041 -1  0 -1 0
+17838075 0 -1 924 -1 1041 104 104 853 490 0 1 385 -704 -1 -1 0 0 31 -1 -1 31 1 0 1041 -1  0 -1 0
 R.plotting.Rnw
 TeX:RNW
-17838075 0 -1 120042 -1 120046 130 130 1516 559 1 1 153 64 -1 -1 0 0 31 -1 -1 31 4 0 120046 -1 1 42772 -1 2 148634 -1 3 148634 -1  0 -1 0
+17838075 2 -1 4605 -1 4574 130 130 1516 559 1 1 89 192 -1 -1 0 0 31 -1 -1 31 4 0 4574 -1 1 43044 -1 2 152954 -1 3 152954 -1  0 -1 0
 .git\gitHeadInfo.gin
 DATA:UNIX
 5341426 0 0 1 17 1 78 78 1029 495 1 0 73 272 -1 -1 0 0 14 0 0 14 1 0 1 17  0 0 0
 R.maps.Rnw
 TeX:RNW
-17838075 0 -1 1207 -1 1207 64 64 974 522 1 1 89 368 -1 -1 0 0 57 -1 -1 57 1 0 1207 -1  0 -1 0
+17838075 2 -1 26647 -1 26669 64 64 974 522 1 1 321 208 -1 -1 0 0 57 -1 -1 57 1 0 26669 -1  0 -1 0
 R.intro.Rnw
 TeX:RNW
 17838075 2 -1 13557 -1 13566 182 182 1542 705 1 1 577 400 -1 -1 0 0 47 -1 -1 47 1 0 13566 -1  0 -1 0
@@ -46,16 +46,16 @@ BibTeX:UNIX
 1147890 0 161 29 162 13 52 52 872 313 1 1 185 160 -1 -1 0 0 21 0 0 21 1 0 13 162  0 -1 0
 R.as.calculator.Rnw
 TeX:RNW
-1060859 1 -1 40944 -1 40961 26 26 1386 549 1 1 449 336 -1 -1 0 0 31 -1 -1 31 1 0 40961 -1  0 -1 0
+1060859 1 -1 40944 -1 40961 26 26 1386 549 1 1 449 320 -1 -1 0 0 31 -1 -1 31 1 0 40961 -1  0 -1 0
 R.scripts.Rnw
 TeX:RNW
-17838075 2 -1 190 -1 131 78 78 1438 601 1 1 89 112 -1 -1 0 0 31 -1 -1 31 1 0 131 -1  0 -1 0
+17838075 2 -1 190 -1 131 78 78 1438 601 1 1 89 96 -1 -1 0 0 31 -1 -1 31 1 0 131 -1  0 -1 0
 R.functions.Rnw
 TeX:RNW
 17838075 0 -1 6202 -1 6234 130 130 1490 653 0 1 49 160 -1 -1 0 0 190 -1 -1 190 1 0 6234 -1  0 -1 0
 using-r-main.tex
 TeX
-269496315 0 -1 236338 -1 236357 160 160 1132 493 0 1 41 288 -1 -1 0 0 73 -1 -1 73 1 0 236357 -1  0 -1 0
+269496315 7 -1 67759 -1 67757 96 96 1082 496 0 1 121 304 -1 -1 0 0 73 -1 -1 73 1 0 67757 -1  0 -1 0
 :\aphalo\Documents\Own_research_data\Suonenjoki\NELDER92\BIRCH\FINAL1\areatable.dat
 DATA
 273678578 0 0 1 0 1 0 0 978 431 1 0 73 0 -1 -1 0 0 301 0 0 301 1 0 1 0  0 0 0

diff --git a/backups/R.data.Rnw.sav b/backups/R.data.Rnw.sav
diff --git a/backups/R.maps.Rnw.sav b/backups/R.maps.Rnw.sav
diff --git a/backups/R.more.plotting.Rnw.sav b/backups/R.more.plotting.Rnw.sav
diff --git a/backups/R.plotting.Rnw.sav b/backups/R.plotting.Rnw.sav
diff --git a/backups/using-r-main.Rnw.sav b/backups/using-r-main.Rnw.sav
@@ -157,7 +157,7 @@ options(warnPartialMatchAttr = FALSE,
 @
 
 <<own-set-up, echo=FALSE, include=FALSE, cache=FALSE>>=
-incl_all <- FALSE
+incl_all <- TRUE
 
 eval_diag <- FALSE
 @
@@ -242,7 +242,9 @@ The present update adds about 100 pages to the previous versions. I expect to up
 
 \textbf{Status as of 2017-04-04.} Revised and expanded the chapter on using \Rpgrm as a calculator. Revised and expanded the ``Scripts'' chapter. Minor edits to ``Functions'' chapter. Continued writing chapter on data, writing a section on R's native apply functions and added preliminary text for a pipes and tees section. Write intro to `tidyverse' and grammar of data manipulation. Added index entries, and a few additional citations to the literature. Spell checking.
 
-\textbf{Status as of 2017-04-08.} Completed writing first draft of chapter on data, writing all the previously missing sections on the ``grammar of data manipulation''. Wrote two extended examples in the same chapter. Add table listing several of the useful extensions not described in the book. 
+\textbf{Status as of 2017-04-08.} Completed writing first draft of chapter on data, writing all the previously missing sections on the ``grammar of data manipulation''. Wrote two extended examples in the same chapter. Add table listing several extensions to \pkgname{ggplot2} not described in the book.
+
+\textbf{Status as of 2017-04-09.} Revised chapters on data and plotting, correcting some spelling mistakes and indexing all functions used.
 
 \end{infobox}
 
@@ -261,7 +263,7 @@ The present update adds about 100 pages to the previous versions. I expect to up
 <<child-r-functions, child='R.functions.Rnw', eval=incl_all || FALSE>>=
 @
 
-<<child-r-data, child='R.data.Rnw', eval=incl_all || TRUE>>=
+<<child-r-data, child='R.data.Rnw', eval=incl_all || FALSE>>=
 @
 
 <<child-r-plotting, child='R.plotting.Rnw', eval=incl_all || FALSE>>=

diff --git a/data/my-data.xlsx b/data/my-data.xlsx
diff --git a/using-r-main.Rnw b/using-r-main.Rnw
@@ -157,7 +157,7 @@ options(warnPartialMatchAttr = FALSE,
 @
 
 <<own-set-up, echo=FALSE, include=FALSE, cache=FALSE>>=
-incl_all <- FALSE
+incl_all <- TRUE
 
 eval_diag <- FALSE
 @
@@ -244,6 +244,8 @@ The present update adds about 100 pages to the previous versions. I expect to up
 
 \textbf{Status as of 2017-04-08.} Completed writing first draft of chapter on data, writing all the previously missing sections on the ``grammar of data manipulation''. Wrote two extended examples in the same chapter. Add table listing several extensions to \pkgname{ggplot2} not described in the book.
 
+\textbf{Status as of 2017-04-09.} Revised chapters on data, plotting, more plotting and maps and raster images, correcting some spelling mistakes, adding some explanatory text and indexing all functions and operators used.
+
 \end{infobox}
 
 %\chapter*{Learning like a child}
@@ -264,13 +266,13 @@ The present update adds about 100 pages to the previous versions. I expect to up
 <<child-r-data, child='R.data.Rnw', eval=incl_all || FALSE>>=
 @
 
-<<child-r-plotting, child='R.plotting.Rnw', eval=incl_all || TRUE>>=
+<<child-r-plotting, child='R.plotting.Rnw', eval=incl_all || FALSE>>=
 @
 
 <<child-r-more-plotting, child='R.more.plotting.Rnw', eval=incl_all || FALSE>>=
 @
 
-<<child-r-maps, child='R.maps.Rnw', eval=incl_all || FALSE>>=
+<<child-r-maps, child='R.maps.Rnw', eval=incl_all || TRUE>>=
 @
 
 <<child-r-friends, child='R.friends.Rnw', eval=incl_all || FALSE>>=