Skip to content

Commit f59b38d

Browse files
lambdamoseslambdamoses
committed
Annoying jupyter stuff
Merge branch 'documentation' of https://github.com/pachterlab/voyager into documentation # Conflicts: # vignettes/bivariate.ipynb # vignettes/create_sfe.ipynb # vignettes/create_sfe_v2.ipynb # vignettes/localc.ipynb # vignettes/multispati.ipynb # vignettes/nonspatial.ipynb # vignettes/preprocess_10xv3.ipynb # vignettes/preprocess_atac.ipynb # vignettes/preprocess_clicktag.ipynb # vignettes/preprocess_crispr.ipynb # vignettes/preprocess_multiome.ipynb # vignettes/preprocess_nuclei.ipynb # vignettes/preprocess_splitseq.ipynb # vignettes/preprocess_visium.ipynb # vignettes/sfemethod.ipynb # vignettes/variogram.ipynb # vignettes/vig10_10x_nuclei.ipynb # vignettes/vig11_clicktags.ipynb # vignettes/vig12_crispr.ipynb # vignettes/vig13_10xatac.ipynb # vignettes/vig14_10xmultiome.ipynb # vignettes/vig1_visium_basic.ipynb # vignettes/vig2_visium.ipynb # vignettes/vig3_slideseq_v2.ipynb # vignettes/vig4_cosmx.ipynb # vignettes/vig5_xenium.ipynb # vignettes/vig6_merfish.ipynb # vignettes/vig7_seqfish.ipynb # vignettes/vig8_codex.ipynb # vignettes/vig9_splitseq.ipynb # vignettes/visium_10x.ipynb # vignettes/visium_10x_spatial.ipynb
2 parents 4a2cd91 + 487d062 commit f59b38d

32 files changed

+6655
-21
lines changed

‎vignettes/bivariate.ipynb

+196
Large diffs are not rendered by default.

‎vignettes/create_sfe.ipynb

+180
Large diffs are not rendered by default.

‎vignettes/create_sfe_v2.ipynb

+72
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<<<<<<< HEAD
66
<<<<<<< HEAD
77
<<<<<<< HEAD
8+
<<<<<<< HEAD
89
<<<<<<< HEAD
910
"id": "f7bed1d2",
1011
=======
@@ -19,6 +20,9 @@
1920
=======
2021
"id": "13791cc6",
2122
>>>>>>> documentation-devel
23+
=======
24+
"id": "078ca44a",
25+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
2226
"metadata": {},
2327
"source": [
2428
"---\n",
@@ -45,6 +49,7 @@
4549
<<<<<<< HEAD
4650
<<<<<<< HEAD
4751
<<<<<<< HEAD
52+
<<<<<<< HEAD
4853
<<<<<<< HEAD
4954
"id": "d349a99c",
5055
=======
@@ -59,6 +64,9 @@
5964
=======
6065
"id": "03c706da",
6166
>>>>>>> documentation-devel
67+
=======
68+
"id": "19e52dea",
69+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
6270
"metadata": {
6371
"tags": [
6472
"remove_cell"
@@ -79,6 +87,7 @@
7987
<<<<<<< HEAD
8088
<<<<<<< HEAD
8189
<<<<<<< HEAD
90+
<<<<<<< HEAD
8291
<<<<<<< HEAD
8392
"id": "a273a7b1",
8493
=======
@@ -93,6 +102,9 @@
93102
=======
94103
"id": "01b9f3c1",
95104
>>>>>>> documentation-devel
105+
=======
106+
"id": "efd95de8",
107+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
96108
"metadata": {
97109
"eval": false,
98110
"tags": [
@@ -136,6 +148,7 @@
136148
<<<<<<< HEAD
137149
<<<<<<< HEAD
138150
<<<<<<< HEAD
151+
<<<<<<< HEAD
139152
<<<<<<< HEAD
140153
"id": "3a966e13",
141154
=======
@@ -150,6 +163,9 @@
150163
=======
151164
"id": "e44b2dfa",
152165
>>>>>>> documentation-devel
166+
=======
167+
"id": "e3164045",
168+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
153169
"metadata": {
154170
"lines_to_next_cell": 0,
155171
"name": "setup"
@@ -170,6 +186,7 @@
170186
<<<<<<< HEAD
171187
<<<<<<< HEAD
172188
<<<<<<< HEAD
189+
<<<<<<< HEAD
173190
<<<<<<< HEAD
174191
"id": "683d8ba4",
175192
=======
@@ -184,6 +201,9 @@
184201
=======
185202
"id": "acd9bc7d",
186203
>>>>>>> documentation-devel
204+
=======
205+
"id": "b2fedea5",
206+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
187207
"metadata": {},
188208
"source": [
189209
"## Downloading the data\n",
@@ -199,6 +219,7 @@
199219
<<<<<<< HEAD
200220
<<<<<<< HEAD
201221
<<<<<<< HEAD
222+
<<<<<<< HEAD
202223
<<<<<<< HEAD
203224
"id": "92a66f25",
204225
=======
@@ -213,6 +234,9 @@
213234
=======
214235
"id": "33a6d29f",
215236
>>>>>>> documentation-devel
237+
=======
238+
"id": "d4d76592",
239+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
216240
"metadata": {
217241
"lines_to_next_cell": 0
218242
},
@@ -227,6 +251,7 @@
227251
<<<<<<< HEAD
228252
<<<<<<< HEAD
229253
<<<<<<< HEAD
254+
<<<<<<< HEAD
230255
<<<<<<< HEAD
231256
"id": "6e6baca7",
232257
=======
@@ -241,6 +266,9 @@
241266
=======
242267
"id": "c88e99e6",
243268
>>>>>>> documentation-devel
269+
=======
270+
"id": "e25d738c",
271+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
244272
"metadata": {
245273
"lines_to_next_cell": 0
246274
},
@@ -256,6 +284,7 @@
256284
<<<<<<< HEAD
257285
<<<<<<< HEAD
258286
<<<<<<< HEAD
287+
<<<<<<< HEAD
259288
<<<<<<< HEAD
260289
"id": "d2dbc69d",
261290
=======
@@ -270,6 +299,9 @@
270299
=======
271300
"id": "b7826dc8",
272301
>>>>>>> documentation-devel
302+
=======
303+
"id": "b240129c",
304+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
273305
"metadata": {
274306
"lines_to_next_cell": 0
275307
},
@@ -287,6 +319,7 @@
287319
<<<<<<< HEAD
288320
<<<<<<< HEAD
289321
<<<<<<< HEAD
322+
<<<<<<< HEAD
290323
<<<<<<< HEAD
291324
"id": "4d607753",
292325
=======
@@ -301,6 +334,9 @@
301334
=======
302335
"id": "b8c4b846",
303336
>>>>>>> documentation-devel
337+
=======
338+
"id": "353c191c",
339+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
304340
"metadata": {
305341
"lines_to_next_cell": 0
306342
},
@@ -314,6 +350,7 @@
314350
<<<<<<< HEAD
315351
<<<<<<< HEAD
316352
<<<<<<< HEAD
353+
<<<<<<< HEAD
317354
<<<<<<< HEAD
318355
"id": "761195db",
319356
=======
@@ -328,6 +365,9 @@
328365
=======
329366
"id": "3042c730",
330367
>>>>>>> documentation-devel
368+
=======
369+
"id": "7c420031",
370+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
331371
"metadata": {
332372
"lines_to_next_cell": 0
333373
},
@@ -343,6 +383,7 @@
343383
<<<<<<< HEAD
344384
<<<<<<< HEAD
345385
<<<<<<< HEAD
386+
<<<<<<< HEAD
346387
<<<<<<< HEAD
347388
"id": "78bd2749",
348389
=======
@@ -357,6 +398,9 @@
357398
=======
358399
"id": "84cd0560",
359400
>>>>>>> documentation-devel
401+
=======
402+
"id": "e5ca6623",
403+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
360404
"metadata": {
361405
"lines_to_next_cell": 0
362406
},
@@ -371,6 +415,7 @@
371415
<<<<<<< HEAD
372416
<<<<<<< HEAD
373417
<<<<<<< HEAD
418+
<<<<<<< HEAD
374419
<<<<<<< HEAD
375420
"id": "c4c25f76",
376421
=======
@@ -385,6 +430,9 @@
385430
=======
386431
"id": "3dbed538",
387432
>>>>>>> documentation-devel
433+
=======
434+
"id": "9f4ab409",
435+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
388436
"metadata": {
389437
"lines_to_next_cell": 0
390438
},
@@ -405,6 +453,7 @@
405453
<<<<<<< HEAD
406454
<<<<<<< HEAD
407455
<<<<<<< HEAD
456+
<<<<<<< HEAD
408457
<<<<<<< HEAD
409458
"id": "b82b05b5",
410459
=======
@@ -419,6 +468,9 @@
419468
=======
420469
"id": "942e3c7a",
421470
>>>>>>> documentation-devel
471+
=======
472+
"id": "b355a9a0",
473+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
422474
"metadata": {},
423475
"source": [
424476
"Here, spot locations are provided as a CSV file. There are two columns of particular interest, namely `xcoord` and `ycoord`. The barcode column corresponds to the barcodes in the count matrix. Before calling the `SpatialFeatureExperiment` constructor, the spatial coordinates must be converted to a `sf` data frame using `df2sf()`. The coordinates are centroid positions, so we will indicate that `geometryType=\"POINT\"`. "
@@ -430,6 +482,7 @@
430482
<<<<<<< HEAD
431483
<<<<<<< HEAD
432484
<<<<<<< HEAD
485+
<<<<<<< HEAD
433486
<<<<<<< HEAD
434487
"id": "c8bffe44",
435488
=======
@@ -444,6 +497,9 @@
444497
=======
445498
"id": "14f8f59c",
446499
>>>>>>> documentation-devel
500+
=======
501+
"id": "c38a89f3",
502+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
447503
"metadata": {
448504
"lines_to_next_cell": 0
449505
},
@@ -461,6 +517,7 @@
461517
<<<<<<< HEAD
462518
<<<<<<< HEAD
463519
<<<<<<< HEAD
520+
<<<<<<< HEAD
464521
<<<<<<< HEAD
465522
"id": "97430291",
466523
=======
@@ -475,6 +532,9 @@
475532
=======
476533
"id": "b1222ade",
477534
>>>>>>> documentation-devel
535+
=======
536+
"id": "69181bab",
537+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
478538
"metadata": {
479539
"lines_to_next_cell": 0
480540
},
@@ -488,6 +548,7 @@
488548
<<<<<<< HEAD
489549
<<<<<<< HEAD
490550
<<<<<<< HEAD
551+
<<<<<<< HEAD
491552
<<<<<<< HEAD
492553
"id": "89a5d0af",
493554
=======
@@ -502,6 +563,9 @@
502563
=======
503564
"id": "727adcba",
504565
>>>>>>> documentation-devel
566+
=======
567+
"id": "13225add",
568+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
505569
"metadata": {
506570
"lines_to_next_cell": 0
507571
},
@@ -520,6 +584,7 @@
520584
<<<<<<< HEAD
521585
<<<<<<< HEAD
522586
<<<<<<< HEAD
587+
<<<<<<< HEAD
523588
<<<<<<< HEAD
524589
"id": "4a1696aa",
525590
=======
@@ -534,6 +599,9 @@
534599
=======
535600
"id": "f8184354",
536601
>>>>>>> documentation-devel
602+
=======
603+
"id": "cb3fc274",
604+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
537605
"metadata": {
538606
"lines_to_next_cell": 0
539607
},
@@ -547,6 +615,7 @@
547615
<<<<<<< HEAD
548616
<<<<<<< HEAD
549617
<<<<<<< HEAD
618+
<<<<<<< HEAD
550619
<<<<<<< HEAD
551620
"id": "3951a1be",
552621
=======
@@ -561,6 +630,9 @@
561630
=======
562631
"id": "9ba81c76",
563632
>>>>>>> documentation-devel
633+
=======
634+
"id": "8d3b3d62",
635+
>>>>>>> 487d062df8c9b8a19360e92edfd0678a37ff23f4
564636
"metadata": {},
565637
"outputs": [],
566638
"source": [

0 commit comments

Comments
 (0)