[Distr-commits] r698 - branches/distr-2.4/pkg/distrTEst/R pkg/distrTEst/R

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2010-12-02 18:38:43 +0100 (Thu, 02 Dec 2010)
New Revision: 698

Added:
   branches/distr-2.4/pkg/distrTEst/R/Utility.R
   pkg/distrTEst/R/Utility.R
Removed:
   branches/distr-2.4/pkg/distrTEst/R/Utility0.R
   pkg/distrTEst/R/Utility0.R
Log:
 renaming schedule II for Utility.R in distrTEst


Copied: branches/distr-2.4/pkg/distrTEst/R/Utility.R (from rev 697, branches/distr-2.4/pkg/distrTEst/R/Utility0.R)
===================================================================
--- branches/distr-2.4/pkg/distrTEst/R/Utility.R	                        (rev 0)
+++ branches/distr-2.4/pkg/distrTEst/R/Utility.R	2010-12-02 17:38:43 UTC (rev 698)
@@ -0,0 +1,30 @@
+.convert.result.format<-function(x, resname="res"){
+  if(is.list(x))
+     {rdim <- length(x)
+      cnames <- names(x[[1]])
+      if(is.null(cnames))
+          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
+      else
+          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
+      x <- data.frame(matrix(unlist(x),nrow=rdim, byrow=TRUE))
+      colnames(x) <- cnames
+     }
+  else if(is.matrix(x))
+     {x <- t(x)
+      cdim <- ncol(x)
+      cnames <- colnames(x)
+      if(is.null(cnames))
+          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
+      else
+          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
+      x <- data.frame(x)
+      colnames(x) <- cnames
+     }
+  else if (!is.data.frame(x))
+     {x <- data.frame(x)
+      names(x) <- abbreviate(resname)
+     }
+  return(x)
+}
+
+

Deleted: branches/distr-2.4/pkg/distrTEst/R/Utility0.R
===================================================================
--- branches/distr-2.4/pkg/distrTEst/R/Utility0.R	2010-12-02 17:37:15 UTC (rev 697)
+++ branches/distr-2.4/pkg/distrTEst/R/Utility0.R	2010-12-02 17:38:43 UTC (rev 698)
@@ -1,30 +0,0 @@
-.convert.result.format<-function(x, resname="res"){
-  if(is.list(x))
-     {rdim <- length(x)
-      cnames <- names(x[[1]])
-      if(is.null(cnames))
-          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
-      else
-          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
-      x <- data.frame(matrix(unlist(x),nrow=rdim, byrow=TRUE))
-      colnames(x) <- cnames
-     }
-  else if(is.matrix(x))
-     {x <- t(x)
-      cdim <- ncol(x)
-      cnames <- colnames(x)
-      if(is.null(cnames))
-          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
-      else
-          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
-      x <- data.frame(x)
-      colnames(x) <- cnames
-     }
-  else if (!is.data.frame(x))
-     {x <- data.frame(x)
-      names(x) <- abbreviate(resname)
-     }
-  return(x)
-}
-
-

Copied: pkg/distrTEst/R/Utility.R (from rev 697, pkg/distrTEst/R/Utility0.R)
===================================================================
--- pkg/distrTEst/R/Utility.R	                        (rev 0)
+++ pkg/distrTEst/R/Utility.R	2010-12-02 17:38:43 UTC (rev 698)
@@ -0,0 +1,30 @@
+.convert.result.format<-function(x, resname="res"){
+  if(is.list(x))
+     {rdim <- length(x)
+      cnames <- names(x[[1]])
+      if(is.null(cnames))
+          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
+      else
+          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
+      x <- data.frame(matrix(unlist(x),nrow=rdim, byrow=TRUE))
+      colnames(x) <- cnames
+     }
+  else if(is.matrix(x))
+     {x <- t(x)
+      cdim <- ncol(x)
+      cnames <- colnames(x)
+      if(is.null(cnames))
+          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
+      else
+          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
+      x <- data.frame(x)
+      colnames(x) <- cnames
+     }
+  else if (!is.data.frame(x))
+     {x <- data.frame(x)
+      names(x) <- abbreviate(resname)
+     }
+  return(x)
+}
+
+

Deleted: pkg/distrTEst/R/Utility0.R
===================================================================
--- pkg/distrTEst/R/Utility0.R	2010-12-02 17:37:15 UTC (rev 697)
+++ pkg/distrTEst/R/Utility0.R	2010-12-02 17:38:43 UTC (rev 698)
@@ -1,30 +0,0 @@
-.convert.result.format<-function(x, resname="res"){
-  if(is.list(x))
-     {rdim <- length(x)
-      cnames <- names(x[[1]])
-      if(is.null(cnames))
-          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
-      else
-          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
-      x <- data.frame(matrix(unlist(x),nrow=rdim, byrow=TRUE))
-      colnames(x) <- cnames
-     }
-  else if(is.matrix(x))
-     {x <- t(x)
-      cdim <- ncol(x)
-      cnames <- colnames(x)
-      if(is.null(cnames))
-          cnames <- paste(abbreviate(resname),1:cdim,sep=".")
-      else
-          cnames <- paste(abbreviate(resname),abbreviate(names(x[[1]])),sep=".")
-      x <- data.frame(x)
-      colnames(x) <- cnames
-     }
-  else if (!is.data.frame(x))
-     {x <- data.frame(x)
-      names(x) <- abbreviate(resname)
-     }
-  return(x)
-}
-
-