Skip to content

Commit d993928

Browse files
authored
Release 3.12 (#31)
* fix for #18 (#19) - incorrect use of `$assay` replaced with `$data` for DatasetExperiment objects - specify SummarizedExperiment package as source of `rowData` and `colData` functions * fix for #20 (#21) data now gets passed through as intended when model_seq is being used. Allows seq_in to be used at the nth step in a sequence * fix for #20 (#23) data now gets passed through as intended when model_seq is being used. Allows seq_in to be used at the nth step in a sequence * Issue 22 seq in (#24) * add seq_in generics * add seq_in methods - added methods for models to get.set seq_in - added checks for valid input/output names to seq_in and predicted_name methods * update documentation * use correct input param id * update documentation - use of input_1 instead of value_1 fixed in examples - corrected rdname for seq_in * add as.code method (#25) * add as.code method produces a string of text that can be used to recreate the model/sequence/iterator * use correct input parameter names cmd check fails if examples dont run * Issue 27 citations (#29) * add citations and libraries methods for #27 - these methods scan over all inherited objects and generate a complte ist of citations/libraries - a citations slot has been added to struct_class * use bibtex for citations The citations slot is now a list of bibentry objects to provide a more formalised method for storing citations and make them easer to use with bibliography packages etc. * update imports for utils package * fix various cmd and bioc check issues - add importFrom utils citation to namespace - replace incorrect use of "error" with "stop" - use first index of class() output in messages * Update NEWS * version bump * fix typo in documentation
1 parent 30027a5 commit d993928

19 files changed

+748
-167
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: struct
22
Type: Package
33
Title: Statistics in R Using Class-based Templates
4-
Version: 1.1.0
4+
Version: 1.1.1
55
Authors@R: c(
66
person(
77
c("Gavin","Rhys"),
@@ -49,7 +49,7 @@ Collate:
4949
'resampler_class.R'
5050
'struct.R'
5151
'struct_templates.R'
52-
RoxygenNote: 7.1.0
52+
RoxygenNote: 7.1.1
5353
Depends: R (>= 4.0)
5454
Suggests:
5555
testthat,

NAMESPACE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ export("param_value<-")
88
export(DatasetExperiment)
99
export(as.DatasetExperiment)
1010
export(as.SummarizedExperiment)
11+
export(as.code)
1112
export(as_data_frame)
1213
export(calculate)
1314
export(chart)
1415
export(chart_names)
1516
export(chart_plot)
17+
export(citations)
1618
export(entity)
1719
export(entity_stato)
1820
export(enum)
@@ -24,6 +26,7 @@ export(iris_DatasetExperiment)
2426
export(is_output)
2527
export(is_param)
2628
export(iterator)
29+
export(libraries)
2730
export(max_length)
2831
export(metric)
2932
export(model)
@@ -52,6 +55,7 @@ export(resampler)
5255
export(result)
5356
export(result_name)
5457
export(run)
58+
export(seq_in)
5559
export(set_obj_method)
5660
export(set_obj_show)
5761
export(set_struct_obj)
@@ -81,17 +85,21 @@ exportMethods("param_obj<-")
8185
exportMethods("param_value<-")
8286
exportMethods("predicted_name<-")
8387
exportMethods("result_name<-")
88+
exportMethods("seq_in<-")
8489
exportMethods("value<-")
8590
exportMethods(as.DatasetExperiment)
8691
exportMethods(as.SummarizedExperiment)
92+
exportMethods(as.code)
8793
exportMethods(calculate)
8894
exportMethods(chart_names)
8995
exportMethods(chart_plot)
96+
exportMethods(citations)
9097
exportMethods(evaluate)
9198
exportMethods(export_xlsx)
9299
exportMethods(is_output)
93100
exportMethods(is_param)
94101
exportMethods(length)
102+
exportMethods(libraries)
95103
exportMethods(max_length)
96104
exportMethods(model_apply)
97105
exportMethods(model_predict)
@@ -113,6 +121,7 @@ exportMethods(predicted_name)
113121
exportMethods(result)
114122
exportMethods(result_name)
115123
exportMethods(run)
124+
exportMethods(seq_in)
116125
exportMethods(stato_definition)
117126
exportMethods(stato_id)
118127
exportMethods(stato_name)
@@ -126,4 +135,8 @@ importFrom(graphics,plot)
126135
importFrom(knitr,purl)
127136
importFrom(ontologyIndex,get_ontology)
128137
importFrom(stats,runif)
138+
importFrom(utils,as.person)
139+
importFrom(utils,bibentry)
140+
importFrom(utils,capture.output)
141+
importFrom(utils,citation)
129142
importFrom(utils,file.edit)

NEWS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Changes in 1.1.1
2+
+ added citations slot to struct classes
3+
+ added corresponding citations method
4+
+ added method to get/set seq_in slot
5+
+ as.SummarizedExepriment now works correctly
6+
+ using seq_in now works for sequences with more than 2 steps
7+
8+
Changes in 1.0.0
9+
+ Biconductor 3.11 release
10+
111
Changes in 0.99.10
212
+ update vignettes
313
+ update documentation

0 commit comments

Comments
 (0)