Skip to content

Commit 7cc5168

Browse files
dsass1dsass1
committed
attempt merge
Merge branch 'main' of github.com:NUstat/intro-stat-data-sci # Conflicts: # intro-stat-data-sci.Rproj
2 parents 9ca41fb + 2bb6692 commit 7cc5168

File tree

5 files changed

+70
-57
lines changed

5 files changed

+70
-57
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,16 @@ jobs:
2828
with:
2929
r-version: '4.4.1'
3030

31-
- name: Install curl
32-
run: |-
33-
Rscript -e "install.packages(c('curl'), repos = 'https://demo.rstudiopm.com/all/__linux__/bionic/latest')"
31+
# - name: Install curl and ragg
32+
# run: |-
33+
# Rscript -e "install.packages(c('curl', 'ragg'), repos = 'https://demo.rstudiopm.com/all/__linux__/bionic/latest')"
3434

3535
- name: Install Dependencies
3636
run: |
3737
sudo apt-get update
3838
sudo apt-get install libcurl4-openssl-dev libssl-dev
3939
sudo apt-get install libharfbuzz-dev libfribidi-dev libfontconfig1-dev
40+
sudo apt-get install libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev
4041
4142
- name: Install R Dependencies
4243
uses: r-lib/actions/setup-renv@v2

‎09-sampling-distributions.qmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ In @tbl-SE-table-ch-9 we provide properties of some estimators, including their
833833
#| tbl-cap: "Properties of Sample Statistics"
834834
#| echo: false
835835
#| message: false
836+
836837
if(!file.exists("rds/ch9_SE_table.rds")){
837838
ch9_SE_table <- "https://docs.google.com/spreadsheets/d/e/2PACX-1vQXpL0Gv4FJDpLdvfVOyyoUiwPzBxgzApeBrl9GGYOSRg6jBIGdonQFHvdQQl3lMFQQR3PAmxx7y6FQ/pub?gid=164147569&single=true&output=csv" %>%
838839
read_csv(na = "")
@@ -842,9 +843,8 @@ if(!file.exists("rds/ch9_SE_table.rds")){
842843
}
843844
844845
ch9_SE_table %>%
845-
kable(
846+
kbl(
846847
format = "markdown",
847-
caption = "Properties of Sample Statistics",
848848
booktabs = TRUE,
849849
escape = FALSE
850850
) %>%

‎_quarto.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ biblio-style: apalike
7676
format:
7777
html:
7878
theme: cosmo
79+
include-in-header: in-line_math_mode.html
7980
# pdf:
8081
# documentclass: scrreprt
8182
# include-in-header:

‎in-line_math_mode.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<script>
2+
MathJax = {
3+
tex: {
4+
inlineMath: [['$', '$'], ['\\(', '\\)']]
5+
}
6+
};
7+
</script>
8+
<script id="MathJax-script" async
9+
src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js">
10+
</script>

‎renv.lock‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"R": {
3-
"Version": "4.4.1",
3+
"Version": "4.4.2",
44
"Repositories": [
55
{
66
"Name": "CRAN",
@@ -68,18 +68,18 @@
6868
},
6969
"MASS": {
7070
"Package": "MASS",
71-
"Version": "7.3-61",
71+
"Version": "7.3-64",
7272
"Source": "Repository",
7373
"Repository": "CRAN",
74-
"Hash": "0cafd6f0500e5deba33be22c46bf6055",
74+
"Hash": "49d2d8090b74c1179df1aff16201caf8",
7575
"Requirements": []
7676
},
7777
"Matrix": {
7878
"Package": "Matrix",
79-
"Version": "1.7-1",
79+
"Version": "1.7-2",
8080
"Source": "Repository",
8181
"Repository": "CRAN",
82-
"Hash": "5122bb14d8736372411f955e1b16bc8a",
82+
"Hash": "f6a81550f166acbe2cd5229e9ca079b9",
8383
"Requirements": [
8484
"lattice"
8585
]
@@ -148,18 +148,18 @@
148148
},
149149
"bit": {
150150
"Package": "bit",
151-
"Version": "4.5.0",
151+
"Version": "4.5.0.1",
152152
"Source": "Repository",
153153
"Repository": "CRAN",
154-
"Hash": "5dc7b2677d65d0e874fc4aaf0e879987",
154+
"Hash": "f89f074e0e49bf1dbe3eba0a15a91476",
155155
"Requirements": []
156156
},
157157
"bit64": {
158158
"Package": "bit64",
159-
"Version": "4.5.2",
159+
"Version": "4.6.0-1",
160160
"Source": "Repository",
161161
"Repository": "CRAN",
162-
"Hash": "e84984bf5f12a18628d9a02322128dfd",
162+
"Hash": "4f572fbc586294afff277db583b9060f",
163163
"Requirements": [
164164
"bit"
165165
]
@@ -196,10 +196,10 @@
196196
},
197197
"bslib": {
198198
"Package": "bslib",
199-
"Version": "0.8.0",
199+
"Version": "0.9.0",
200200
"Source": "Repository",
201201
"Repository": "CRAN",
202-
"Hash": "b299c6741ca9746fb227debcb0f9fb6c",
202+
"Hash": "70a6489cc254171fb9b4a7f130f44dca",
203203
"Requirements": [
204204
"base64enc",
205205
"cachem",
@@ -283,10 +283,10 @@
283283
},
284284
"cluster": {
285285
"Package": "cluster",
286-
"Version": "2.1.6",
286+
"Version": "2.1.8",
287287
"Source": "Repository",
288288
"Repository": "CRAN",
289-
"Hash": "0aaa05204035dc43ea0004b9c76611dd",
289+
"Hash": "b361779da7f8b129a1859b6cf243ba58",
290290
"Requirements": []
291291
},
292292
"colorspace": {
@@ -324,10 +324,10 @@
324324
},
325325
"cpp11": {
326326
"Package": "cpp11",
327-
"Version": "0.5.0",
327+
"Version": "0.5.1",
328328
"Source": "Repository",
329329
"Repository": "CRAN",
330-
"Hash": "91570bba75d0c9d3f1040c835cee8fba",
330+
"Hash": "9df43854f1c84685d095ed6270b52387",
331331
"Requirements": []
332332
},
333333
"crayon": {
@@ -340,18 +340,18 @@
340340
},
341341
"curl": {
342342
"Package": "curl",
343-
"Version": "6.0.1",
343+
"Version": "6.2.0",
344344
"Source": "Repository",
345345
"Repository": "CRAN",
346-
"Hash": "e8ba62486230951fcd2b881c5be23f96",
346+
"Hash": "b580cbb010099fd990df6bfe44459e1a",
347347
"Requirements": []
348348
},
349349
"data.table": {
350350
"Package": "data.table",
351-
"Version": "1.16.2",
351+
"Version": "1.16.4",
352352
"Source": "Repository",
353353
"Repository": "CRAN",
354-
"Hash": "2e00b378fc3be69c865120d9f313039a",
354+
"Hash": "38bbf05fc2503143db4c734a7e5cab66",
355355
"Requirements": []
356356
},
357357
"dbplyr": {
@@ -437,10 +437,10 @@
437437
},
438438
"evaluate": {
439439
"Package": "evaluate",
440-
"Version": "1.0.1",
440+
"Version": "1.0.3",
441441
"Source": "Repository",
442442
"Repository": "CRAN",
443-
"Hash": "3fd29944b231036ad67c3edb32e02201",
443+
"Hash": "e9651417729bbe7472e32b5027370e79",
444444
"Requirements": []
445445
},
446446
"fansi": {
@@ -503,10 +503,10 @@
503503
},
504504
"foreign": {
505505
"Package": "foreign",
506-
"Version": "0.8-87",
506+
"Version": "0.8-88",
507507
"Source": "Repository",
508508
"Repository": "CRAN",
509-
"Hash": "81fc09bdeab0077a73927ed1243404b6",
509+
"Hash": "ffaf42daf543339d0961120cb1de57b8",
510510
"Requirements": []
511511
},
512512
"formula.tools": {
@@ -815,10 +815,10 @@
815815
},
816816
"janitor": {
817817
"Package": "janitor",
818-
"Version": "2.2.0",
818+
"Version": "2.2.1",
819819
"Source": "Repository",
820820
"Repository": "CRAN",
821-
"Hash": "5baae149f1082f466df9d1442ba7aa65",
821+
"Hash": "64f308bf1fbf5f856cdf4b4c7c0ce51b",
822822
"Requirements": [
823823
"dplyr",
824824
"hms",
@@ -915,10 +915,10 @@
915915
},
916916
"lubridate": {
917917
"Package": "lubridate",
918-
"Version": "1.9.3",
918+
"Version": "1.9.4",
919919
"Source": "Repository",
920920
"Repository": "CRAN",
921-
"Hash": "680ad542fbcf801442c83a6ac5a2126c",
921+
"Hash": "be38bc740fc51783a78edb5a157e4104",
922922
"Requirements": [
923923
"generics",
924924
"timechange"
@@ -1014,28 +1014,28 @@
10141014
},
10151015
"mvtnorm": {
10161016
"Package": "mvtnorm",
1017-
"Version": "1.3-2",
1017+
"Version": "1.3-3",
10181018
"Source": "Repository",
10191019
"Repository": "CRAN",
1020-
"Hash": "9e8405eacb262c0a939e121650247f4b",
1020+
"Hash": "c7241e6be9d6df551a2e539a50f5c875",
10211021
"Requirements": []
10221022
},
10231023
"nlme": {
10241024
"Package": "nlme",
1025-
"Version": "3.1-166",
1025+
"Version": "3.1-167",
10261026
"Source": "Repository",
10271027
"Repository": "CRAN",
1028-
"Hash": "ccbb8846be320b627e6aa2b4616a2ded",
1028+
"Hash": "abd9318b4073223646c0f9d3ed641904",
10291029
"Requirements": [
10301030
"lattice"
10311031
]
10321032
},
10331033
"nnet": {
10341034
"Package": "nnet",
1035-
"Version": "7.3-19",
1035+
"Version": "7.3-20",
10361036
"Source": "Repository",
10371037
"Repository": "CRAN",
1038-
"Hash": "2c797b46eea7fb58ede195bc0b1f1138",
1038+
"Hash": "c955edf99ff24a32e96bd0a22645af60",
10391039
"Requirements": []
10401040
},
10411041
"nycflights13": {
@@ -1066,10 +1066,10 @@
10661066
},
10671067
"openssl": {
10681068
"Package": "openssl",
1069-
"Version": "2.2.2",
1069+
"Version": "2.3.2",
10701070
"Source": "Repository",
10711071
"Repository": "CRAN",
1072-
"Hash": "d413e0fef796c9401a4419485f709ca1",
1072+
"Hash": "bc54d87ebf858b28de18df4bca6528d3",
10731073
"Requirements": [
10741074
"askpass"
10751075
]
@@ -1098,13 +1098,12 @@
10981098
},
10991099
"pillar": {
11001100
"Package": "pillar",
1101-
"Version": "1.9.0",
1101+
"Version": "1.10.1",
11021102
"Source": "Repository",
11031103
"Repository": "CRAN",
1104-
"Hash": "15da5a8412f317beeee6175fbc76f4bb",
1104+
"Hash": "8b16b6097daef84cd3c40a6a7c5c9d86",
11051105
"Requirements": [
11061106
"cli",
1107-
"fansi",
11081107
"glue",
11091108
"lifecycle",
11101109
"rlang",
@@ -1130,10 +1129,10 @@
11301129
},
11311130
"processx": {
11321131
"Package": "processx",
1133-
"Version": "3.8.4",
1132+
"Version": "3.8.5",
11341133
"Source": "Repository",
11351134
"Repository": "CRAN",
1136-
"Hash": "0c90a7d71988856bad2a2a45dd871bb9",
1135+
"Hash": "790b1edafbd9980aeb8c3d77e3b0ba33",
11371136
"Requirements": [
11381137
"R6",
11391138
"ps"
@@ -1162,10 +1161,10 @@
11621161
},
11631162
"purrr": {
11641163
"Package": "purrr",
1165-
"Version": "1.0.2",
1164+
"Version": "1.0.4",
11661165
"Source": "Repository",
11671166
"Repository": "CRAN",
1168-
"Hash": "1cba04a4e9414bdefc9dcaa99649a8dc",
1167+
"Hash": "cc8b5d43f90551fa6df0a6be5d640a4f",
11691168
"Requirements": [
11701169
"cli",
11711170
"lifecycle",
@@ -1287,10 +1286,10 @@
12871286
},
12881287
"rlang": {
12891288
"Package": "rlang",
1290-
"Version": "1.1.4",
1289+
"Version": "1.1.5",
12911290
"Source": "Repository",
12921291
"Repository": "CRAN",
1293-
"Hash": "3eec01f8b1dee337674b2e34ab1f9bc1",
1292+
"Hash": "724dcc1490cd7071ee75ca2994a5446e",
12941293
"Requirements": []
12951294
},
12961295
"rmarkdown": {
@@ -1314,10 +1313,10 @@
13141313
},
13151314
"rpart": {
13161315
"Package": "rpart",
1317-
"Version": "4.1.23",
1316+
"Version": "4.1.24",
13181317
"Source": "Repository",
13191318
"Repository": "CRAN",
1320-
"Hash": "b3d390424f41d04174cccf84d49676c2",
1319+
"Hash": "ad31b457482eda7a12e51c5d8e7b0be4",
13211320
"Requirements": []
13221321
},
13231322
"rstudioapi": {
@@ -1468,24 +1467,26 @@
14681467
},
14691468
"systemfonts": {
14701469
"Package": "systemfonts",
1471-
"Version": "1.1.0",
1470+
"Version": "1.2.1",
14721471
"Source": "Repository",
14731472
"Repository": "CRAN",
1474-
"Hash": "213b6b8ed5afbf934843e6c3b090d418",
1473+
"Hash": "f8b2924480a2679e2bad9750646112fe",
14751474
"Requirements": [
14761475
"cpp11",
1476+
"jsonlite",
14771477
"lifecycle"
14781478
]
14791479
},
14801480
"textshaping": {
14811481
"Package": "textshaping",
1482-
"Version": "0.4.0",
1482+
"Version": "1.0.0",
14831483
"Source": "Repository",
14841484
"Repository": "CRAN",
1485-
"Hash": "5142f8bc78ed3d819d26461b641627ce",
1485+
"Hash": "5d44adc8145c718066b0bc374d142ca1",
14861486
"Requirements": [
14871487
"cpp11",
14881488
"lifecycle",
1489+
"stringi",
14891490
"systemfonts"
14901491
]
14911492
},
@@ -1710,10 +1711,10 @@
17101711
},
17111712
"xfun": {
17121713
"Package": "xfun",
1713-
"Version": "0.49",
1714+
"Version": "0.50",
17141715
"Source": "Repository",
17151716
"Repository": "CRAN",
1716-
"Hash": "8687398773806cfff9401a2feca96298",
1717+
"Hash": "44ab88837d3f8dfc66a837299b887fa6",
17171718
"Requirements": []
17181719
},
17191720
"xml2": {

0 commit comments

Comments
 (0)