Skip to content

Commit 817d753

Browse files
author
Osama Mahmoud
committed
Update vignettes
1 parent 3795189 commit 817d753

28 files changed

+800
-761
lines changed

DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Package: BristolVis
22
Type: Package
33
Title: Data visualisation and web applications course
4-
Version: 0.1.0
4+
Version: 0.2.0
55
Authors@R: person("Osama", "Mahmoud", email = "[email protected]", role = c("aut", "cre"))
66
Description: Package for the 'Introduction to data visualisation and web-applications using R' course at the University of Bristol.
77
Depends: R (>= 3.0.3)
88
License: GPL-2 | GPL-3
9-
LazyData: FALSE
9+
LazyData: TRUE
1010
Imports: ggplot2 (>= 2.1.0), reshape2, ggplot2movies, hexbin
1111
Suggests: knitr, rmarkdown
1212
VignetteBuilder: knitr
1313
RoxygenNote: 6.0.1
14-
Repository: Osmahmoud
14+
Repository: statcourses

DESCRIPTION~

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Package: BristolVis
2+
Type: Package
3+
Title: Data visualisation and web applications course
4+
Version: 0.1.0
5+
Authors@R: person("Osama", "Mahmoud", email = "[email protected]", role = c("aut", "cre"))
6+
Description: Package for the 'Introduction to data visualisation and web-applications using R' course at the University of Bristol.
7+
Depends: R (>= 3.0.3)
8+
License: GPL-2 | GPL-3
9+
LazyData: TRUE
10+
Imports: ggplot2 (>= 2.1.0), reshape2, ggplot2movies, hexbin
11+
Suggests: knitr, rmarkdown
12+
VignetteBuilder: knitr
13+
RoxygenNote: 6.0.1
14+
Repository: statcourses

R/datasets.R

+83
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,86 @@
2222
#' @usage data(med)
2323
#' @keywords datasets
2424
NULL
25+
26+
#' Movie information and user ratings from IMDB.com.
27+
#'
28+
#' The internet movie database, \url{http://imdb.com/}, is a
29+
#' website devoted to collecting movie data supplied by
30+
#' studios and fans.
31+
#'
32+
#' It claims to be the biggest movie database on the web
33+
#' and is run by amazon.
34+
#' @name bmov
35+
#' @docType data
36+
#' @usage data(bmov)
37+
#' @return A data frame with 4847 rows and 24 variables.
38+
#' @note Movies were selected for inclusion if they had a known length, had been rated by at least one imdb user and had an mpaa rating. The data set contains the following fields:
39+
#' \describe{
40+
#' \item{title.}{Title of the movie.}
41+
#' \item{year.}{Year of release.}
42+
#' \item{budget.}{Total budget (if known) in US dollars}
43+
#' \item{length.}{Length in minutes.}
44+
#' \item{rating.}{Average IMDB user rating.}
45+
#' \item{votes.}{Number of IMDB users who rated this movie.}
46+
#' \item{r1-10.}{Multiplying by ten gives percentile (to nearest 10\%) of users who rated this movie a 1.}
47+
#' \item{mpaa.}{MPAA rating.}
48+
#' \item{action, animation, comedy, drama, documentary, romance, short.}{Binary variables representing if movie was classified as belonging to that genre.}}
49+
#'@keywords datasets
50+
#' @examples
51+
#' data(bmov)
52+
NULL
53+
54+
#' birthweight
55+
#'
56+
#' @name birthweight
57+
#' @docType data
58+
#' @usage data(birthweight)
59+
#' @return A data frame with 20 rows and 4 variables.
60+
#' @keywords datasets
61+
#' @examples
62+
#' data(birthweight)
63+
NULL
64+
65+
#' bmi
66+
#'
67+
#' @name bmi
68+
#' @docType data
69+
#' @usage data(bmi)
70+
#' @return A data frame with 20 rows and 5 variables.
71+
#' @keywords datasets
72+
#' @examples
73+
#' data(bmi)
74+
NULL
75+
76+
#' disease
77+
#'
78+
#' @name disease
79+
#' @docType data
80+
#' @usage data(disease)
81+
#' @return A data frame with 1000 rows and 7 variables.
82+
#' @keywords datasets
83+
#' @examples
84+
#' data(disease)
85+
NULL
86+
87+
#' lbw
88+
#'
89+
#' @name lbw
90+
#' @docType data
91+
#' @usage data(lbw)
92+
#' @return A data frame with 189 rows and 11 variables.
93+
#' @keywords datasets
94+
#' @examples
95+
#' data(lbw)
96+
NULL
97+
98+
#' us_teams
99+
#'
100+
#' @name us_teams
101+
#' @docType data
102+
#' @usage data(us_teams)
103+
#' @return A data frame with 50 rows and 3 variables.
104+
#' @keywords datasets
105+
#' @examples
106+
#' data(us_teams)
107+
NULL

R/dummy_imports.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#' @import ggplot2 reshape2 ggthemes ggplot2movies hexbin
1+
#' @import ggplot2 reshape2 ggthemes ggplot2movies hexbin shiny
22

33
NULL

README.Rmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The `BristolVis` package includes a number of practical files to guide learners
4141

4242
These practicals can be displayed by:
4343
```{r, eval=FALSE}
44-
vignette("practical1", package = "BristolVis")
44+
vignette("practical2", package = "BristolVis")
4545
```
4646

4747
## The course web-tool

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The `BristolVis` package includes a number of practical files to guide learners
3434
These practicals can be displayed by:
3535

3636
``` r
37-
vignette("practical1", package = "BristolVis")
37+
vignette("practical2", package = "BristolVis")
3838
```
3939

4040
The course web-tool

Test.R

+14-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,21 @@ library(BristolVis)
77
data("med")
88
head(med)
99
?med
10+
data(birthweight, package="BristolVis")
11+
head(birthweight)
12+
data(bmi)
13+
head(bmi)
14+
data(bmov)
15+
head(bmov)
1016

11-
vignette("practical1", package = "BristolVis")
17+
vignette("practical2", package = "BristolVis")
18+
vignette("practical3", package = "BristolVis")
19+
vignette("practical6", package = "BristolVis")
20+
vignette("practical7", package = "BristolVis")
21+
vignette("answers2", package = "BristolVis")
22+
vignette("answers3", package = "BristolVis")
23+
vignette("answers6", package = "BristolVis")
24+
vignette("answers7", package = "BristolVis")
1225

1326
install.packages("drat")
1427
drat::addRepo("statcourses")

data/birthweight.RData

351 Bytes
Binary file not shown.

data/bmi.RData

369 Bytes
Binary file not shown.

data/bmov.RData

107 KB
Binary file not shown.

data/disease.RData

6.89 KB
Binary file not shown.

data/lbw.RData

1.77 KB
Binary file not shown.

data/us_teams.RData

876 Bytes
Binary file not shown.

inst/doc/practical1.R

-72
This file was deleted.

inst/doc/practical1.Rmd

-122
This file was deleted.

0 commit comments

Comments
 (0)