[rkward-cvs] SF.net SVN: rkward: [1555] trunk/rkward/rkward/plugins/distributions/clt

tfry at users.sourceforge.net tfry at users.sourceforge.net
Thu Mar 8 22:52:17 UTC 2007


Revision: 1555
          http://svn.sourceforge.net/rkward/?rev=1555&view=rev
Author:   tfry
Date:     2007-03-08 14:52:17 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
Some cleanups and prettifications:
- Indentation
- Remove some leftovers from rug
- Minor changes to the help file

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php
    trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.rkh
    trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml

Modified: trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php	2007-03-08 22:39:43 UTC (rev 1554)
+++ trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php	2007-03-08 22:52:17 UTC (rev 1555)
@@ -1,19 +1,19 @@
 <?php
-	function preprocess () {
-	}
+function preprocess () {
+}
 
-	function calculate () {
-	}
+function calculate () {
+}
 
-	function printout () {
+function printout () {
 	doPrintout (true);
-  }
+}
 
-  function cleanup () {
+function cleanup () {
 ?>
 rm(rk.temp.cltdistrib)
 <?
-	}
+}
 
 function preview () {
 	preprocess ();
@@ -36,11 +36,11 @@
 	$distVar = $size*$prob*(1-$prob)/$nAvg; // variance of the distribution of sample averages
 
 	if ($scalenorm) {
-	 $normMu = 0; // mean for normal
-	 $normSigma = 1; // std dev for normal
+		$normMu = 0; // mean for normal
+		$normSigma = 1; // std dev for normal
 	} else {
-	 $normMu = $distExp;
-	 $normSigma = sqrt($distVar);
+		$normMu = $distExp;
+		$normSigma = sqrt($distVar);
 	}
 
 	$plotoptions = getRK_val("plotoptions.code.printout");
@@ -88,7 +88,7 @@
 rk.temp.cltdistrib$normY <- <? echo ($normFun); ?> (rk.temp.cltdistrib$normX, mean = <? echo ($normMu); ?>, sd = <? echo ($normSigma); ?>);
 <?
 	}
-  if ($fun == "hist") {
+	if ($fun == "hist") {
 ?>
 rk.temp.cltdistrib$hist <- hist(rk.temp.cltdistrib$avg, plot=FALSE<? echo ($histcalcoptions); ?>);
 <?

Modified: trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.rkh
===================================================================
--- trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.rkh	2007-03-08 22:39:43 UTC (rev 1554)
+++ trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.rkh	2007-03-08 22:52:17 UTC (rev 1555)
@@ -15,17 +15,15 @@
 		<setting id="scalenorm">Should the sample averages be normalised, by subtracting the mean, E(D), of D and dividing by the standard deviation, S(D)/sqrt(nAvg), where S(D) is the standard deviation of D? If done so, then the target Normal distribution is taken to be the standard one, that is, with mean 0 and variance 1. Otherwise the target distribution is Normal with the mean E(D) and standard deviation S(D)/sqrt(nAvg).</setting>
 		<setting id="drawnorm">Should a Normal curve be drawn? For the case of 'Histogram', nDist random samples are drawn from the target Normal distribution and their density values are plotted.</setting>
 		<setting id="normpointtype">Pointtype for the Normal curve.</setting>
-		<setting id="normlinecol">Color of the Normal curve, defaults to 'red'.</setting>
+		<setting id="normlinecol">Color of the Normal curve.</setting>
 		<setting id="plotoptions">Various plot options.</setting>
 		<setting id="preview">Preview button.</setting>
 		<caption id="tab_histoptions"/>
 		<setting id="histogram_opt">The 'Frequency' checkbox is unavailable because, in this situation, drawing the histogram with <i>freq=TRUE</i> doesnot make sense. Also, since histogram is the main plot, 'Add to current plot' checkbox has also been disabled. See RKWard help on <link href="rkward://component/histogram_options"/> for other histogram centric details.</setting>
 		<caption id="tab_distfunction"/>
-		<setting id="dist_stepfun" label="Stepfunction options">See the help on step-function options plugin. The 'Add to current plot' option is unavailable.</setting>
+		<setting id="dist_stepfun" label="Stepfunction options">See the help on the <link href="rkward://component/plot_stepfun_options"/> plugin. The 'Add to current plot' option is unavailable.</setting>
 		<setting id="frame_col_y0"></setting>
 		<setting id="frame_col_y1"> The above two options are used to set the color for the horizontal lines at y = 0 and y = 1 respectively. Specifically, this is the <i>col.01line</i> argument to <b>ecdf</b>. If only the one is provided (i.e the other is set as 'Default') then both the line are of the specified color. Otherwise (i.e., when both the colors are provided) both the colors are provided as a character vector.</setting>
-		<caption id="frame_rug"/>
-		<setting id="addRugtoplot"> Check this option to add a <b>rug</b> to the current plot. See the R reference on 'rug' for more detials. All the available options, namely, 'Side of Rug', 'Tick size', Tick width' and 'Color' are self evident.</setting>
 	</settings>
 	<related>
 		<ul>

Modified: trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml	2007-03-08 22:39:43 UTC (rev 1554)
+++ trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml	2007-03-08 22:52:17 UTC (rev 1555)
@@ -27,11 +27,6 @@
 		<set id="dist_stepfun.allow_addtoplot" to="false" />
 		<set id="dist_stepfun.default_verticals" to="false" />
 
-		<connect client="rug_side.enabled" governor="addRugtoplot.state" />
-		<connect client="rug_ticksize.enabled" governor="addRugtoplot.state"/>
-		<connect client="rug_lwd.enabled" governor="addRugtoplot.state"/>
-		<connect client="col_rug.color.enabled" governor="addRugtoplot.state"/>
-
 		<set id="col_y0.argument" to=""/>
 		<set id="col_y1.argument" to=""/>
 </logic>


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




More information about the rkward-tracker mailing list