Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions practice/06u2.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 7490a42..f395c41 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -28,6 +28,7 @@ library(tidyverse)

```{r}
Expand Down
6 changes: 3 additions & 3 deletions practice/06u3.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 7490a42..b052158 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -42,6 +42,7 @@ library(tidyverse)

```{r}
Expand Down
6 changes: 3 additions & 3 deletions practice/06u4.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 7490a42..c9107f3 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -58,6 +58,7 @@ library(tidyverse)

```{r}
Expand Down
8 changes: 4 additions & 4 deletions practice/07u2.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index f26d85b..e09f293 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -27,10 +27,11 @@ library(tidyverse)
Это датасет в широком формате: на каждого субъекта (`USUBJID`) должна приходиться только одна строка.

Expand All @@ -10,7 +10,7 @@ index f26d85b..e09f293 100644

-# выполняет user2
-# ветка dm
+dm <- dm %>%
+dm <- dm |>
+ select(USUBJID, SEX, ACTARM)

```
Expand Down
10 changes: 5 additions & 5 deletions practice/07u3.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index f26d85b..754131c 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -37,10 +37,13 @@ library(tidyverse)
Выберите столбец `USUBJID` и столбец `VSORRES` под именем `TEMP`.

Expand All @@ -10,10 +10,10 @@ index f26d85b..754131c 100644

-# выполняет user3
-# ветка vs
+vs <- vs %>%
+vs <- vs |>
+ filter(VSTESTCD == "TEMP", VISITNUM == 1)

+vs <- vs %>%
+vs <- vs |>
+ select(USUBJID, TEMP = VSORRES)
```

Expand Down
10 changes: 5 additions & 5 deletions practice/07u4.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index f26d85b..64015ab 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -53,10 +53,13 @@ library(tidyverse)
Выберите столбец `USUBJID` и столбец `LBORRES` под именем `WBC`.

Expand All @@ -10,10 +10,10 @@ index f26d85b..64015ab 100644

-# выполняет user4
-# ветка lb
+lb <- lb %>%
+lb <- lb |>
+ filter(LBTESTCD == "WBC", VISITNUM == 1)

+lb <- lb %>%
+lb <- lb |>
+ select(USUBJID, WBC = LBORRES)
```

Expand Down
14 changes: 7 additions & 7 deletions practice/08u1.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index b529b70..1f790ec 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
@@ -77,10 +77,12 @@ lb <- lb %>%
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -77,10 +77,12 @@ lb <- lb |>
Уберите строки с пропущенными данными в столбцах `TEMP` и `WBC`.

```{r}
+data <- dm %>%
+ left_join(vs, join_by(USUBJID)) %>%
+data <- dm |>
+ left_join(vs, join_by(USUBJID)) |>
+ left_join(lb, join_by(USUBJID))

-# выполняет ведущий
-# ветка join
-
+data <- data %>%
+data <- data |>
+ filter(!is.na(TEMP) & !is.na(WBC))
```

Expand Down
12 changes: 6 additions & 6 deletions practice/09u1-01.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 42ecc70..2379de4 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
@@ -91,11 +91,7 @@ data <- data %>%
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -91,11 +91,7 @@ data <- data |>
# перекодирование данных здесь

data <- data %>%
data <- data |>
-<<<<<<< HEAD
mutate(TEMP = as.numeric(str_replace(TEMP, ",", ".")))
-=======
Expand All @@ -14,7 +14,7 @@ index 42ecc70..2379de4 100644
```

# 4. Визуализация
@@ -109,11 +105,10 @@ data <- data %>%
@@ -109,11 +105,10 @@ data <- data |>
‼️ Перекодирование данных выполните в общем чанке в главе 3 выше.

```{r}
Expand Down
12 changes: 6 additions & 6 deletions practice/09u1-02.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 3201a45..50233c8 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
@@ -91,11 +91,8 @@ data <- data %>%
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -91,11 +91,8 @@ data <- data |>
# перекодирование данных здесь

data <- data %>%
data <- data |>
-<<<<<<< HEAD
- mutate(WBC = as.numeric(str_replace(WBC, ",", ".")))
-=======
Expand All @@ -16,7 +16,7 @@ index 3201a45..50233c8 100644
```

# 4. Визуализация
@@ -109,14 +106,13 @@ data <- data %>%
@@ -109,14 +106,13 @@ data <- data |>
‼️ Перекодирование данных выполните в общем чанке в главе 3 выше.

```{r}
Expand Down
12 changes: 6 additions & 6 deletions practice/09u2.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 1f790ec..2909b6b 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
@@ -91,7 +91,7 @@ data <- data %>%
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -91,7 +91,7 @@ data <- data |>
# перекодирование данных здесь

data <- data %>%
data <- data |>
- mutate()
+ mutate(TEMP = parse_number(str_replace(TEMP, ",", ".")))
```

# 4. Визуализация
@@ -105,9 +105,8 @@ data <- data %>%
@@ -105,9 +105,8 @@ data <- data |>
‼️ Перекодирование данных выполните в общем чанке в главе 3 выше.

```{r}
Expand Down
12 changes: 6 additions & 6 deletions practice/09u3.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 1f790ec..aa3b322 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
@@ -91,7 +91,7 @@ data <- data %>%
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -91,7 +91,7 @@ data <- data |>
# перекодирование данных здесь

data <- data %>%
data <- data |>
- mutate()
+ mutate(TEMP = as.numeric(str_replace(TEMP, ",", ".")))
```

# 4. Визуализация
@@ -105,9 +105,8 @@ data <- data %>%
@@ -105,9 +105,8 @@ data <- data |>
‼️ Перекодирование данных выполните в общем чанке в главе 3 выше.

```{r}
Expand Down
12 changes: 6 additions & 6 deletions practice/09u4.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
diff --git a/homework_notebook.Rmd b/homework_notebook.Rmd
diff --git a/homework_notebook.qmd b/homework_notebook.qmd
index 1f790ec..aa3b322 100644
--- a/homework_notebook.Rmd
+++ b/homework_notebook.Rmd
@@ -91,7 +91,7 @@ data <- data %>%
--- a/homework_notebook.qmd
+++ b/homework_notebook.qmd
@@ -91,7 +91,7 @@ data <- data |>
# перекодирование данных здесь

data <- data %>%
data <- data |>
- mutate()
+ mutate(WBC = as.numeric(str_replace(WBC, ",", ".")))
```

# 4. Визуализация
@@ -105,9 +105,8 @@ data <- data %>%
@@ -105,9 +105,8 @@ data <- data |>
‼️ Перекодирование данных выполните в общем чанке в главе 3 выше.

```{r}
Expand Down
Loading