diff options
Diffstat (limited to 'R')
| -rw-r--r-- | R/kinobject.R | 6 | ||||
| -rw-r--r-- | R/kinobjects.R | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/R/kinobject.R b/R/kinobject.R index 2ecc962..5fc715e 100644 --- a/R/kinobject.R +++ b/R/kinobject.R @@ -19,13 +19,11 @@ # this program. If not, see <http://www.gnu.org/licenses/>
kinobject <- function(parent, type, system,
- layers = NA, sampling_times = NA)
+ layers = NA, sampling_times = NA, replicates = 1)
{
kinobject <- list(parent = parent,
type = type, system = system)
if (!is.na(layers[1])) kinobject$layers = layers
- if (!is.na(sampling_times[1])) {
- kinobject$sampling_times = layers
- }
+ kinobject$data <- data.frame(t = rep(sampling_times, each = replicates), parent = NA)
return(kinobject)
}
diff --git a/R/kinobjects.R b/R/kinobjects.R index 33abe61..c191c70 100644 --- a/R/kinobjects.R +++ b/R/kinobjects.R @@ -19,16 +19,13 @@ # this program. If not, see <http://www.gnu.org/licenses/>
kinobjects<- function(parent, type, systems,
- layers = NA, sampling_times = NA)
+ layers = NA, sampling_times = NA, replicates = 1)
{
kinobjects <- list()
for (system in systems) {
kinobjects[[system]] <- kinobject(parent = parent,
- type = type, system = system)
+ type = type, system = system, sampling_times = sampling_times, replicates = replicates)
if (!is.na(layers[1])) kinobjects[[system]]$layers = layers
- if (!is.na(sampling_times[1])) {
- kinobjects[[system]]$sampling_times = layers
- }
}
return(kinobjects)
}
|