Skip to content

Commit

Permalink
rebuild vignettes
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeConway committed Nov 9, 2016
1 parent bbf2620 commit af117bc
Show file tree
Hide file tree
Showing 6 changed files with 617 additions and 383 deletions.
247 changes: 150 additions & 97 deletions inst/doc/attribute.plots.html

Large diffs are not rendered by default.

219 changes: 136 additions & 83 deletions inst/doc/basic.usage.html

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion inst/doc/queries.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ Myfunc <- function(row, release, rating){
upset(movies, queries = list(list(query = Myfunc, params = list(c(1970,1980, 1990, 1999, 2000), 2.5), color = "blue", active =T)))

## ---- out.width="850px", fig.width=9, fig.height =5, tidy=TRUE, fig.align='center'----
upset(movies, queries = list(list(query = Myfunc, params = list(c(1970,1980, 1990, 1999, 2000), 2.5), color = "orange", active =T), list(query = intersects, params = list("Action", "Drama"), active = F), list(query = elements, params = list("ReleaseDate", 1980, 1990, 2000), color = "red", active = F)), expression = "AvgRating > 3 & Watches > 100")
upset(movies, query.legend = "top", queries = list(list(query = intersects, params = list("Drama", "Comedy", "Action"), color = "orange", active = T, query.name="Funny action"), list(query = intersects, params = list("Drama"), color = "red", active = F), list(query = intersects, params = list("Action", "Drama"), active = T, query.name="Emotional action")))

## ---- out.width="850px", fig.width=9, fig.height =5, tidy=TRUE, fig.align='center'----
upset(movies, query.legend = "bottom", queries = list(list(query = Myfunc, params = list(c(1970,1980, 1990, 1999, 2000), 2.5), color = "orange", active =T), list(query = intersects, params = list("Action", "Drama"), active = F), list(query = elements, params = list("ReleaseDate", 1980, 1990, 2000), color = "red", active = F, query.name="Decades")), expression = "AvgRating > 3 & Watches > 100")

13 changes: 11 additions & 2 deletions inst/doc/queries.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,20 @@ upset(movies, queries = list(list(query = Myfunc, params = list(c(1970,1980, 199

<br>

Example 5: Applying Everything at Once
Example 5: Applying a query legend
--------------
To add a legend for the queries applied, the `query.legend` parameter can be used. The `query.legend` parameter takes the position where the legend should be displayed, either *top* or *bottom*. To apply a specific name to each query, the parameter `query.name` can be used when defining the query in the `queries` paramter. If no `query.name` is provided, a generic name will be used. The example below shows how to do this.
```{r, out.width="850px", fig.width=9, fig.height =5, tidy=TRUE, fig.align='center'}
upset(movies, query.legend = "top", queries = list(list(query = intersects, params = list("Drama", "Comedy", "Action"), color = "orange", active = T, query.name="Funny action"), list(query = intersects, params = list("Drama"), color = "red", active = F), list(query = intersects, params = list("Action", "Drama"), active = T, query.name="Emotional action")))
```

<br>

Example 6: Applying Everything at Once
--------------
Combining pieces from all previous examples into one awesome query!
```{r, out.width="850px", fig.width=9, fig.height =5, tidy=TRUE, fig.align='center'}
upset(movies, queries = list(list(query = Myfunc, params = list(c(1970,1980, 1990, 1999, 2000), 2.5), color = "orange", active =T), list(query = intersects, params = list("Action", "Drama"), active = F), list(query = elements, params = list("ReleaseDate", 1980, 1990, 2000), color = "red", active = F)), expression = "AvgRating > 3 & Watches > 100")
upset(movies, query.legend = "bottom", queries = list(list(query = Myfunc, params = list(c(1970,1980, 1990, 1999, 2000), 2.5), color = "orange", active =T), list(query = intersects, params = list("Action", "Drama"), active = F), list(query = elements, params = list("ReleaseDate", 1980, 1990, 2000), color = "red", active = F, query.name="Decades")), expression = "AvgRating > 3 & Watches > 100")
```


219 changes: 142 additions & 77 deletions inst/doc/queries.html

Large diffs are not rendered by default.

297 changes: 174 additions & 123 deletions inst/doc/set.metadata.plots.html

Large diffs are not rendered by default.

0 comments on commit af117bc

Please sign in to comment.