r-gregmisc-users

[R-gregmisc-users] SF.net SVN: r-gregmisc:[1938] trunk/gdata/R/reorder.R

[<wa...@us...>]

Revision: 1938
          http://sourceforge.net/p/r-gregmisc/code/1938
Author:   warnes
Date:     2015-04-23 17:37:37 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
reorder.factor() now hands off processing to stats:::reorder.default() when either 'X' or 'FUN' is specified.

Modified Paths:
--------------
    trunk/gdata/R/reorder.R

Modified: trunk/gdata/R/reorder.R
===================================================================
--- trunk/gdata/R/reorder.R	2015-04-22 23:18:53 UTC (rev 1937)
+++ trunk/gdata/R/reorder.R	2015-04-23 17:37:37 UTC (rev 1938)
@@ -12,7 +12,7 @@
 {
     constructor <- if (order) ordered else factor
 
-    if(!missing(X))
+    if(!missing(X) || !missing(FUN))
        return( NextMethod(x)) 
 
     if (!missing(new.order))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[R-gregmisc-users] SF.net SVN: r-gregmisc:[1983] trunk/gdata/R/reorder.R

[<wa...@us...>]

Revision: 1983
          http://sourceforge.net/p/r-gregmisc/code/1983
Author:   warnes
Date:     2015-04-28 06:04:02 +0000 (Tue, 28 Apr 2015)
Log Message:
-----------
Summary: Call base::sort instead of sort, which has been redefined by arguments.

Modified Paths:
--------------
    trunk/gdata/R/reorder.R

Modified: trunk/gdata/R/reorder.R
===================================================================
--- trunk/gdata/R/reorder.R	2015-04-28 04:59:31 UTC (rev 1982)
+++ trunk/gdata/R/reorder.R	2015-04-28 06:04:02 UTC (rev 1983)
@@ -17,9 +17,11 @@
             ## replicated here:
             ## -->
             scores <- tapply(X = X, INDEX = x, FUN = FUN, ...)
-            ans <- (if (order)
-                        ordered
-                    else factor)(x, levels = names(sort(scores, na.last = TRUE)))
+            levels <- names(base::sort(scores, na.last = TRUE))
+            if(order)
+                ans <- ordered(x, levels=levels)
+            else
+                ans <- factor(x, levels=levels)
             attr(ans, "scores") <- scores
             ## <--
             return(ans)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.