From 3d04c8adafd69243e0d96bcf02a53745b797f037 Mon Sep 17 00:00:00 2001
From: Marie Bourdon <mariefbourdon@gmail.com>
Date: Tue, 31 May 2022 16:52:23 +0200
Subject: [PATCH] 220531 error handling tab_mark
---
.Rproj.user/9DAE6990/pcs/files-pane.pper | 2 +-
.Rproj.user/9DAE6990/pcs/source-pane.pper | 2 +-
.Rproj.user/9DAE6990/pcs/windowlayoutstate.pper | 10 +++++-----
.Rproj.user/9DAE6990/pcs/workbench-pane.pper | 2 +-
R/tab_mark.R | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.Rproj.user/9DAE6990/pcs/files-pane.pper b/.Rproj.user/9DAE6990/pcs/files-pane.pper
index c191ada..aa3d96d 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 1743e40..70829f6 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 ac401d3..c0a4577 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 a729e38..b9fcffa 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 e76f795..3cc24c9 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")
}
--
GitLab