diff --git a/.Rproj.user/9DAE6990/pcs/files-pane.pper b/.Rproj.user/9DAE6990/pcs/files-pane.pper index c191ada4d25fa0fda4ce490c5f322d65499417ad..aa3d96db46890d28bf29c222a803e29f24a8bdd7 100644 --- a/.Rproj.user/9DAE6990/pcs/files-pane.pper +++ b/.Rproj.user/9DAE6990/pcs/files-pane.pper @@ -1,5 +1,5 @@ { - "path" : "~/Documents/PhD/stuart_package/stuart", + "path" : "~/Documents/PhD/stuart_package/stuart/vignettes", "sortOrder" : [ { "ascending" : true, 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/windowlayoutstate.pper b/.Rproj.user/9DAE6990/pcs/windowlayoutstate.pper index ac401d322000bedd2dd11fee63a3fc025f9da7ee..c0a45770f2e927d61932d2d7ec44eb5df148f3f6 100644 --- a/.Rproj.user/9DAE6990/pcs/windowlayoutstate.pper +++ b/.Rproj.user/9DAE6990/pcs/windowlayoutstate.pper @@ -1,13 +1,13 @@ { "left" : { - "panelheight" : 1402, - "splitterpos" : 362, - "topwindowstate" : "NORMAL", - "windowheight" : 1440 + "panelheight" : 762, + "splitterpos" : 196, + "topwindowstate" : "MAXIMIZE", + "windowheight" : 800 }, "right" : { "panelheight" : 1402, - "splitterpos" : 879, + "splitterpos" : 878, "topwindowstate" : "NORMAL", "windowheight" : 1440 } diff --git a/.Rproj.user/9DAE6990/pcs/workbench-pane.pper b/.Rproj.user/9DAE6990/pcs/workbench-pane.pper index a729e387a19b91f4e513ea26cf9b52c3ac4a943d..b9fcffa7969da03fcda0fc797bd2d2041388fd6e 100644 --- a/.Rproj.user/9DAE6990/pcs/workbench-pane.pper +++ b/.Rproj.user/9DAE6990/pcs/workbench-pane.pper @@ -1,6 +1,6 @@ { "TabSet1" : 1, - "TabSet2" : 0, + "TabSet2" : 3, "TabZoom" : { } } \ No newline at end of file diff --git a/R/tab_mark.R b/R/tab_mark.R index e76f795053748bb99cd25243079a1c8b5fa6e0d5..3cc24c9c4c2011a9b6bd5029cb85fa10b0407560 100755 --- a/R/tab_mark.R +++ b/R/tab_mark.R @@ -15,11 +15,11 @@ ## create table with markers and counts tab_mark <- function(geno,annot,pos){ #stop if no annot or pos - if(rapportools::is.empty(annot)==FALSE){ + if(all(rapportools::is.empty(annot)==TRUE)){ stop("No annotation data") } - if(rapportools::is.empty(pos)==FALSE){ + if(rapportools::is.empty(pos)==TRUE){ stop("No position data") }