diff --git a/.Rproj.user/9DAE6990/pcs/source-pane.pper b/.Rproj.user/9DAE6990/pcs/source-pane.pper index 1743e40fec30e357993d33f5cb053bf027524dc8..70829f67631c05a34ae267bf4377c69a6b3ef1c1 100644 --- a/.Rproj.user/9DAE6990/pcs/source-pane.pper +++ b/.Rproj.user/9DAE6990/pcs/source-pane.pper @@ -1,3 +1,3 @@ { - "activeTab" : 0 + "activeTab" : 1 } \ No newline at end of file diff --git a/.Rproj.user/9DAE6990/pcs/workbench-pane.pper b/.Rproj.user/9DAE6990/pcs/workbench-pane.pper index 0e24b84668267375c3af4d7b1fa78f9deec24784..b15bf239a65db2c71879040ca11430d12ee3e636 100644 --- a/.Rproj.user/9DAE6990/pcs/workbench-pane.pper +++ b/.Rproj.user/9DAE6990/pcs/workbench-pane.pper @@ -1,5 +1,5 @@ { - "TabSet1" : 0, + "TabSet1" : 3, "TabSet2" : 0, "TabZoom" : { } diff --git a/.Rproj.user/9DAE6990/persistent-state b/.Rproj.user/9DAE6990/persistent-state index d666209cd705e4938aa98c38be0c2e41169213dc..cb9ff843b5c8465a7cdfef95a8b03af4ac69a49f 100644 --- a/.Rproj.user/9DAE6990/persistent-state +++ b/.Rproj.user/9DAE6990/persistent-state @@ -1,6 +1,6 @@ build-last-errors="[]" build-last-errors-base-dir="~/Documents/PhD/stuart_package/stuart/" -build-last-outputs="[{\"output\":\"==> R CMD INSTALL --no-multiarch --with-keep.source stuart\\n\\n\",\"type\":0},{\"output\":\"* installing to library ‘/Library/Frameworks/R.framework/Versions/4.0/Resources/library’\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"* installing *source* package ‘stuart’ ...\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** using staged installation\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** R\\n\",\"type\":1},{\"output\":\"** data\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"*** moving datasets to lazyload DB\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** inst\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** byte-compile and prepare package for lazy loading\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** help\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"*** installing help indices\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** building package indices\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** installing vignettes\\n\",\"type\":1},{\"output\":\"** testing if installed package can be loaded from temporary location\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** testing if installed package can be loaded from final location\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** testing if installed package keeps a record of temporary installation path\\n\",\"type\":1},{\"output\":\"* DONE (stuart)\\n\",\"type\":1},{\"output\":\"\",\"type\":1}]" +build-last-outputs="[{\"output\":\"==> R CMD INSTALL --no-multiarch --with-keep.source stuart\\n\\n\",\"type\":0},{\"output\":\"* installing to library ‘/Library/Frameworks/R.framework/Versions/4.0/Resources/library’\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"* installing *source* package ‘stuart’ ...\\n\",\"type\":1},{\"output\":\"** using staged installation\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** R\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** data\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"*** moving datasets to lazyload DB\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** inst\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** byte-compile and prepare package for lazy loading\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** help\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"*** installing help indices\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** building package indices\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** installing vignettes\\n\",\"type\":1},{\"output\":\"** testing if installed package can be loaded from temporary location\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** testing if installed package can be loaded from final location\\n\",\"type\":1},{\"output\":\"\",\"type\":1},{\"output\":\"** testing if installed package keeps a record of temporary installation path\\n\",\"type\":1},{\"output\":\"* DONE (stuart)\\n\",\"type\":1},{\"output\":\"\",\"type\":1}]" compile_pdf_state="{\"errors\":[],\"output\":\"\",\"running\":false,\"tab_visible\":false,\"target_file\":\"\"}" files.monitored-path="" find-in-files-state="{\"handle\":\"\",\"input\":\"\",\"path\":\"\",\"regex\":true,\"results\":{\"file\":[],\"line\":[],\"lineValue\":[],\"matchOff\":[],\"matchOn\":[]},\"running\":false}" diff --git a/R/mark_estmap.R b/R/mark_estmap.R index c0f2c3b2d1ce04765e5f0bbdf14392eb58a47339..1dc3141b8020e9b57ae75674716ba711ce0ce786 100644 --- a/R/mark_estmap.R +++ b/R/mark_estmap.R @@ -9,7 +9,7 @@ #' @param map object of class map #' @param annot data frame with the annotation of the array used #' @param d a value to identify groups of markers: d is the difference between calculated and known distance with the previous marker, used to identify a new group of markers. Default is 20. -#' @param r a value to identify groups of markers: r is the ratio between calculated and known distance with the previous marker, used to identify a new group of markers. Default is 10. +#' @param r a value to identify groups of markers: r is the ratio between calculated and known distance with the previous marker, used to identify a new group of markers. Default is 5. #' @param n a value to identify which group of markers must be removed: n is the maximum size of a group of markers: markers with incorrect recombination fraction must be isolated or in very small groups. Default is 5. #' #' @import dplyr @@ -17,7 +17,7 @@ #' @export #' #### mark_estmap #### -mark_estmap <- function(tab,map,annot,d=20,r=10,n=5){ +mark_estmap <- function(tab,map,annot,d=20,r=5,n=5){ #initialize variables mark <- c() chr <- c() diff --git a/stuart_1.0.5.tar.gz b/stuart_1.0.5.tar.gz index fc38ea18883033a4984d541d45147a5145112975..a68b2bc0e4921a95683397dd1984122546f0c303 100644 Binary files a/stuart_1.0.5.tar.gz and b/stuart_1.0.5.tar.gz differ