... | ... |
@@ -21,13 +21,13 @@ setClass("GMQLDataset", representation(value = "character")) |
21 | 21 |
#' @rdname GMQLDataset-class |
22 | 22 |
#' @noRd |
23 | 23 |
GMQLDataset <- function(value) { |
24 |
- dataset <- new("GMQLDataset",value = value) |
|
25 |
- return(dataset) |
|
24 |
+ dataset <- new("GMQLDataset",value = value) |
|
25 |
+ return(dataset) |
|
26 | 26 |
} |
27 | 27 |
|
28 | 28 |
setMethod("show", "GMQLDataset", function(object) { |
29 |
- cat("GMQL Dataset \n") |
|
30 |
- cat(" value :",paste(object@value)) |
|
29 |
+ cat("GMQL Dataset \n") |
|
30 |
+ cat(" value :",paste(object@value)) |
|
31 | 31 |
}) |
32 | 32 |
|
33 | 33 |
setGeneric("value", function(.dataset) standardGeneric("value")) |
1 | 1 |
old mode 100644 |
2 | 2 |
new mode 100755 |
... | ... |
@@ -8,8 +8,7 @@ |
8 | 8 |
#' @noRd |
9 | 9 |
#' @return instance of GMQL dataset |
10 | 10 |
#' |
11 |
-setClass("GMQLDataset", |
|
12 |
- representation(value = "character")) |
|
11 |
+setClass("GMQLDataset", representation(value = "character")) |
|
13 | 12 |
|
14 | 13 |
#' GMQLDataset alloc Function |
15 | 14 |
#' |
... | ... |
@@ -22,19 +21,16 @@ setClass("GMQLDataset", |
22 | 21 |
#' @rdname GMQLDataset-class |
23 | 22 |
#' @noRd |
24 | 23 |
GMQLDataset <- function(value) { |
25 |
- dataset <- new("GMQLDataset",value = value) |
|
26 |
- return(dataset) |
|
24 |
+ dataset <- new("GMQLDataset",value = value) |
|
25 |
+ return(dataset) |
|
27 | 26 |
} |
28 | 27 |
|
29 |
-setMethod("show", "GMQLDataset", |
|
30 |
- function(object) |
|
31 |
- { |
|
32 |
- cat("GMQL Dataset \n") |
|
33 |
- cat(" value :",paste(object@value)) |
|
34 |
- }) |
|
28 |
+setMethod("show", "GMQLDataset", function(object) { |
|
29 |
+ cat("GMQL Dataset \n") |
|
30 |
+ cat(" value :",paste(object@value)) |
|
31 |
+}) |
|
35 | 32 |
|
36 | 33 |
setGeneric("value", function(.dataset) standardGeneric("value")) |
37 | 34 |
|
38 | 35 |
setMethod("value", "GMQLDataset", function(.dataset) .dataset@value) |
39 | 36 |
|
40 |
- |
Virtual class DataTable will be removed from the S4Vectors package
in the near future.
... | ... |
@@ -2,7 +2,6 @@ |
2 | 2 |
#' |
3 | 3 |
#' Abstract class representing GMQL dataset |
4 | 4 |
#' |
5 |
-#' @importClassesFrom S4Vectors DataTable |
|
6 | 5 |
#' @slot value value associated to GMQL dataset |
7 | 6 |
#' @name GMQLDataset-class |
8 | 7 |
#' @rdname GMQLDataset-class |
... | ... |
@@ -10,7 +9,6 @@ |
10 | 9 |
#' @return instance of GMQL dataset |
11 | 10 |
#' |
12 | 11 |
setClass("GMQLDataset", |
13 |
- contains = c("DataTable"), |
|
14 | 12 |
representation(value = "character")) |
15 | 13 |
|
16 | 14 |
#' GMQLDataset alloc Function |
... | ... |
@@ -6,7 +6,7 @@ |
6 | 6 |
#' @slot value value associated to GMQL dataset |
7 | 7 |
#' @name GMQLDataset-class |
8 | 8 |
#' @rdname GMQLDataset-class |
9 |
-#' |
|
9 |
+#' @noRd |
|
10 | 10 |
#' @return instance of GMQL dataset |
11 | 11 |
#' |
12 | 12 |
setClass("GMQLDataset", |
... | ... |
@@ -22,7 +22,7 @@ setClass("GMQLDataset", |
22 | 22 |
#' |
23 | 23 |
#' @param value value associated to GMQL dataset |
24 | 24 |
#' @rdname GMQLDataset-class |
25 |
-#' |
|
25 |
+#' @noRd |
|
26 | 26 |
GMQLDataset <- function(value) { |
27 | 27 |
dataset <- new("GMQLDataset",value = value) |
28 | 28 |
return(dataset) |
... | ... |
@@ -13,6 +13,10 @@ setClass("GMQLDataset", |
13 | 13 |
contains = c("DataTable"), |
14 | 14 |
representation(value = "character")) |
15 | 15 |
|
16 |
+#' GMQLDataset alloc Function |
|
17 |
+#' |
|
18 |
+#' Alloc GMQLDataset object with its value |
|
19 |
+#' |
|
16 | 20 |
#' @name GMQLDataset |
17 | 21 |
#' @importFrom methods new |
18 | 22 |
#' |
... | ... |
@@ -31,4 +35,4 @@ setMethod("show", "GMQLDataset", |
31 | 35 |
cat(" value :",paste(object@value)) |
32 | 36 |
}) |
33 | 37 |
|
34 |
- |
|
38 |
+#object <- as.list(substitute(list(...)))[-1L] |
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,34 @@ |
1 |
+#' Class GMQLDataset |
|
2 |
+#' |
|
3 |
+#' Abstract class representing GMQL dataset |
|
4 |
+#' |
|
5 |
+#' @importClassesFrom S4Vectors DataTable |
|
6 |
+#' @slot value value associated to GMQL dataset |
|
7 |
+#' @name GMQLDataset-class |
|
8 |
+#' @rdname GMQLDataset-class |
|
9 |
+#' |
|
10 |
+#' @return instance of GMQL dataset |
|
11 |
+#' |
|
12 |
+setClass("GMQLDataset", |
|
13 |
+ contains = c("DataTable"), |
|
14 |
+ representation(value = "character")) |
|
15 |
+ |
|
16 |
+#' @name GMQLDataset |
|
17 |
+#' @importFrom methods new |
|
18 |
+#' |
|
19 |
+#' @param value value associated to GMQL dataset |
|
20 |
+#' @rdname GMQLDataset-class |
|
21 |
+#' |
|
22 |
+GMQLDataset <- function(value) { |
|
23 |
+ dataset <- new("GMQLDataset",value = value) |
|
24 |
+ return(dataset) |
|
25 |
+} |
|
26 |
+ |
|
27 |
+setMethod("show", "GMQLDataset", |
|
28 |
+ function(object) |
|
29 |
+ { |
|
30 |
+ cat("GMQL Dataset \n") |
|
31 |
+ cat(" value :",paste(object@value)) |
|
32 |
+ }) |
|
33 |
+ |
|
34 |
+ |