[rkward-cvs] SF.net SVN: rkward: [2127] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 2127
          http://rkward.svn.sourceforge.net/rkward/?rev=2127&view=rev
Author:   tfry
Date:     2007-10-25 10:30:48 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
Merge 2122,2123 from KDE4_port branch

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/plugins/analysis/moments/moment.php

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-10-25 17:25:59 UTC (rev 2126)
+++ trunk/rkward/ChangeLog	2007-10-25 17:30:48 UTC (rev 2127)
@@ -1,3 +1,4 @@
+- Fixed: Analysis->Moments->Moment plugin did not use the order-parameter
 - Fixed: Crash on simple assignments in globalenv() with R < 2.4.0
 - Fixed: Meta information (labels) did not get shown correctly in the data editor
 - Add command line option "--debugger" for debugging purposes

Modified: trunk/rkward/rkward/plugins/analysis/moments/moment.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/moments/moment.php	2007-10-25 17:25:59 UTC (rev 2126)
+++ trunk/rkward/rkward/plugins/analysis/moments/moment.php	2007-10-25 17:30:48 UTC (rev 2127)
@@ -15,7 +15,7 @@
 	var <- eval (objects[[i]], envir=globalenv ())
 	results[i, 'Variable Name'] <- rk.get.description (objects[[i]], is.substitute=TRUE)
 
-	try (results[i, 'Moment'] <- moment (var, central = <? getRK ("central"); ?>, absolute = <? getRK ("absolute"); ?>, na.rm = <? getRK ("narm"); ?>))
+	try (results[i, 'Moment'] <- moment (var, order = <? getRK ("order"); ?>, central = <? getRK ("central"); ?>, absolute = <? getRK ("absolute"); ?>, na.rm = <? getRK ("narm"); ?>))
 <?	if (getRK_val ("length")) { ?>
 
 	results[i, 'Length'] <- length (var)
@@ -28,7 +28,7 @@
 function printout () {
 ?>
 rk.header ("Statistical Moment",
-	parameters=list ("Compute central moments", "<? getRK ("central"); ?>","Compute absolute moments", "<? getRK ("absolute"); ?>", "Remove missing values", "<? getRK ("narm"); ?>"))
+	parameters=list ("Order", "<? getRK ("order"); ?>", "Compute central moments", "<? getRK ("central"); ?>", "Compute absolute moments", "<? getRK ("absolute"); ?>", "Remove missing values", "<? getRK ("narm"); ?>"))
 rk.results (results)
 <?
 }


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