conflict

laura-dangelo · Oct 5, 2023 · b22abc4 · b22abc4
2 parents 839893b + cd14be4
commit b22abc4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/README.Rmd b/README.Rmd
@@ -55,4 +55,8 @@ D’Angelo, L., Canale, A., Yu, Z., Guindani, M. (2023). Bayesian nonparametric
 
 D’Angelo, L., and Denti, F. (2023+). A finite-infinite shared atoms nested model for the Bayesian analysis of large grouped data sets. *Working paper* 0--23.
 
-Denti, F., Camerlenghi, F., Guindani, M., Mira, A., 2023. A Common Atoms Model for the Bayesian Nonparametric Analysis of Nested Data. *Journal of the American Statistical Association*. 118(541), 405--416. \doi{10.1080/01621459.2021.1933499}.
+<<<<<<< HEAD
+Denti, F., Camerlenghi, F., Guindani, M., Mira, A., 2023. A Common Atoms Model for the Bayesian Nonparametric Analysis of Nested Data. *Journal of the American Statistical Association*. 118(541), 405--416. \doi{10.1080/01621459.2021.1933499}.
+=======
+Denti, F., Camerlenghi, F., Guindani, M., Mira, A., 2023. A Common Atoms Model for the Bayesian Nonparametric Analysis of Nested Data. *Journal of the American Statistical Association*. 118(541), 405--416. \doi{10.1080/01621459.2021.1933499}.
+>>>>>>> cd14be43b84a642597e8a43a4205332f77670985
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-
 <!-- README.md is generated from README.Rmd. Please edit that file -->
 
 # SANple v0.0.1 <img src="man/figures/sanple_draft.png" align="right" width="120" />
@@ -16,19 +15,6 @@ models use Gaussian mixtures with a normal-inverse-gamma prior
 distribution on the parameters. Additional functions are provided to
 help analyzing the results of the fitting procedure.
 
-D’Angelo, L., Canale, A., Yu, Z., Guindani, M. (2023). Bayesian
-nonparametric analysis for the detection of spikes in noisy calcium
-imaging data. *Biometrics* 79(2), 1370–1382. <doi:10.1111/biom.13626>.
-
-D’Angelo, L., and Denti, F. (2023+). A finite-infinite shared atoms
-nested model for the Bayesian analysis of large grouped data sets.
-*Working paper* 0–23.
-
-Denti, F., Camerlenghi, F., Guindani, M., Mira, A., 2023. A Common Atoms
-Model for the Bayesian Nonparametric Analysis of Nested Data. *Journal
-of the American Statistical Association*. 118(541), 405–416.
-<doi:10.1080/01621459.2021.1933499>.
-
 ## Installation
 
 You can install the development version of SANple from
@@ -67,7 +53,21 @@ out
 #> Model estimated on 240 total observations and 2 groups 
 #> Total MCMC iterations: 3000 
 #> maxL: 50 - maxK: 50 
-#> Elapsed time: 1.142 secs
+#> Elapsed time: 1.435 secs
 ```
 
 …
+
+# References
+
+D’Angelo, L., Canale, A., Yu, Z., Guindani, M. (2023). Bayesian
+nonparametric analysis for the detection of spikes in noisy calcium
+imaging data. *Biometrics* 79(2), 1370–1382. .
+
+D’Angelo, L., and Denti, F. (2023+). A finite-infinite shared atoms
+nested model for the Bayesian analysis of large grouped data sets.
+*Working paper* 0–23.
+
+Denti, F., Camerlenghi, F., Guindani, M., Mira, A., 2023. A Common Atoms
+Model for the Bayesian Nonparametric Analysis of Nested Data. *Journal
+of the American Statistical Association*. 118(541), 405–416. .