Skip to content

Commit

Permalink
Minor fix in vignettes
Browse files Browse the repository at this point in the history
  • Loading branch information
gdemin committed Jan 24, 2018
1 parent f888859 commit 1e6ca91
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 20 deletions.
29 changes: 18 additions & 11 deletions docs/index.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -445,18 +445,25 @@ Count values less than or equal to 1 in column A of the dataset.
count_col_if(le(1), w$a)
```

**Table of criteria:**

| Excel | R |
|---------|----------|
| "<1" | lt(1) |
| "<=1" | le(1) |
| "<>1" | ne(1) |
| "=1" | eq(1) |
| ">=1" | ge(1) |
| ">1" | gt(1) |

Table of criteria:
```{r echo=FALSE, message=FALSE, warning=FALSE}
library(expss)
tbl_crit = from_text("
Excel R
<1 lt(1)
<=1 le(1)
<>1 ne(1)
=1 eq(1)
>=1 ge(1)
>1 gt(1)
")
knitr::kable(tbl_crit, row.names = FALSE,
format = "html",
table.attr = "style='width:30%;'",
align = "r")
knitr::asis_output("<br>")
```

##### SUM/AVERAGE
Sum all values in the dataset.
Expand Down
4 changes: 2 additions & 2 deletions inst/doc/tables-with-labels.R
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ knitr::asis_output("<br>")

## ----echo=FALSE, message=FALSE, warning=FALSE----------------------------
dict = from_text("
x y
X Y
1 apples
2 oranges
3 peaches
Expand All @@ -368,7 +368,7 @@ knitr::asis_output("<br>")

## ---- eval=FALSE---------------------------------------------------------
# dict = from_text("
# X Y
# x y
# 1 apples
# 2 oranges
# 3 peaches
Expand Down
4 changes: 2 additions & 2 deletions inst/doc/tables-with-labels.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ calculate(w, mean_col_if(lt(3), a, data = sheet(b, c)))
Our dictionary for lookup:
```{r echo=FALSE, message=FALSE, warning=FALSE}
dict = from_text("
x y
X Y
1 apples
2 oranges
3 peaches
Expand All @@ -530,7 +530,7 @@ Code for creating the same dictionary in R:

```{r, eval=FALSE}
dict = from_text("
X Y
x y
1 apples
2 oranges
3 peaches
Expand Down
6 changes: 3 additions & 3 deletions inst/doc/tables-with-labels.html
Original file line number Diff line number Diff line change
Expand Up @@ -5348,10 +5348,10 @@ <h5>VLOOKUP</h5>
<th style="text-align:left;">
</th>
<th style="text-align:left;">
x
X
</th>
<th style="text-align:left;">
y
Y
</th>
</tr>
</thead>
Expand Down Expand Up @@ -5394,7 +5394,7 @@ <h5>VLOOKUP</h5>
<p><br></p>
<p>Code for creating the same dictionary in R:</p>
<pre class="r"><code>dict = from_text(&quot;
X Y
x y
1 apples
2 oranges
3 peaches
Expand Down
4 changes: 2 additions & 2 deletions vignettes/tables-with-labels.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ calculate(w, mean_col_if(lt(3), a, data = sheet(b, c)))
Our dictionary for lookup:
```{r echo=FALSE, message=FALSE, warning=FALSE}
dict = from_text("
x y
X Y
1 apples
2 oranges
3 peaches
Expand All @@ -530,7 +530,7 @@ Code for creating the same dictionary in R:

```{r, eval=FALSE}
dict = from_text("
X Y
x y
1 apples
2 oranges
3 peaches
Expand Down

0 comments on commit 1e6ca91

Please sign in to comment.