From 6be6c3d60131e8f482394dbbadcf1bfa84f4e721 Mon Sep 17 00:00:00 2001
From: jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Thu, 23 Aug 2012 07:36:58 +0000
Subject: Fixes and improvements of kinobject and kinobjects functions

git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/kinfit@55 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
 R/kinobject.R  | 6 ++----
 R/kinobjects.R | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'R')

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)
 }
-- 
cgit v1.2.1