Skip to content

Commit

Permalink
Do proof corrections to Preface and Chapters 1, 2, and 3.
Browse files Browse the repository at this point in the history
Do most changes as requested, but edit a couple of paragraphs where the explanations were not clear.
  • Loading branch information
aphalo committed Feb 7, 2020
1 parent 197853b commit 6c7dc38
Show file tree
Hide file tree
Showing 31 changed files with 284,100 additions and 285,007 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
cache/
figure/
maps/
CRC/covers/*.png
CRC/covers/*.pdf
CRC/covers/*.eps
using-r-main.pdf
using-r-main.tex
learnr.pdf
Expand Down
Binary file added CRC/covers/cover-layout.psd
Binary file not shown.
80 changes: 74 additions & 6 deletions CRC/make-cover-wordcloud.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ get_words <- function(x) {
gsub("\\\\$|\\$", "$", temp) -> temp
gsub("\\\\&|\\&", "&", temp) -> temp
gsub("\\\\^|\\^", "^", temp) -> temp
# remove index catagories
# remove index categories
gsub("[{]functions and methods!|[{]classes and modes!|[{]data objects!|[{]operators!|[{]control of execution!|[{]names and their scope!|[{]constant and special values!", "", temp) -> temp
# remove page numbers
gsub("[{][0-9]*[}]", "", temp) -> temp
Expand Down Expand Up @@ -53,11 +53,79 @@ str_replace(rcatsidx.idx, "@", "") %.>%

nrow(word_counts.tb)

set.seed(42)
ggplot(word_counts.tb[1:140, ], aes(label = values, size = lengths, color = lengths)) +
geom_text_wordcloud(family = "mono", fontface = "bold", area_corr = TRUE) +
word_cloud.fig0 <-
ggplot(word_counts.tb[1:180, ], aes(label = values, size = lengths, color = lengths)) +
geom_text_wordcloud(family = "mono", fontface = "bold", area_corr = TRUE, grid_margin = 2, seed = 42) +
scale_size_area(max_size = 11) +
scale_color_viridis_c() +
theme_minimal() +
theme(aspect.ratio = 5/7)

png("CRC/covers/learnrbook-cover-image-300-0.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig0)
dev.off()

word_cloud.fig1 <-
ggplot(word_counts.tb[1:80, ], aes(label = values, size = lengths, color = lengths)) +
geom_text_wordcloud(family = "mono", fontface = "bold", area_corr = TRUE, grid_margin = 2, seed = 42, shape = "square") +
scale_size_area(max_size = 14) +
scale_color_viridis_c() +
theme_minimal() +
theme(aspect.ratio = 5/7)

png("CRC/covers/learnrbook-cover-image-300-1.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig1)
dev.off()

word_cloud.fig2 <-
ggplot(word_counts.tb[1:160, ], aes(label = values, size = lengths, color = lengths)) +
geom_text_wordcloud(family = "mono", fontface = "bold", area_corr = TRUE, grid_margin = 2, seed = 42) +
scale_size_area(max_size = 12) +
scale_color_viridis_c() +
theme_minimal() +
theme(aspect.ratio = 5/7)

png("CRC/covers/learnrbook-cover-image-300-2.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig2)
dev.off()

word_cloud.fig3 <-
ggplot(word_counts.tb[1:480, ], aes(label = values, size = lengths, color = lengths)) +
geom_text_wordcloud(family = "mono", fontface = "bold", area_corr = TRUE, grid_margin = 3, seed = 42, shape = "square") +
scale_size_area(max_size = 10) +
scale_color_viridis_c() +
theme_minimal() +
theme(aspect.ratio = 3/4,
panel.background = element_rect(fill = "black"))
theme(aspect.ratio = 5/7)

png("CRC/covers/learnrbook-cover-image-300-3.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig3)
dev.off()

word_cloud.fig4 <-
word_cloud.fig3 %+% scale_color_viridis_c(option = "B")

png("CRC/covers/learnrbook-cover-image-300-4.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig4)
dev.off()

word_cloud.fig5 <-
word_cloud.fig3 %+% scale_color_viridis_c(option = "C")

png("CRC/covers/learnrbook-cover-image-300-5.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig5)
dev.off()

word_cloud.fig6 <-
word_cloud.fig3 %+% scale_color_viridis_c(option = "E")

png("CRC/covers/learnrbook-cover-image-300-6.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig6)
dev.off()

word_cloud.fig7 <-
word_cloud.fig3 %+% scale_color_viridis_c(option = "A")

png("CRC/covers/learnrbook-cover-image-300-7.png", width = 2100, height = 1500, res = 300, bg = "black")
print(word_cloud.fig7)
dev.off()

Binary file added CRC/permissions/PV Form .doc
Binary file not shown.
Binary file added CRC/permissions/PV Form_.doc
Binary file not shown.
291 changes: 148 additions & 143 deletions R.as.calculator.Rnw

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions R.as.calculator.tex
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,34 @@


































Expand Down
34 changes: 17 additions & 17 deletions R.data.Rnw

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions R.data.io.Rnw

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions R.functions.Rnw

Large diffs are not rendered by default.

99 changes: 49 additions & 50 deletions R.intro.Rnw

Large diffs are not rendered by default.

188 changes: 94 additions & 94 deletions R.plotting.Rnw

Large diffs are not rendered by default.

189 changes: 95 additions & 94 deletions R.scripts.Rnw

Large diffs are not rendered by default.

1,005 changes: 103 additions & 902 deletions R.scripts.tex

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions R.stats.rnw

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions appendixes.prj
Original file line number Diff line number Diff line change
Expand Up @@ -5,69 +5,72 @@
1
using-r-main-crc.tex
114
20
1
13
3

using-r-main-crc.Rnw
TeX:RNW:UTF-8
17838075 0 -1 808 -1 809 208 208 1244 731 1 1 115 441 -1 -1 0 0 33 0 0 33 2 0 809 -1 1 3759 -1 0 -1 0
using-r-main-crc.tex
17838075 0 -1 1479 -1 2832 208 208 1244 731 1 1 619 228 -1 -1 0 0 33 0 0 33 2 0 2832 -1 1 3761 -1 0 -1 0
frontmatter\preface.tex
TeX
403714043 0 -1 1459 -1 1016 96 96 2106 707 1 1 465 168 -1 -1 0 0 49 -1 -1 49 1 0 1016 -1 0 -1 0
C:\Program Files\MiKTeX 2.9\tex\latex\polyglossia\gloss-english.ldf
TeX:STY:UNIX
1159154 7 125 1 124 1 0 0 1065 329 0 0 27 1659 -1 -1 0 0 66 0 0 66 1 0 1 124 0 0 0
1060859 0 -1 528 -1 535 130 130 1573 499 0 1 790 133 -1 -1 0 0 18 -1 -1 18 1 0 535 -1 0 -1 0
references.bib
BibTeX
1049586 0 115 3 115 12 0 0 820 242 0 1 155 357 -1 -1 0 0 23 0 0 23 1 0 12 115 0 -1 0
using-r-main-crc.aux
TeX:AUX:UNIX
1159154 7 13 1 12 1 256 256 2196 867 1 0 87 126 -1 -1 0 0 7 0 0 7 1 0 1 12 0 0 0
using-r-main-crc.toc
TeX:AUX:UNIX
1159154 7 3 1 2 1 288 288 2228 899 1 0 87 42 -1 -1 0 0 103 0 0 103 1 0 1 2 0 0 0
using-r-main-crc.lof
TeX:AUX:UNIX
1159154 7 3 1 2 1 0 0 1940 611 1 0 87 42 -1 -1 0 0 103 0 0 103 1 0 1 2 0 0 0
frontmatter\preface.tex
TeX
1060859 0 -1 10314 -1 10317 130 130 1573 499 0 1 45 525 -1 -1 0 0 18 -1 -1 18 1 0 10317 -1 0 -1 0
1049586 0 307 1 307 1 0 0 820 242 0 1 43 608 -1 -1 0 0 23 0 0 23 1 0 1 307 0 -1 0
.gitignore
DATA
273678578 0 0 1 25 1 25 25 1741 444 1 0 79 475 -1 -1 0 0 12 0 0 12 1 0 1 25 0 0 0
R.intro.Rnw
TeX:RNW
17838075 0 -1 8092 -1 8122 182 182 1218 705 1 1 725 1701 -1 -1 0 0 261 -1 -1 261 1 0 8122 -1 0 -1 0
17838075 4 -1 560 -1 561 182 182 1218 705 1 1 997 266 -1 -1 0 0 261 -1 -1 261 1 0 561 -1 0 -1 0
R.as.calculator.Rnw
TeX:RNW
17838075 7 -1 49485 -1 49486 26 26 1062 549 1 1 345 441 -1 -1 0 0 31 -1 -1 31 3 0 49486 -1 1 18276 -1 2 29925 -1 0 -1 0
17838075 4 -1 566 -1 567 26 26 1062 549 1 1 1033 266 -1 -1 0 0 31 -1 -1 31 3 0 567 -1 1 18376 -1 2 30102 -1 0 -1 0
R.scripts.Rnw
TeX:RNW
17838075 1 -1 721 -1 1508 78 78 1114 601 1 1 1175 609 -1 -1 0 0 31 -1 -1 31 2 0 1508 -1 1 59225 -1 0 -1 0
17838075 0 -1 468 -1 474 78 78 1114 601 1 1 565 266 -1 -1 0 0 31 -1 -1 31 2 0 474 -1 1 59690 -1 0 -1 0
R.stats.rnw
TeX:RNW
17838075 0 -1 1679 -1 1678 26 26 931 556 1 1 405 231 -1 -1 0 0 31 -1 -1 31 3 0 1678 -1 1 59525 -1 2 63209 -1 0 -1 0
17838075 4 -1 442 -1 443 26 26 931 556 1 1 1033 247 -1 -1 0 0 31 -1 -1 31 3 0 443 -1 1 59555 -1 2 63238 -1 0 -1 0
R.functions.Rnw
TeX:RNW
17838075 1 -1 830 -1 1302 130 130 1166 653 1 1 105 420 -1 -1 0 0 264 -1 -1 264 1 0 1302 -1 0 -1 0
17838075 0 -1 531 -1 532 130 130 1166 653 1 1 1006 228 -1 -1 0 0 264 -1 -1 264 1 0 532 -1 0 -1 0
R.data.Rnw
TeX:RNW
17838075 1 -1 892 -1 1815 26 26 977 443 1 1 1005 546 -1 -1 0 0 31 -1 -1 31 2 0 1815 -1 1 41772 -1 0 -1 0
17838075 4 -1 542 -1 543 26 26 977 443 1 1 655 266 -1 -1 0 0 31 -1 -1 31 2 0 543 -1 1 41796 -1 0 -1 0
R.plotting.Rnw
TeX:RNW
17838075 0 -1 156919 -1 157622 130 130 1166 559 1 1 105 714 -1 -1 0 0 31 -1 -1 31 3 0 157622 -1 1 144001 -1 2 110818 -1 0 -1 0
C:\Program Files\MiKTeX 2.9\tex\latex\biblatex\biblatex.sty
TeX:STY:UNIX
1159154 0 0 1 0 1 64 64 977 575 0 0 27 0 -1 -1 0 0 42 0 0 42 1 0 1 0 0 0 0
17838075 4 -1 493 -1 494 130 130 1166 559 1 1 1123 247 -1 -1 0 0 31 -1 -1 31 3 0 494 -1 1 143953 -1 2 110795 -1 0 -1 0
R.data.io.Rnw
TeX:RNW
17838075 0 -1 32035 -1 32033 0 0 1498 379 1 1 1145 441 -1 -1 0 0 31 -1 -1 31 1 0 32033 -1 0 -1 0
17838075 0 -1 586 -1 183 0 0 1498 379 1 1 106 114 -1 -1 0 0 31 -1 -1 31 1 0 183 -1 0 -1 0
using-r-main-crc.tex
TeX
135278587 0 -1 836315 -1 836320 96 96 2036 707 1 1 597 589 -1 -1 0 0 49 -1 -1 49 1 0 836320 -1 0 -1 0
C:\Program Files\MiKTeX 2.9\tex\latex\polyglossia\gloss-english.ldf
TeX:STY:UNIX
269594610 7 125 1 124 1 0 0 1065 329 0 0 25 612 -1 -1 0 0 66 0 0 66 1 0 1 124 0 0 0
using-r-main-crc.toc
TeX:AUX:UNIX
269594610 0 348 56 348 61 288 288 2228 899 1 0 553 340 -1 -1 0 0 103 0 0 103 1 0 61 348 0 0 0
using-r-main-crc.lof
TeX:AUX:UNIX
269594610 7 3 1 2 1 0 0 1940 611 1 0 73 34 -1 -1 0 0 103 0 0 103 1 0 1 2 0 0 0
C:\Program Files\MiKTeX 2.9\tex\latex\polyglossia\gloss-latex.ldf
TeX:STY:UNIX
1159154 6 8 1 7 1 288 288 2298 899 1 0 87 147 -1 -1 0 0 -1 -1 -1 -1 1 0 1 7 0 0 0
usingr.sty
TeX:STY
1060850 2 121 43 121 56 234 234 1270 724 0 0 577 441 -1 -1 0 0 25 0 0 25 1 0 56 121 0 0 0
269594610 6 8 1 7 1 288 288 2228 899 1 0 73 119 -1 -1 0 0 73 0 0 73 1 0 1 7 0 0 0
rbooks.bib
BibTeX:UNIX
1147890 0 331 38 328 36 52 52 872 313 1 1 455 357 -1 -1 0 0 21 0 0 21 1 0 36 328 0 -1 0
269583346 0 331 38 328 36 52 52 872 313 1 1 369 357 -1 -1 0 0 21 0 0 21 1 0 36 328 0 -1 0
usingr.sty
TeX:STY
269496306 2 121 43 121 56 234 234 1270 724 0 0 465 425 -1 -1 0 0 25 0 0 25 1 0 56 121 0 0 0
C:\Program Files\MiKTeX 2.9\tex\latex\biblatex\biblatex.sty
TeX:STY:UNIX
269594610 2 7977 70 7977 73 64 64 977 575 0 0 601 306 -1 -1 0 0 42 0 0 42 1 0 73 7977 0 0 0
using-r-main-crc.aux
TeX:AUX:UNIX
269594610 2 291 132 291 137 256 256 2196 867 1 0 1161 306 -1 -1 0 0 7 0 0 7 1 0 137 291 0 0 0
C:\ProgramData\MiKTeX\2.9\miktex\log\miktex-fc-cache_admin.log
DATA
273678578 0 0 1 0 1 32 32 2042 643 1 0 87 0 -1 -1 0 0 -1 -1 -1 -1 1 0 1 0 0 0 0
Expand Down Expand Up @@ -347,9 +350,6 @@ ASCII
C:\Users\aphalo\AppData\Local\RStudio-Desktop\monitored\user-settings\user-settings
TeX:UNIX
269594619 0 -1 0 -1 0 200 200 1568 675 0 1 41 -101 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 0 0
.gitignore
DATA
273678578 0 0 1 13 6 25 25 1741 444 1 0 122 208 -1 -1 0 0 -1 -1 -1 -1 1 0 6 13 0 0 0

*using-r-main-crc.tex
>
Expand Down
Loading

0 comments on commit 6c7dc38

Please sign in to comment.