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

[tfry at users.sourceforge.net]

Revision: 3784
          http://rkward.svn.sourceforge.net/rkward/?rev=3784&view=rev
Author:   tfry
Date:     2011-09-15 15:24:14 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Fix more tests. All plot tests now pass, here.

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js
    trunk/rkward/tests/plots/scatterplot_matrix.rkcommands.R
    trunk/rkward/tests/plots.R

Modified: trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js	2011-09-15 15:12:32 UTC (rev 3783)
+++ trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js	2011-09-15 15:24:14 UTC (rev 3784)
@@ -22,7 +22,7 @@
 		echo ('\n');
 		echo ('rk.graph.on ()\n');
 	}
-	echo ('try (scatterplot.matrix(data, diagonal="' + getValue("diag") + '", plot.points=' + getValue ("plot_points") + ', smooth=' + getValue ("smooth") + ', ellipse=' + getValue ("ellipse") + '))\n');
+	echo ('try (scatterplotMatrix(data, diagonal="' + getValue("diag") + '", plot.points=' + getValue ("plot_points") + ', smooth=' + getValue ("smooth") + ', ellipse=' + getValue ("ellipse") + '))\n');
 	if (full) {
 		echo ('rk.graph.off ()\n');
 	}

Modified: trunk/rkward/tests/plots/scatterplot_matrix.rkcommands.R
===================================================================
--- trunk/rkward/tests/plots/scatterplot_matrix.rkcommands.R	2011-09-15 15:12:32 UTC (rev 3783)
+++ trunk/rkward/tests/plots/scatterplot_matrix.rkcommands.R	2011-09-15 15:24:14 UTC (rev 3784)
@@ -8,6 +8,6 @@
 rk.header ("Scatterplot Matrix", parameters=list ("Diagonal Panels", "histogram", "Plot points", "TRUE", "Smooth", "FALSE", "Ellipses", "FALSE at 0.5 and 0.9 levels."))
 
 rk.graph.on ()
-try (scatterplot.matrix(data, diagonal="histogram", plot.points=TRUE, smooth=FALSE, ellipse=FALSE))
+try (scatterplotMatrix(data, diagonal="histogram", plot.points=TRUE, smooth=FALSE, ellipse=FALSE))
 rk.graph.off ()
 })

Modified: trunk/rkward/tests/plots.R
===================================================================
--- trunk/rkward/tests/plots.R	2011-09-15 15:12:32 UTC (rev 3783)
+++ trunk/rkward/tests/plots.R	2011-09-15 15:24:14 UTC (rev 3784)
@@ -33,6 +33,9 @@
 			rk.call.plugin ("rkward::box_plot", boxwex.real="0.80", data_mode.string="grouped_outcome", dodges.real="1.00", groups.available="datasets::warpbreaks[[\"tension\"]]\ndatasets::warpbreaks[[\"wool\"]]", mean.state="", names_mode.string="default", notch.state="FALSE", orientation.string="TRUE", outcome.available="datasets::warpbreaks[[\"breaks\"]]", outline.state="FALSE", plotoptions.add_grid.state="0", plotoptions.asp.real="0.00", plotoptions.main.text="", plotoptions.pointcolor.color.string="", plotoptions.pointtype.string="", plotoptions.sub.text="", plotoptions.xaxt.state="", plotoptions.xlab.text="", plotoptions.yaxt.state="", plotoptions.ylab.text="", plotoptions.ymaxvalue.text="", plotoptions.yminvalue.text="", sd.state="", submit.mode="submit")
 		}),
 		new ("RKTest", id="density_plot", call=function () {
+			# Get rid of the warning about results differing from R < 2.2 from sample()
+			suppressWarnings (sample (rnorm (500), 500, TRUE, rep (.1, length.out=500)))
+
 			rk.call.plugin ("rkward::density_plot", adjust.real="1.00", bw.string="nrd0", kern.string="gaussian", n.real="512.00", narm.state="na.rm=TRUE", plot_type.string="hdr_plot", plotoptions.add_grid.state="0", plotoptions.asp.real="0.00", plotoptions.main.text="", plotoptions.pointcolor.color.string="", plotoptions.pointtype.string="", plotoptions.sub.text="", plotoptions.xaxt.state="", plotoptions.xlab.text="", plotoptions.xlog.state="", plotoptions.xmaxvalue.text="", plotoptions.xminvalue.text="", plotoptions.yaxt.state="", plotoptions.ylab.text="", plotoptions.ylog.state="", plotoptions.ymaxvalue.text="", plotoptions.yminvalue.text="", rug.state="0", x.available="women[[\"height\"]]", submit.mode="submit")
 		}, libraries = c ("hdrcde")),
 		new ("RKTest", id="dotchart", call=function () {

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