Skip to content

Commit 9d15330

Browse files
committed
linted flexible data input
1 parent a362f39 commit 9d15330

3 files changed

Lines changed: 40 additions & 16 deletions

File tree

scripts/atac-multi-wnn.R

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ load(paste0(out_path, "tmp/preamble_image.RData"))
3131
# reference <- LoadH5Seuerat(params["clust.ref", ])
3232

3333
for (i in 1:nrow(samples)) {
34+
name <- samples$name[i]
3435
# the 10x hdf5 file contains both data types.
3536
x <- Read10X_h5(
3637
paste0(
@@ -101,7 +102,7 @@ for (i in 1:nrow(samples)) {
101102

102103
save_figure(
103104
p1,
104-
paste0(samples$name[i], "_counts_vln")
105+
paste0(name, "_counts_vln")
105106
)
106107

107108
# compute nucleosome signal score per cell
@@ -130,7 +131,7 @@ for (i in 1:nrow(samples)) {
130131

131132
save_figure(
132133
p1,
133-
paste0(samples$name[i], "_tss")
134+
paste0(name, "_tss")
134135
)
135136

136137
x$nucleosome_group <- ifelse(
@@ -146,7 +147,7 @@ for (i in 1:nrow(samples)) {
146147

147148
save_figure(
148149
p1,
149-
paste0(samples$name[i], "_frag_histogram")
150+
paste0(name, "_frag_histogram")
150151
)
151152

152153
p1 <- VlnPlot(
@@ -163,7 +164,7 @@ for (i in 1:nrow(samples)) {
163164

164165
save_figure(
165166
p1,
166-
paste0(samples$name[i], "_atac_vln")
167+
paste0(name, "_atac_vln")
167168
)
168169

169170
x <- subset(
@@ -241,7 +242,7 @@ for (i in 1:nrow(samples)) {
241242

242243
save_figure(
243244
p1,
244-
paste0(samples$name[i], "_mapping_dim")
245+
paste0(name, "_mapping_dim")
245246
)
246247

247248
save_H5object(refquery, "refquery_object")
@@ -260,7 +261,7 @@ for (i in 1:nrow(samples)) {
260261

261262
save_figure(
262263
p1,
263-
paste0(samples$name[i], "_depth")
264+
paste0(name, "_depth")
264265
)
265266

266267
x <- RunUMAP(
@@ -331,7 +332,7 @@ for (i in 1:nrow(samples)) {
331332

332333
save_figure(
333334
p1 + p2 + p3,
334-
paste0(samples$name[i], "_clustered"),
335+
paste0(name, "_clustered"),
335336
width = 18,
336337
height = 6
337338
)
@@ -361,7 +362,7 @@ for (i in 1:nrow(samples)) {
361362

362363
save_figure(
363364
p1,
364-
paste0(samples$name[i], "_coverage")
365+
paste0(name, "_coverage")
365366
)
366367

367368
# Get a list of motif position frequency matrices from the JASPAR database
@@ -401,11 +402,11 @@ for (i in 1:nrow(samples)) {
401402

402403
warnings()
403404

404-
x@meta.data$object <- samples$name[i]
405+
x@meta.data$object <- name
405406
x@meta.data$group <- samples$group[i]
406407

407408
assign( # giving names to objects
408-
samples$name[i],
409+
name,
409410
x
410411
)
411412
}

scripts/create-object.R

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,60 @@ out_path <- paste0(args[1], "/")
1414
objects <- list()
1515

1616
load(paste0(out_path, "tmp/preamble_image.RData"))
17+
print(samples)
1718

1819
for (i in 1:nrow(samples)) {
1920
if (dir.exists(samples$dir[i])) {
21+
name <- samples$name[i]
2022
x <- Read10X( # pulling data with no filter
2123
data.dir = samples$dir[i]
2224
)
2325
str_section_head("Raw Object") # logging
26+
message("check 0")
2427

2528
x <- CreateSeuratObject( # certain data will gen null matrix sans filters
2629
counts = x,
2730
project = samples$project[i],
2831
min.cells = params["min.cells", ],
2932
min.features = params["min.features", ]
3033
)
34+
message("check 1")
3135

36+
print(samples$name[i])
3237
x@meta.data$object <- samples$name[i]
3338
x@meta.data$group <- samples$group[i]
39+
print(unique(x$object))
40+
message("check 2")
3441
} else {
3542
# TODO add compatibility with hdf5 format
3643

3744
# it's assumed preformed objs have group and name metadata vars
3845
x <- readRDS(samples$dir[i])
46+
x
47+
message("check 3")
3948
}
4049

50+
message("check 4")
4151
objects <- c(objects, x)
52+
print(objects)
53+
message("check 5")
54+
print(objects)
4255
}
4356

44-
for (i in lenght(objects)) {
57+
length(objects)
58+
59+
for (i in 1:length(objects)) {
4560
x <- objects[[i]]
61+
message("check 6")
62+
print(x)
63+
name <- unique(x$object)
64+
print(name)
4665

4766
x[["percent.mt"]] <- PercentageFeatureSet(
4867
x,
4968
pattern = "(?i)^MT-"
5069
)
70+
message("check 7")
5171

5272
p1 <- VlnPlot(
5373
x,
@@ -61,10 +81,11 @@ for (i in lenght(objects)) {
6181

6282
save_figure(
6383
p1,
64-
paste0(unique(x[[i]]$object), "_unfilt_vln"),
84+
paste0(name, "_unfilt_vln"),
6585
width = 12,
6686
height = 6
6787
)
88+
message("check 8")
6889

6990
p1 <- FeatureScatter(
7091
x,
@@ -80,10 +101,11 @@ for (i in lenght(objects)) {
80101

81102
save_figure(
82103
(p1 + p2),
83-
paste0(unique(x[[i]]$object), "_unfilt_scatter"),
104+
paste0(name, "_unfilt_scatter"),
84105
width = 12,
85106
height = 6
86107
)
108+
message("check 9")
87109

88110
str_section_head("Base Seurat Object") # logging
89111

@@ -96,6 +118,7 @@ for (i in lenght(objects)) {
96118
percent.mt < params["max.percent.mt", ] &
97119
percent.mt > params["min.percent.mt", ]
98120
)
121+
message("check 10")
99122

100123
# norm, dimred, and clustering
101124

@@ -136,7 +159,7 @@ for (i in lenght(objects)) {
136159

137160
save_figure(
138161
(p1 + p2),
139-
paste0(unique(x[[i]]$object), "_var_features"),
162+
paste0(name, "_var_features"),
140163
width = 12,
141164
height = 6
142165
)
@@ -155,7 +178,7 @@ for (i in lenght(objects)) {
155178

156179
save_figure(
157180
(p1 + p2),
158-
paste0(unique(x[[i]]$object), "individual_dimplot"),
181+
paste0(name, "_individual_dimplot"),
159182
width = 12,
160183
height = 6
161184
)

scripts/preamble.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ str_section_head <- function(title) {
5656
message(strrep("=", 80))
5757
message(strrep("=", 80))
5858
message("")
59-
message(paste(samples$name[i], title))
59+
message(paste(name, title))
6060
message("")
6161
message(strrep("=", 80))
6262
message(strrep("=", 80))

0 commit comments

Comments
 (0)