Skip to content

Commit

Permalink
将数据探索部分移除,将作为《现代统计图形》第二版 (#141)
Browse files Browse the repository at this point in the history
* 将数据探索部分移除,将作为《现代统计图形》第二版

* svn data

* 移除依赖

* 移除 ggbeeswarm

* add shiny

* add ggstats
  • Loading branch information
XiangyunHuang authored Mar 15, 2024
1 parent 2bee57f commit 3ba31f1
Show file tree
Hide file tree
Showing 26 changed files with 42 additions and 5,806 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/quarto-book-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
pull_request:
branches: main

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

name: Book-MacOS

jobs:
Expand All @@ -25,7 +29,6 @@ jobs:
with:
use-public-rspm: true
r-version: '4.3.3'
extra-repositories: 'https://grantmcdermott.r-universe.dev'

- uses: r-lib/actions/setup-r-dependencies@v2

Expand Down Expand Up @@ -69,10 +72,6 @@ jobs:
tikzDevice::tikzTest("$\\sin(x^2/2 - y^2/4 + 3) \\cos(2 x + 1 - \\exp(y))$")
shell: Rscript {0}

- name: Reinstall R packages from source
run: |
install.packages(c("Matrix", "MatrixModels", "rjags", "lme4", "TMB", "glmmTMB"), repos = "https://cran.r-project.org/", type = "source")
shell: Rscript {0}

- name: Render Book
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/quarto-book-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ on:
pull_request:
branches: main

# https://github.com/dmlc/xgboost/commit/bc516198dccd9fb345ac318c56ee7bb48bba5aae
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

name: Book-Ubuntu

jobs:
Expand All @@ -25,7 +30,6 @@ jobs:
with:
use-public-rspm: true
r-version: '4.3.3'
extra-repositories: 'https://grantmcdermott.r-universe.dev'

- uses: r-lib/actions/setup-r-dependencies@v2

Expand Down Expand Up @@ -67,10 +71,6 @@ jobs:
tikzDevice::tikzTest("$\\sin(x^2/2 - y^2/4 + 3) \\cos(2 x + 1 - \\exp(y))$")
shell: Rscript {0}

- name: Reinstall R packages from source
run: |
install.packages(c("Matrix", "MatrixModels", "rjags", "lme4", "TMB", "glmmTMB"), repos = "https://cran.r-project.org/", type = "source")
shell: Rscript {0}

- name: Setup magick
run: |
Expand Down
24 changes: 2 additions & 22 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Depends:
R (>= 4.3.0)
Imports:
BB,
beanplot,
broom,
car,
coin,
Expand All @@ -30,25 +29,12 @@ Imports:
gifski,
ggalluvial,
gganimate (>= 1.0.9),
ggbeeswarm,
ggbump,
ggdensity,
ggeffects,
ggExtra,
ggforce,
ggfortify,
ggmosaic,
ggnewscale,
ggplot2 (>= 3.5.0),
ggraph (>= 2.2.0),
ggrepel,
ggridges,
ggsignif,
ggstats (>= 0.5.0),
ggstream,
ggthemes (>= 5.0.0),
ggTimeSeries,
ggVennDiagram,
ggstats,
ggwordcloud,
glmnet,
gt (>= 0.10.1),
Expand Down Expand Up @@ -83,30 +69,24 @@ Imports:
RSQLite,
scs,
showtext,
shiny,
spacyr,
text2vec,
tidygraph,
tinyplot,
titanic,
tikzDevice,
treemapify,
TSP,
vcd,
vioplot,
visNetwork,
webshot2,
xml2,
xts
Remotes:
davidsjoberg/ggbump,
davidsjoberg/ggstream
Suggests:
quarto (>= 1.2),
rsconnect (>= 1.1.0)
Enhances:
sp (>= 2.0-0)
SystemRequirements: pgf (>= 3.00)
Additional_repositories:
https://grantmcdermott.r-universe.dev
Encoding: UTF-8
License: CC NC ND 4.0
59 changes: 23 additions & 36 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@

本仓库作为《R 语言数据分析实战》书稿源码的托管地址。目前内容较多的章节有

- 数据探索
- ggplot2 入门
- 基础图形
- 统计图形
- lattice 入门
- graphics 入门
- TikZ 入门
- 探索实践
- 数据交流
- 交互图形
- 交互表格
Expand Down Expand Up @@ -107,35 +99,30 @@ Running under: macOS Sonoma 14.3.1, RStudio 2023.12.1.402
Locale: en_US.UTF-8 / en_US.UTF-8 / en_US.UTF-8 / C / en_US.UTF-8 / en_US.UTF-8
Package version:
BB_2019.10.1 beanplot_1.3.1 broom_1.0.5
car_3.1.2 coin_1.4.3 data.table_1.15.2
datasauRus_0.1.8 dbplyr_2.4.0 downlit_0.4.3
dplyr_1.1.4 DT_0.32 dunn.test_1.3.5
dygraphs_1.1.1.6 e1071_1.7.14 ECOSolveR_0.5.5
GA_3.2.4 ggalluvial_0.12.5 gganimate_1.0.9
ggbeeswarm_0.7.2 ggbump_0.1.99999 ggdensity_1.0.0
ggeffects_1.5.0 ggExtra_0.10.1 ggforce_0.4.2
ggfortify_0.4.16 ggmosaic_0.3.3 ggnewscale_0.4.10
ggplot2_3.5.0 ggraph_2.2.0 ggrepel_0.9.5
ggridges_0.5.6 ggsignif_0.6.4 ggstats_0.5.1
ggstream_0.1.0 ggthemes_5.1.0 ggTimeSeries_1.0.2
ggVennDiagram_1.5.2 ggwordcloud_0.6.1 gifski_1.12.0.2
gt_0.10.1 hexbin_1.28.3 HistData_0.9.1
jiebaR_0.11 kernlab_0.9.32 knitr_1.45
latticeExtra_0.6.30 lvplot_0.2.1 magick_2.8.3
maps_3.4.2 misc3d_0.9.1 nloptr_2.0.3
nomnoml_0.3.0 patchwork_1.2.0 pdftools_3.4.0
plot3D_1.4.1 plotly_4.10.4 pROC_1.18.5
purrr_1.0.2 pwr_1.3.0 quadprog_1.5.8
quantmod_0.4.26 ragg_1.2.7 ROI_1.0.1
ROI.plugin.ecos_1.0.2 ROI.plugin.glpk_1.0.0 ROI.plugin.nloptr_1.0.1
ROI.plugin.quadprog_1.0.1 ROI.plugin.scs_1.1.2 rootSolve_1.8.2.4
RSQLite_2.3.5 scs_3.2.4 showtext_0.9.7
spacyr_1.3.0 text2vec_0.6.4 tidygraph_1.3.1
tikzDevice_0.12.6 tinyplot_0.0.5.9000 titanic_0.1.0
BB_2019.10.1 broom_1.0.5 car_3.1.2
coin_1.4.3 data.table_1.15.2 datasauRus_0.1.8
dbplyr_2.4.0 downlit_0.4.3 dplyr_1.1.4
DT_0.32 dunn.test_1.3.5 dygraphs_1.1.1.6
e1071_1.7.14 ECOSolveR_0.5.5 GA_3.2.4
ggalluvial_0.12.5 gganimate_1.0.9 ggfortify_0.4.16
ggplot2_3.5.0 ggraph_2.2.1 ggrepel_0.9.5
ggridges_0.5.6 ggwordcloud_0.6.1 gifski_1.12.0.2
glmnet_4.1.8 gt_0.10.1 hexbin_1.28.3
HistData_0.9.1 jiebaR_0.11 kernlab_0.9.32
knitr_1.45 latticeExtra_0.6.30 lvplot_0.2.1
magick_2.8.3 maps_3.4.2 misc3d_0.9.1
nloptr_2.0.3 nomnoml_0.3.0 patchwork_1.2.0
pdftools_3.4.0 plot3D_1.4.1 plotly_4.10.4
pROC_1.18.5 purrr_1.0.2 pwr_1.3.0
quadprog_1.5.8 quantmod_0.4.26 ragg_1.2.7
ROI_1.0.1 ROI.plugin.ecos_1.0.2 ROI.plugin.glpk_1.0.0
ROI.plugin.nloptr_1.0.1 ROI.plugin.quadprog_1.0.1 ROI.plugin.scs_1.1.2
rootSolve_1.8.2.4 RSQLite_2.3.5 scs_3.2.4
showtext_0.9.7 spacyr_1.3.0 text2vec_0.6.4
tidygraph_1.3.1 tikzDevice_0.12.6 titanic_0.1.0
treemapify_2.5.6 TSP_1.2.4 vcd_1.4.12
vioplot_0.4.0 visNetwork_2.1.2 webshot2_0.1.1
xml2_1.3.6 xts_0.13.2
visNetwork_2.1.2 webshot2_0.1.1 xml2_1.3.6
xts_0.13.2
```

</details>
9 changes: 0 additions & 9 deletions _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@ book:
- wrangling-cleaning.qmd
- wrangling-manipulation.qmd
- wrangling-processing.qmd
- part: "数据探索"
chapters:
- visualization-basic.qmd
- visualization-intermediate.qmd
- visualization-advanced.qmd
- visualization-lattice.qmd
- visualization-graphics.qmd
- visualization-tikz.qmd
- visualization-practice.qmd
- part: "数据交流"
chapters:
- interactive-graphics.qmd
Expand Down
Binary file removed data/MathAnxiety.rds
Binary file not shown.
Binary file removed data/china-age-sex-2020.rds
Binary file not shown.
Binary file removed data/china-household-sex-2020.rds
Binary file not shown.
Binary file removed data/china-raise-illiteracy-2020.rds
Binary file not shown.
Binary file removed data/china-sex-ratio-2020.rds
Binary file not shown.
1 change: 0 additions & 1 deletion data/contributions.json

This file was deleted.

Binary file removed data/gapminder-2020.rds
Binary file not shown.
Binary file removed data/rongelap.rds
Binary file not shown.
Binary file removed data/rongelap_coastline.rds
Binary file not shown.
Binary file removed data/rversion-2022.rds
Binary file not shown.
Binary file removed data/usa-mortality-2020.rds
Binary file not shown.
Loading

0 comments on commit 3ba31f1

Please sign in to comment.