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

kapatp at users.sourceforge.net kapatp at users.sourceforge.net
Sat Feb 24 07:37:14 UTC 2007


Revision: 1465
          http://svn.sourceforge.net/rkward/?rev=1465&view=rev
Author:   kapatp
Date:     2007-02-23 23:37:13 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
Binomial CLT (updated) w/ help. Histogram options embed-able plugin added w/ help. Removed Beta CLT files (will add them later once Binomial CLT is completed). plots.pluginmap updated for registering the histogram_options component. For some reason, plugins/Makefile.am is getting updated too...

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/Makefile.am
    trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.php
    trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.xml
    trunk/rkward/rkward/plugins/plots.pluginmap
    trunk/rkward/rkward/plugins/under_development.pluginmap

Added Paths:
-----------
    trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.rkh
    trunk/rkward/rkward/plugins/plots/histogram_options.php
    trunk/rkward/rkward/plugins/plots/histogram_options.rkh
    trunk/rkward/rkward/plugins/plots/histogram_options.xml

Removed Paths:
-------------
    trunk/rkward/rkward/plugins/distributions/plot_beta_clt.php
    trunk/rkward/rkward/plugins/distributions/plot_beta_clt.xml

Modified: trunk/rkward/rkward/plugins/Makefile.am
===================================================================
--- trunk/rkward/rkward/plugins/Makefile.am	2007-02-24 01:17:01 UTC (rev 1464)
+++ trunk/rkward/rkward/plugins/Makefile.am	2007-02-24 07:37:13 UTC (rev 1465)
@@ -1,198 +1,301 @@
 pluginsdir = $(kde_datadir)/rkward/
 dist_plugins_DATA = \
-	all.pluginmap \
+	x11device.pluginmap \
 	plots.pluginmap \
 	distributions.pluginmap \
-	analysis.pluginmap \
-	x11device.pluginmap \
+	all.pluginmap \
 	import_export.pluginmap \
-	under_development.pluginmap
+	under_development.pluginmap \
+	analysis.pluginmap
 
+pluginsXdescriptivedir = $(kde_datadir)/rkward/descriptive
+dist_pluginsXdescriptive_DATA = \
+	descriptive/descriptive_statistics.php \
+	descriptive/skewness_kurtosis_test.xml \
+	descriptive/descriptive_statistics.xml \
+	descriptive/skewness_kurtosis_test.php \
+	descriptive/descriptive_statistics.rkh
+
+pluginsXanalysisdir = $(kde_datadir)/rkward/analysis
+dist_pluginsXanalysis_DATA = \
+	analysis/corr_matrix.php \
+	analysis/corr_matrix.xml \
+	analysis/corr_matrix.rkh
+
+pluginsXanalysisXansariUbradleydir = $(kde_datadir)/rkward/analysis/ansari_bradley
+dist_pluginsXanalysisXansariUbradley_DATA = \
+	analysis/ansari_bradley/ansari_bradley_exact_test.xml \
+	analysis/ansari_bradley/ansari_bradley_test.php \
+	analysis/ansari_bradley/ansari_bradley_exact_test.php \
+	analysis/ansari_bradley/ansari_bradley_test.xml
+
+pluginsXanalysisXwilcoxondir = $(kde_datadir)/rkward/analysis/wilcoxon
+dist_pluginsXanalysisXwilcoxon_DATA = \
+	analysis/wilcoxon/wilcoxon_test.xml \
+	analysis/wilcoxon/wilcoxon_exact_test.xml \
+	analysis/wilcoxon/wilcoxon_test.php \
+	analysis/wilcoxon/wilcoxon_exact_test.php \
+	analysis/wilcoxon/wilcoxon_test.rkh
+
+pluginsXanalysisXmomentsdir = $(kde_datadir)/rkward/analysis/moments
+dist_pluginsXanalysisXmoments_DATA = \
+	analysis/moments/bonett_test.php \
+	analysis/moments/agostino_test.xml \
+	analysis/moments/moment.rkh \
+	analysis/moments/skewness_kurtosis_test.xml \
+	analysis/moments/agostino_test.rkh \
+	analysis/moments/anscombe_test.xml \
+	analysis/moments/moment.php \
+	analysis/moments/skewness_kurtosis_test.rkh \
+	analysis/moments/agostino_test.php \
+	analysis/moments/anscombe_test.rkh \
+	analysis/moments/bonett_test.xml \
+	analysis/moments/skewness_kurtosis_test.php \
+	analysis/moments/anscombe_test.php \
+	analysis/moments/bonett_test.rkh \
+	analysis/moments/moment.xml
+
+pluginsXx11devicedir = $(kde_datadir)/rkward/x11device
+dist_pluginsXx11device_DATA = \
+	x11device/export.xml \
+	x11device/export.rkh \
+	x11device/export.php \
+	x11device/export_new.php \
+	x11device/export_new.rkh \
+	x11device/export_new.xml
+
+pluginsX00saveloaddir = $(kde_datadir)/rkward/00saveload
+dist_pluginsX00saveload_DATA = \
+	00saveload/setworkdir.xml \
+	00saveload/setworkdir.php \
+	00saveload/setworkdir.rkh
+
+pluginsX00saveloadXloaddir = $(kde_datadir)/rkward/00saveload/load
+pluginsX00saveloadXloadXloaddir = $(kde_datadir)/rkward/00saveload/load/load
+dist_pluginsX00saveloadXloadXload_DATA = \
+	00saveload/load/load/code.php \
+	00saveload/load/load/description.xml
+
+pluginsX00saveloadXloadXsourcedir = $(kde_datadir)/rkward/00saveload/load/source
+dist_pluginsX00saveloadXloadXsource_DATA = \
+	00saveload/load/source/code.php \
+	00saveload/load/source/description.xml
+
+pluginsX00saveloadXloadXreadtabledir = $(kde_datadir)/rkward/00saveload/load/readtable
+pluginsX00saveloadXimportdir = $(kde_datadir)/rkward/00saveload/import
+dist_pluginsX00saveloadXimport_DATA = \
+	00saveload/import/import_spss.xml \
+	00saveload/import/import_csv.xml \
+	00saveload/import/import_spss.rkh \
+	00saveload/import/import_csv.rkh \
+	00saveload/import/import_spss.php \
+	00saveload/import/import_csv.php
+
+pluginsX00saveloadXsavedir = $(kde_datadir)/rkward/00saveload/save
+pluginsX00saveloadXsaveXskeletondir = $(kde_datadir)/rkward/00saveload/save/skeleton
+dist_pluginsX00saveloadXsaveXskeleton_DATA = \
+	00saveload/save/skeleton/code.php \
+	00saveload/save/skeleton/description.xml
+
+pluginsX00saveloadXsaveXwritedir = $(kde_datadir)/rkward/00saveload/save/write
+dist_pluginsX00saveloadXsaveXwrite_DATA = \
+	00saveload/save/write/code.php \
+	00saveload/save/write/description.xml
+
+pluginsX00saveloadXsaveXsavedir = $(kde_datadir)/rkward/00saveload/save/save
+dist_pluginsX00saveloadXsaveXsave_DATA = \
+	00saveload/save/save/code.php \
+	00saveload/save/save/description.xml
+
 pluginsXplotsdir = $(kde_datadir)/rkward/plots
 dist_pluginsXplots_DATA = \
 	plots/plot_options.php \
+	plots/stripchart_plot.xml \
 	plots/histogram.php \
+	plots/ecdf_plot.php \
 	plots/box_plot.xml \
+	plots/barplot.rkh \
+	plots/cor_graph.rkh \
+	plots/scatterplot_matrix.xml \
 	plots/plot_options.xml \
-	plots/box_plot.php \
+	plots/barplot.php \
+	plots/cor_graph.php \
+	plots/scatterplot.php \
 	plots/histogram.xml \
-	plots/ecdf_plot.php \
 	plots/ecdf_plot.xml \
+	plots/barplot.xml \
+	plots/density_plot.php \
+	plots/cor_graph.xml \
 	plots/scatterplot.xml \
-	plots/scatterplot.php \
-	plots/stripchart_plot.xml \
-	plots/density_plot.php \
 	plots/stripchart_plot.php \
+	plots/scatterplot_matrix.rkh \
+	plots/plot_options.rkh \
 	plots/density_plot.xml \
-	plots/plot_options.rkh \
-	plots/cor_graph.php \
-	plots/cor_graph.xml \
-	plots/barplot.rkh \
-	plots/barplot.php \
-	plots/barplot.xml \
+	plots/box_plot.php \
 	plots/scatterplot_matrix.php \
-	plots/scatterplot_matrix.xml \
+	plots/color_chooser.rkh \
 	plots/color_chooser.php \
-	plots/cor_graph.rkh \
-	plots/scatterplot_matrix.rkh \
 	plots/color_chooser.xml \
-	plots/color_chooser.rkh
+	plots/histogram_options.xml \
+	plots/pareto.php \
+	plots/histogram_options.php \
+	plots/pareto.xml \
+	plots/pareto.rkh
 
 pluginsXdistributionsdir = $(kde_datadir)/rkward/distributions
 dist_pluginsXdistributions_DATA = \
+	distributions/plot_negbinomial_distribution.xml \
+	distributions/gamma_probabilities.php \
 	distributions/plot_chi_squared_distribution.xml \
 	distributions/plot_normal_distribution.xml \
-	distributions/chi_squared_probabilities.php \
-	distributions/plot_t_distribution.php \
-	distributions/plot_poisson_distribution.xml \
-	distributions/t_quantiles.xml \
+	distributions/plot_wilcoxon_distribution.php \
 	distributions/f_probabilities.xml \
-	distributions/normal_probabilities.xml \
 	distributions/f_quantiles.php \
-	distributions/poisson_probabilities.xml \
-	distributions/binomial_tail_probabilities.php \
-	distributions/normal_quantiles.php \
-	distributions/plot_chi_squared_distribution.php \
-	distributions/t_probabilities.xml \
-	distributions/plot_normal_distribution.php \
-	distributions/chi_squared_quantiles.xml \
-	distributions/plot_poisson_distribution.php \
-	distributions/binomial_quantiles.xml \
-	distributions/t_quantiles.php \
-	distributions/plot_f_distribution.xml \
-	distributions/f_probabilities.php \
-	distributions/plot_binomial_distribution.xml \
-	distributions/normal_probabilities.php \
-	distributions/poisson_probabilities.php \
-	distributions/chi_squared_probabilities.xml \
-	distributions/plot_t_distribution.xml \
-	distributions/t_probabilities.php \
-	distributions/chi_squared_quantiles.php \
-	distributions/binomial_quantiles.php \
-	distributions/plot_f_distribution.php \
-	distributions/f_quantiles.xml \
-	distributions/binomial_tail_probabilities.xml \
-	distributions/normal_quantiles.xml \
-	distributions/plot_binomial_distribution.php \
-	distributions/beta_quantiles.xml \
-	distributions/cauchy_probabilities.php \
 	distributions/cauchy_quantiles.xml \
-	distributions/beta_probabilities.php \
-	distributions/beta_quantiles.php \
-	distributions/beta_probabilities.xml \
-	distributions/cauchy_probabilities.xml \
-	distributions/cauchy_quantiles.php \
-	distributions/exponential_probabilities.php \
-	distributions/exponential_probabilities.xml \
-	distributions/exponential_quantiles.php \
-	distributions/exponential_quantiles.xml \
-	distributions/gamma_probabilities.php \
-	distributions/gamma_probabilities.xml \
-	distributions/gamma_quantiles.php \
-	distributions/gamma_quantiles.xml \
-	distributions/geom_probabilities.php \
-	distributions/geom_probabilities.xml \
-	distributions/geom_quantiles.php \
-	distributions/geom_quantiles.xml \
-	distributions/gumbel_probabilities.php \
-	distributions/gumbel_probabilities.xml \
-	distributions/gumbel_quantiles.php \
-	distributions/gumbel_quantiles.xml \
-	distributions/hypergeometric_probabilities.php \
-	distributions/hypergeometric_probabilities.xml \
-	distributions/hypergeometric_quantiles.php \
-	distributions/hypergeometric_quantiles.xml \
-	distributions/log_normal_probabilities.php \
 	distributions/log_normal_probabilities.xml \
+	distributions/wilcoxon_probabilities.php \
+	distributions/binomial_tail_probabilities.php \
+	distributions/uniform_quantiles.xml \
 	distributions/log_normal_quantiles.php \
-	distributions/log_normal_quantiles.xml \
-	distributions/logistic_probabilities.php \
-	distributions/logistic_probabilities.xml \
-	distributions/logistic_quantiles.php \
-	distributions/logistic_quantiles.xml \
-	distributions/negative_binomial_probabilities.php \
-	distributions/negative_binomial_probabilities.xml \
-	distributions/negative_binomial_quantiles.php \
-	distributions/negative_binomial_quantiles.xml \
 	distributions/poisson_quantiles.php \
-	distributions/poisson_quantiles.xml \
-	distributions/uniform_probabilities.php \
-	distributions/uniform_probabilities.xml \
-	distributions/uniform_quantiles.php \
-	distributions/uniform_quantiles.xml \
-	distributions/weibull_probabilities.php \
-	distributions/weibull_probabilities.xml \
-	distributions/weibull_quantiles.php \
-	distributions/weibull_quantiles.xml \
-	distributions/tukey_probabilities.php \
+	distributions/plot_beta_distribution.xml \
+	distributions/plot_cauchy_distribution.xml \
+	distributions/lillie_test.xml \
 	distributions/tukey_probabilities.xml \
+	distributions/chi_squared_quantiles.xml \
 	distributions/tukey_quantiles.php \
-	distributions/tukey_quantiles.xml \
-	distributions/shapiro_test.xml \
-	distributions/pearson_test.xml \
-	distributions/lillie_test.xml \
+	distributions/plot_poisson_distribution.php \
+	distributions/plot_tukey_distribution.rkh \
+	distributions/plot_hypergeometric_distribution.xml \
+	distributions/plot_exponential_distribution.xml \
 	distributions/ad_test.xml \
 	distributions/cvm_test.xml \
-	distributions/sf_test.php \
-	distributions/shapiro_test.php \
-	distributions/pearson_test.php \
-	distributions/lillie_test.php \
-	distributions/sf_test.xml \
-	distributions/ad_test.php \
-	distributions/cvm_test.php \
-	distributions/plot_wilcoxon_distribution.php \
-	distributions/plot_gamma_distribution.php \
-	distributions/plot_gamma_distribution.xml \
-	distributions/plot_geometric_distribution.php \
-	distributions/plot_geometric_distribution.xml \
-	distributions/plot_hypergeometric_distribution.php \
-	distributions/plot_hypergeometric_distribution.xml \
-	distributions/plot_negbinomial_distribution.php \
-	distributions/plot_negbinomial_distribution.xml \
-	distributions/plot_beta_distribution.xml \
-	distributions/plot_cauchy_distribution.xml \
-	distributions/plot_exponential_distribution.xml \
+	distributions/negative_binomial_probabilities.xml \
 	distributions/plot_lognormal_distribution.xml \
-	distributions/plot_tukey_distribution.php \
-	distributions/plot_uniform_distribution.php \
-	distributions/plot_beta_distribution.php \
-	distributions/plot_cauchy_distribution.php \
-	distributions/plot_logistic_distribution.xml \
-	distributions/plot_exponential_distribution.php \
-	distributions/plot_lognormal_distribution.php \
-	distributions/plot_weibull_distribution.xml \
-	distributions/plot_wilcoxon_distribution.xml \
-	distributions/plot_logistic_distribution.php \
-	distributions/wilcoxon_probabilities.php \
-	distributions/wilcoxon_probabilities.xml \
-	distributions/wilcoxon_quantiles.php \
-	distributions/wilcoxon_quantiles.xml \
-	distributions/plot_weibull_distribution.php \
-	distributions/plot_tukey_distribution.xml \
-	distributions/plot_uniform_distribution.xml \
-	distributions/plot_tukey_distribution.rkh \
+	distributions/plot_binomial_distribution.xml \
+	distributions/weibull_quantiles.xml \
+	distributions/gamma_quantiles.php \
+	distributions/hypergeometric_probabilities.xml \
 	distributions/plot_uniform_distribution.rkh \
+	distributions/plot_t_distribution.xml \
+	distributions/gumbel_quantiles.xml \
 	distributions/plot_negbinomial_distribution.rkh \
 	distributions/plot_chi_squared_distribution.rkh \
 	distributions/plot_normal_distribution.rkh \
+	distributions/plot_geometric_distribution.xml \
+	distributions/cauchy_probabilities.php \
+	distributions/geom_quantiles.xml \
+	distributions/logistic_probabilities.php \
+	distributions/wilcoxon_quantiles.php \
+	distributions/beta_probabilities.xml \
+	distributions/plot_tukey_distribution.php \
+	distributions/beta_quantiles.php \
+	distributions/t_quantiles.xml \
 	distributions/plot_beta_distribution.rkh \
 	distributions/plot_cauchy_distribution.rkh \
+	distributions/sf_test.php \
+	distributions/normal_probabilities.xml \
+	distributions/negative_binomial_quantiles.xml \
+	distributions/plot_uniform_distribution.php \
+	distributions/plot_hypergeometric_distribution.rkh \
 	distributions/plot_exponential_distribution.rkh \
-	distributions/plot_hypergeometric_distribution.rkh \
+	distributions/plot_negbinomial_distribution.php \
+	distributions/plot_lognormal_distribution.rkh \
+	distributions/plot_chi_squared_distribution.php \
 	distributions/plot_binomial_distribution.rkh \
-	distributions/plot_lognormal_distribution.rkh \
+	distributions/hypergeometric_quantiles.xml \
+	distributions/plot_normal_distribution.php \
+	distributions/plot_gamma_distribution.xml \
+	distributions/binomial_quantiles.xml \
+	distributions/plot_f_distribution.xml \
 	distributions/plot_t_distribution.rkh \
+	distributions/f_probabilities.php \
+	distributions/uniform_probabilities.xml \
+	distributions/cauchy_quantiles.php \
+	distributions/log_normal_probabilities.php \
+	distributions/uniform_quantiles.php \
+	distributions/exponential_probabilities.xml \
 	distributions/plot_geometric_distribution.rkh \
+	distributions/plot_beta_distribution.php \
+	distributions/chi_squared_probabilities.xml \
+	distributions/plot_cauchy_distribution.php \
+	distributions/lillie_test.php \
+	distributions/tukey_probabilities.php \
+	distributions/chi_squared_quantiles.php \
+	distributions/plot_logistic_distribution.xml \
+	distributions/plot_hypergeometric_distribution.php \
+	distributions/plot_exponential_distribution.php \
+	distributions/ad_test.php \
+	distributions/cvm_test.php \
+	distributions/negative_binomial_probabilities.php \
+	distributions/weibull_probabilities.xml \
+	distributions/normal_quantiles.xml \
+	distributions/plot_lognormal_distribution.php \
+	distributions/plot_binomial_distribution.php \
+	distributions/weibull_quantiles.php \
+	distributions/gumbel_probabilities.xml \
+	distributions/hypergeometric_probabilities.php \
+	distributions/plot_t_distribution.php \
+	distributions/gumbel_quantiles.php \
+	distributions/geom_probabilities.xml \
+	distributions/plot_weibull_distribution.xml \
+	distributions/poisson_probabilities.xml \
+	distributions/plot_geometric_distribution.php \
+	distributions/logistic_quantiles.xml \
 	distributions/plot_gamma_distribution.rkh \
+	distributions/geom_quantiles.php \
+	distributions/shapiro_test.xml \
 	distributions/plot_f_distribution.rkh \
+	distributions/pearson_test.xml \
+	distributions/beta_probabilities.php \
+	distributions/exponential_quantiles.xml \
+	distributions/t_probabilities.xml \
+	distributions/t_quantiles.php \
+	distributions/normal_probabilities.php \
+	distributions/negative_binomial_quantiles.php \
+	distributions/gamma_probabilities.xml \
 	distributions/plot_logistic_distribution.rkh \
+	distributions/plot_wilcoxon_distribution.xml \
+	distributions/hypergeometric_quantiles.php \
+	distributions/plot_gamma_distribution.php \
+	distributions/binomial_quantiles.php \
+	distributions/f_quantiles.xml \
+	distributions/plot_f_distribution.php \
+	distributions/wilcoxon_probabilities.xml \
+	distributions/binomial_tail_probabilities.xml \
+	distributions/log_normal_quantiles.xml \
+	distributions/uniform_probabilities.php \
+	distributions/poisson_quantiles.xml \
 	distributions/plot_weibull_distribution.rkh \
+	distributions/exponential_probabilities.php \
+	distributions/chi_squared_probabilities.php \
+	distributions/tukey_quantiles.xml \
+	distributions/plot_poisson_distribution.xml \
+	distributions/plot_logistic_distribution.php \
+	distributions/weibull_probabilities.php \
+	distributions/normal_quantiles.php \
+	distributions/gamma_quantiles.xml \
+	distributions/gumbel_probabilities.php \
 	distributions/plot_wilcoxon_distribution.rkh \
+	distributions/cauchy_probabilities.xml \
+	distributions/logistic_probabilities.xml \
+	distributions/geom_probabilities.php \
+	distributions/plot_weibull_distribution.php \
+	distributions/wilcoxon_quantiles.xml \
+	distributions/poisson_probabilities.php \
+	distributions/logistic_quantiles.php \
+	distributions/shapiro_test.php \
+	distributions/pearson_test.php \
+	distributions/plot_tukey_distribution.xml \
+	distributions/beta_quantiles.xml \
+	distributions/exponential_quantiles.php \
+	distributions/t_probabilities.php \
+	distributions/sf_test.xml \
 	distributions/plot_poisson_distribution.rkh \
+	distributions/plot_uniform_distribution.xml \
 	distributions/plot_binomial_clt.xml \
-	distributions/plot_beta_clt.php \
 	distributions/plot_binomial_clt.php \
-	distributions/plot_beta_clt.xml
+	distributions/plot_binomial_clt.rkh
 
 pluginsXwritetabledir = $(kde_datadir)/rkward/writetable
 dist_pluginsXwritetable_DATA = \
@@ -216,100 +319,3 @@
 	simple_anova/code.php \
 	simple_anova/description.xml
 
-pluginsX00saveloaddir = $(kde_datadir)/rkward/00saveload
-dist_pluginsX00saveload_DATA = \
-	00saveload/setworkdir.rkh \
-	00saveload/setworkdir.php \
-	00saveload/setworkdir.xml
-
-pluginsX00saveloadXloaddir = $(kde_datadir)/rkward/00saveload/load
-pluginsX00saveloadXloadXloaddir = $(kde_datadir)/rkward/00saveload/load/load
-dist_pluginsX00saveloadXloadXload_DATA = \
-	00saveload/load/load/code.php \
-	00saveload/load/load/description.xml
-
-pluginsX00saveloadXloadXsourcedir = $(kde_datadir)/rkward/00saveload/load/source
-dist_pluginsX00saveloadXloadXsource_DATA = \
-	00saveload/load/source/code.php \
-	00saveload/load/source/description.xml
-
-pluginsX00saveloadXloadXreadtabledir = $(kde_datadir)/rkward/00saveload/load/readtable
-pluginsX00saveloadXsavedir = $(kde_datadir)/rkward/00saveload/save
-pluginsX00saveloadXsaveXskeletondir = $(kde_datadir)/rkward/00saveload/save/skeleton
-dist_pluginsX00saveloadXsaveXskeleton_DATA = \
-	00saveload/save/skeleton/code.php \
-	00saveload/save/skeleton/description.xml
-
-pluginsX00saveloadXsaveXwritedir = $(kde_datadir)/rkward/00saveload/save/write
-dist_pluginsX00saveloadXsaveXwrite_DATA = \
-	00saveload/save/write/code.php \
-	00saveload/save/write/description.xml
-
-pluginsX00saveloadXsaveXsavedir = $(kde_datadir)/rkward/00saveload/save/save
-dist_pluginsX00saveloadXsaveXsave_DATA = \
-	00saveload/save/save/code.php \
-	00saveload/save/save/description.xml
-
-pluginsX00saveloadXimportdir = $(kde_datadir)/rkward/00saveload/import
-dist_pluginsX00saveloadXimport_DATA = \
-	00saveload/import/import_spss.xml \
-	00saveload/import/import_spss.php \
-	00saveload/import/import_spss.rkh \
-	00saveload/import/import_csv.php \
-	00saveload/import/import_csv.xml \
-	00saveload/import/import_csv.rkh
-
-pluginsXanalysisdir = $(kde_datadir)/rkward/analysis
-dist_pluginsXanalysis_DATA = \
-	analysis/corr_matrix.php \
-	analysis/corr_matrix.xml \
-	analysis/corr_matrix.rkh
-
-pluginsXanalysisXansariUbradleydir = $(kde_datadir)/rkward/analysis/ansari_bradley
-dist_pluginsXanalysisXansariUbradley_DATA = \
-	analysis/ansari_bradley/ansari_bradley_exact_test.xml \
-	analysis/ansari_bradley/ansari_bradley_test.php \
-	analysis/ansari_bradley/ansari_bradley_exact_test.php \
-	analysis/ansari_bradley/ansari_bradley_test.xml
-
-pluginsXanalysisXwilcoxondir = $(kde_datadir)/rkward/analysis/wilcoxon
-dist_pluginsXanalysisXwilcoxon_DATA = \
-	analysis/wilcoxon/wilcoxon_exact_test.xml \
-	analysis/wilcoxon/wilcoxon_test.xml \
-	analysis/wilcoxon/wilcoxon_exact_test.php \
-	analysis/wilcoxon/wilcoxon_test.php \
-	analysis/wilcoxon/wilcoxon_test.rkh
-
-pluginsXanalysisXmomentsdir = $(kde_datadir)/rkward/analysis/moments
-dist_pluginsXanalysisXmoments_DATA = \
-	analysis/moments/agostino_test.xml \
-	analysis/moments/agostino_test.php \
-	analysis/moments/agostino_test.rkh \
-	analysis/moments/anscombe_test.xml \
-	analysis/moments/anscombe_test.php \
-	analysis/moments/anscombe_test.rkh \
-	analysis/moments/bonett_test.xml \
-	analysis/moments/bonett_test.php \
-	analysis/moments/bonett_test.rkh \
-	analysis/moments/moment.php \
-	analysis/moments/moment.xml \
-	analysis/moments/moment.rkh \
-	analysis/moments/skewness_kurtosis_test.xml \
-	analysis/moments/skewness_kurtosis_test.php \
-	analysis/moments/skewness_kurtosis_test.rkh
-
-pluginsXdescriptivedir = $(kde_datadir)/rkward/descriptive
-dist_pluginsXdescriptive_DATA = \
-	descriptive/descriptive_statistics.php \
-	descriptive/descriptive_statistics.xml \
-	descriptive/descriptive_statistics.rkh
-
-pluginsXx11devicedir = $(kde_datadir)/rkward/x11device
-dist_pluginsXx11device_DATA = \
-	x11device/export.xml \
-	x11device/export.php \
-	x11device/export.rkh \
-	x11device/export_new.php \
-	x11device/export_new.xml \
-	x11device/export_new.rkh
-

Deleted: trunk/rkward/rkward/plugins/distributions/plot_beta_clt.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_beta_clt.php	2007-02-24 01:17:01 UTC (rev 1464)
+++ trunk/rkward/rkward/plugins/distributions/plot_beta_clt.php	2007-02-24 07:37:13 UTC (rev 1465)
@@ -1,101 +0,0 @@
-<?php
-	function preprocess () {
-	}
-
-	function calculate () {
-	}
-
-	function printout () {
-	doPrintout (true);
-  }
-
-  function cleanup () {
-?>
-rm(rk.temp.cltdistrib)
-<?
-  }
-
-function preview () {
-	preprocess ();
-	calculate ();
-	doPrintout (false);
-	cleanup ();
-}
-
-function doPrintout ($final) {
-	$fun = getRK_val ("function");
-	$a = getRK_val ("a");
-	$b = getRK_val ("b");
-	$ncp = getRK_val ("ncp");
-	$nAvg = getRK_val ("nAvg");
-	$nDist = getRK_val ("nDist");
-
-	$scalenorm = getRK_val ("scalenorm");
-	$drawnorm = getRK_val ("drawnorm");
-
-	$distExp = $a/($a+$b);
-	$distVar = $a*$b;
-	$distVar /= (($a+$b)^2)*($a+$b+1);
-	$distVar /= $nAvg;
-
-	if ($scalenorm) {
-	 $normMu = 0;
-	 $normSigma = 1;
-	} else {
-	 $normMu = $distExp;
-	 $normSigma = sqrt($distVar);
-	}
-
-  if ($fun == "hist") {
-    $histoptions = ", breaks=";
-
-    $histbreaks = getRK_val ("histbreaksFunction");
-    if ($histbreaks == "cells") $histoptions .= getRK_val ("histbreaks_ncells");
-    else $histoptions .= "\"" . $histbreaks . "\"";
-
-    $histlty = getRK_val ("histlinetype");
-    $histoptions .= ", lty=" . "\"" . $histlty . "\"";
-    if ($histlty != "blank") {
-      $density = getRK_val ("density");
-      $histoptions .= ", density=" . $density;
-
-      if ($density > 0) $histoptions .= ", angle=" . getRK_val ("angle");
-
-      $histbordercol = getRK_val ("histbordercol");
-      if (($histbordercol != "FALSE") & ($histbordercol != "TRUE")) $histbordercol = "\"" . $histbordercol . "\"";
-      $histfillcol = getRK_val ("histfillcol");
-      if ($histfillcol != "NULL") $histfillcol = "\"" . $histfillcol . "\"";
-
-      $histoptions .= ", border=" . $histbordercol . ", col=" . $histfillcol;
-    }
-    $histoptions .= getRK_val("plotoptions.code.printout");
-  }
-?>
-rk.temp.cltdistrib <- list()
-rk.temp.cltdistrib$data <- matrix(rbeta(n=<? echo ($nAvg*$nDist); ?>, shape1 = <? echo ($a); ?>, shape2=<? echo ($b); ?>, ncp=<? echo ($ncp); ?>), nrow=<? echo ($nAvg); ?>);
-rk.temp.cltdistrib$avg <- colMeans(rk.temp.cltdistrib$data);
-rk.temp.cltdistrib$mean <- c(<? echo ($distExp); ?>)
-rk.temp.cltdistrib$var <- c(<? echo ($distVar); ?>)
-if (<? echo ($scalenorm); ?>) rk.temp.cltdistrib$avg <- (rk.temp.cltdistrib$avg - rk.temp.cltdistrib$mean)/sqrt(rk.temp.cltdistrib$var)
-rk.temp.cltdistrib$normX <- seq(from=min(rk.temp.cltdistrib$avg), to=max(rk.temp.cltdistrib$avg), length=<? echo ($nDist); ?>)
-rk.temp.cltdistrib$normY <- dnorm (rk.temp.cltdistrib$normX, mean = <? echo ($normMu); ?>, sd = <? echo ($normSigma); ?>)
-<?
-	if ($final) { ?>
-rk.graph.on ()
-<? }
-  if ($fun == "hist") {
-?>
-rk.temp.cltdistrib$hist <- hist(rk.temp.cltdistrib$avg, plot=FALSE)
-rk.temp.cltdistrib$ylim <- c(0,max(c(rk.temp.cltdistrib$hist$density, rk.temp.cltdistrib$normY)))
-try( plot(rk.temp.cltdistrib$hist, freq=FALSE, ylim=rk.temp.cltdistrib$ylim<? echo ($histoptions); ?>) )
-<?
-  }
-?>
-if (<? echo ($drawnorm); ?>) {
-  try (lines (x=rk.temp.cltdistrib$normX, y=rk.temp.cltdistrib$normY, type="<? getRK ("normpointtype"); ?>", col="<? getRK ("normlinecol"); ?>"))
-}
-<?	if ($final) { ?>
-rk.graph.off ()
-<? }
-}
-?>

Deleted: trunk/rkward/rkward/plugins/distributions/plot_beta_clt.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_beta_clt.xml	2007-02-24 01:17:01 UTC (rev 1464)
+++ trunk/rkward/rkward/plugins/distributions/plot_beta_clt.xml	2007-02-24 07:37:13 UTC (rev 1465)
@@ -1,122 +0,0 @@
-<!DOCTYPE rkplugin>
-<document>
-  <code file="plot_beta_clt.php" />
-  <help file="plot_beta_clt.rkh" />
-  <logic>
-    <set id="plotoptions.allow_log" to="false"/>
-    <set id="plotoptions.allow_type" to="false"/>
-    <set id="plotoptions.main.text" to="Histogram for Beta"/>
-    <set id="plotoptions.xlab.text" to="Samples"/>
-
-    <convert id="isbreaks_cells" sources="histbreaksFunction.string" mode="equals" standard="cells"/>
-    <connect client="histbreaks_ncells.enabled" governor="isbreaks_cells"/>
-
-    <convert id="isdensityGT0" mode="range" sources="density.int" min="1" />
-    <connect client="angle.enabled" governor="isdensityGT0"/>
-
-    <convert id="ishistlty_notblank" sources="histlinetype.string" mode="notequals" standard="blank" />
-    <connect client="density.enabled" governor="ishistlty_notblank"/>
-    <connect client="histbordercol.enabled" governor="ishistlty_notblank"/>
-    <connect client="histfillcol.enabled" governor="ishistlty_notblank"/>
-
-    <convert id="isdensityGT0ishistlty_notblank" mode="and" sources="isdensityGT0;ishistlty_notblank" />
-    <connect client="angle.enabled" governor="isdensityGT0ishistlty_notblank"/>
-
-    <convert id="isHistogram" sources="function.string" mode="equals" standard="hist"/>
-    <connect client="moreohistptions.enabled" governor="isHistogram"/>
-
-    <convert id="show_NormalCurveOptions" mode="and" sources="isHistogram;drawnorm.state"/>
-    <connect client="lineoptionsFrame.enabled" governor="show_NormalCurveOptions"/>
-  </logic>
-  <dialog label="Central Limit Theorem: Beta to Normal" >
-    <tabbook>
-      <tab id="plot_binom_clt" label="Parameters" >
-        <row>
-          <column>
-            <frame label="CLT Samples" >
-              <spinbox type="integer" min = "1" id="nAvg" initial="10" label="Samples for Average" />
-              <spinbox type="integer" min = "10" id="nDist" initial="1000" label="Samples for distribution" />
-            </frame>
-            <frame label="Beta Parameters">
-              <spinbox id="a" initial="2" min="0.01" label="Shape1 (a)" />
-              <spinbox id="b" initial="2" min="0.01" label="Shape2 (b)" />
-              <spinbox id="ncp" initial="0" min="0" label="Non-centrality parameter (ncp)" />
-            </frame>
-          </column>
-          <column>
-            <radio id="function" label="Choose type of function plot" >
-              <option value="hist" label="Plot Histogram" />
-              <option value="dist" label="Plot distribution" />
-              <option value="qq" label="Plot QQ-plot" />
-            </radio>
-            <checkbox id="scalenorm" label="Use normalised random variable" value="1" value_unchecked="0"/>
-            <checkbox id="drawnorm" label="Draw normal curve" value="1" value_unchecked="0" checked="true"/>
-            <stretch/>
-            <preview id="preview" label="Preview"/>
-            <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
-          </column>
-        </row>
-      </tab>
-      <tab id="moreohistptions" label="More Histogram Options">
-        <row>
-          <column>
-            <radio id="histbreaksFunction" label="Method of setting breakpoints" >
-              <option value="Sturges" label="Sturges"  checked="true" />
-              <option value="Scott" label="Scott" />
-              <option value="FD" label="Friedman-Diaconis" />
-              <option value="cells" label="Equally spaced cells" />
-            </radio>
-            <spinbox id="histbreaks_ncells" label="Suggested number of cells" type="integer" min="1" initial="10"/>
-            <frame id="lineoptionsFrame" label="Nomral Curve Options">
-              <dropdown id="normpointtype" label="Type of points/lines" >
-                <option value="p" label="Plot individual points " />
-                <option value="l" label="Plot lines" checked="true"/>
-                <option value="b" label="Plot points connected by lines (both)" />
-                <option value="o" label="Plot points overlaid by lines " />
-                <option value="h" label="Plot vertical lines (high-density)" />
-                <option value="s" label="Step-function plots: left edge" />
-                <option value="S" label="Step-function plots: right edge" />
-              </dropdown>
-              <dropdown id="normlinecol" label="Normal curve color">
-                <option value="azure" label="Azure" />
-                <option value="black" label="Black" />
-                <option value="blue" label="Blue" />
-                <option value="red" label="Red" checked="true"/>
-              </dropdown>
-            </frame>
-          </column>
-          <column>
-            <frame id="histoptions" label="Histogram plot options">
-              <dropdown id="histlinetype" label="Line type for histogram" >
-                <option value="blank" label="Blank (No lines)" />
-                <option value="solid" label="Solid" checked="true"/>
-                <option value="dashed" label="Dashed" />
-                <option value="dotted" label="Dotted" />
-                <option value="dotdash" label="Dot-Dash" />
-                <option value="longdash" label="Long-dash" />
-                <option value="twodash" label="Two-dash" />
-              </dropdown>
-              <spinbox id="density" label="Density of shading lines" type="integer" min="-1" initial="-1" default_precision="1"/>
-              <spinbox id="angle" label="Angle of shading lines" min="0" max = "360" initial="45" default_precision="0"/>
-              <dropdown id="histbordercol" label="Histogram border color">
-                <option value="FALSE" label="Supress borders" />
-                <option value="TRUE" label="Use fill color" checked="true" />
-                <option value="azure" label="Azure" />
-                <option value="black" label="Black" />
-                <option value="blue" label="Blue" />
-                <option value="red" label="Red" />
-              </dropdown>
-              <dropdown id="histfillcol" label="Histogram fill color">
-                <option value="NULL" label="Do not fill" checked="true"/>
-                <option value="azure" label="Azure" />
-                <option value="black" label="Black" />
-                <option value="blue" label="Blue" />
-                <option value="red" label="Red" />
-              </dropdown>
-            </frame>
-          </column>
-        </row>
-      </tab>
-    </tabbook>
-  </dialog>
-</document>

Modified: trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.php	2007-02-24 01:17:01 UTC (rev 1464)
+++ trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.php	2007-02-24 07:37:13 UTC (rev 1465)
@@ -43,54 +43,38 @@
 	 $normSigma = sqrt($distVar);
 	}
 
-  if ($fun == "hist") {
-    $histoptions = ", breaks=";
-
-    $histbreaks = getRK_val ("histbreaksFunction");
-    if ($histbreaks == "cells") $histoptions .= getRK_val ("histbreaks_ncells");
-    else $histoptions .= "\"" . $histbreaks . "\"";
-
-    $histlty = getRK_val ("histlinetype");
-    $histoptions .= ", lty=" . "\"" . $histlty . "\"";
-    if ($histlty != "blank") {
-      $density = getRK_val ("density");
-      $histoptions .= ", density=" . $density;
-
-      if ($density > 0) $histoptions .= ", angle=" . getRK_val ("angle");
-
-      $histbordercol = getRK_val ("histbordercol");
-      if (($histbordercol != "FALSE") & ($histbordercol != "TRUE")) $histbordercol = "\"" . $histbordercol . "\"";
-      $histfillcol = getRK_val ("histfillcol");
-      if ($histfillcol != "NULL") $histfillcol = "\"" . $histfillcol . "\"";
-
-      $histoptions .= ", border=" . $histbordercol . ", col=" . $histfillcol;
-    }
-    $histoptions .= getRK_val("plotoptions.code.printout");
-  }
+	if ($fun == "hist") {
+		$all_hist_code = explode ("HIST_STRING_SPLITTER", getRK_val ("histogram_opt.code.printout"));
+		$histbreaksoptions = $all_hist_code[0];
+		$histoptions = $all_hist_code[1];
+		$histoptions .= getRK_val("plotoptions.code.printout");
+	}
 ?>
 rk.temp.cltdistrib <- list()
 rk.temp.cltdistrib$data <- matrix(rbinom(n=<? echo ($nAvg*$nDist); ?>, size = <? echo ($size); ?>, prob=<? echo ($prob); ?>), nrow=<? echo ($nAvg); ?>);
 rk.temp.cltdistrib$avg <- colMeans(rk.temp.cltdistrib$data);
-rk.temp.cltdistrib$mean <- c(<? echo ($distExp); ?>)
-rk.temp.cltdistrib$var <- c(<? echo ($distVar); ?>)
-if (<? echo ($scalenorm); ?>) rk.temp.cltdistrib$avg <- (rk.temp.cltdistrib$avg - rk.temp.cltdistrib$mean)/sqrt(rk.temp.cltdistrib$var)
-rk.temp.cltdistrib$normX <- seq(from=min(rk.temp.cltdistrib$avg), to=max(rk.temp.cltdistrib$avg), length=<? echo ($nDist); ?>)
-rk.temp.cltdistrib$normY <- dnorm (rk.temp.cltdistrib$normX, mean = <? echo ($normMu); ?>, sd = <? echo ($normSigma); ?>)
+rk.temp.cltdistrib$mean <- <? echo ($distExp); ?>;
+rk.temp.cltdistrib$var <- <? echo ($distVar); ?>;
+<? if ($scalenorm) { ?>
+rk.temp.cltdistrib$avg <- (rk.temp.cltdistrib$avg - rk.temp.cltdistrib$mean)/sqrt(rk.temp.cltdistrib$var);
+<? } ?>
+rk.temp.cltdistrib$normX <- seq(from=min(rk.temp.cltdistrib$avg), to=max(rk.temp.cltdistrib$avg), length=<? echo ($nDist); ?>);
+rk.temp.cltdistrib$normY <- dnorm (rk.temp.cltdistrib$normX, mean = <? echo ($normMu); ?>, sd = <? echo ($normSigma); ?>);
 <?
 	if ($final) { ?>
 rk.graph.on ()
 <? }
   if ($fun == "hist") {
 ?>
-rk.temp.cltdistrib$hist <- hist(rk.temp.cltdistrib$avg, plot=FALSE)
-rk.temp.cltdistrib$ylim <- c(0,max(c(rk.temp.cltdistrib$hist$density, rk.temp.cltdistrib$normY)))
-try( plot(rk.temp.cltdistrib$hist, freq=FALSE, ylim=rk.temp.cltdistrib$ylim<? echo ($histoptions); ?>) )
+rk.temp.cltdistrib$hist <- hist(rk.temp.cltdistrib$avg, plot=FALSE<? echo ($histbreaksoptions); ?>);
+rk.temp.cltdistrib$ylim <- c(0,max(c(rk.temp.cltdistrib$hist$density, rk.temp.cltdistrib$normY)));
+try( plot(rk.temp.cltdistrib$hist, ylim=rk.temp.cltdistrib$ylim<? echo ($histoptions); ?>) );
 <?
   }
 ?>
-if (<? echo ($drawnorm); ?>) {
-  try (lines (x=rk.temp.cltdistrib$normX, y=rk.temp.cltdistrib$normY, type="<? getRK ("normpointtype"); ?>", col="<? getRK ("normlinecol"); ?>"))
-}
+<? if ($drawnorm) { ?>
+  try (lines (x=rk.temp.cltdistrib$normX, y=rk.temp.cltdistrib$normY, type="<? getRK ("normpointtype"); ?>"<? getRK ("normlinecol.code.printout"); ?>));
+<? } ?>
 <?	if ($final) { ?>
 rk.graph.off ()
 <? }

Added: trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.rkh
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.rkh	                        (rev 0)
+++ trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.rkh	2007-02-24 07:37:13 UTC (rev 1465)
@@ -0,0 +1,34 @@
+<!DOCTYPE rkhelp>
+<document>
+	<summary>
+		Normal approximation to Binomial Sample averages. Most of this help file is generic description of CLT plugins. Sample averages from a contending distribution (Binomial here) are compared to a target Normal distributoin. The comparision is made based on either histograms or distribution functions or quatile-quantile plots. For brevity, D will denote the contending distribution (Binomial here).
+	</summary>
+	<usage>
+		Choose the Binomial parameters, the sample sizes needed for CLT and a choice of function. The function specific options are provided in different tabs.
+	</usage>
+	<settings>
+		<caption id="tab_plot_distrib_clt"/>
+		<setting id="frame_binomparam">See RkWard help on 'Plot Binomial distribution'.</setting>
+		<setting id="nAvg">These many samples (nAvg) are used to calculate sample average. For a fixed value of the parameters, one would be interested in seeing how the distribution of the sample averages change as this number increases.</setting>
+		<setting id="nDist">These many sets-of-samples (nDist) are used to get some idea about the distribution of the sample averages. Each set provides an average. Then these averages are used to construct the 'Histogram' or the 'QQplot' or the 'Distribution function'.</setting>
+		<setting id="function">Choose one of 'Histogram', 'QQplot' or 'Distribution function' to compare the distribution of the sample averages of D with that of Normal distribution. As of now, only 'Histogram' has been implemented.</setting>
+		<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="plotoptions">Various plot options.</setting>
+		<setting id="preview">Preview button.</setting>
+		<caption id="tab_histoptions"/>
+		<setting id="histogram_opt">The 'Frequency' checkbox has been disabled 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>
+	</settings>
+	<related>
+		<ul>
+			<li><link href="rkward://rhelp/Binomial"/></li>
+			<li><link href="rkward://component/plot_beta_distribution"/></li>
+			<li><link href="rkward://rhelp/Normal"/></li>
+			<li><link href="rkward://rhelp/hist"/></li>
+			<li><link href="rkward://rhelp/rect"/></li>
+		</ul>
+	</related>
+</document>
+

Modified: trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.xml	2007-02-24 01:17:01 UTC (rev 1464)
+++ trunk/rkward/rkward/plugins/distributions/plot_binomial_clt.xml	2007-02-24 07:37:13 UTC (rev 1465)
@@ -1,121 +1,71 @@
 <!DOCTYPE rkplugin>
 <document>
-  <code file="plot_binomial_clt.php" />
-  <help file="plot_binomial_clt.rkh" />
-  <logic>
-    <set id="plotoptions.allow_log" to="false"/>
-    <set id="plotoptions.allow_type" to="false"/>
-    <set id="plotoptions.main.text" to="Histogram for Binomial"/>
-    <set id="plotoptions.xlab.text" to="Samples"/>
+	<code file="plot_binomial_clt.php" />
+	<help file="plot_binomial_clt.rkh" />
+	<logic>
+		<set id="plotoptions.allow_log" to="false"/>
+		<set id="plotoptions.allow_type" to="false"/>
+		<set id="plotoptions.main.text" to="Histogram for Binomial"/>
+		<set id="plotoptions.xlab.text" to="Samples"/>
 
-    <convert id="isbreaks_cells" sources="histbreaksFunction.string" mode="equals" standard="cells"/>
-    <connect client="histbreaks_ncells.enabled" governor="isbreaks_cells"/>
+		<set id="normlinecol.default_color" to="red" />
 
-    <convert id="isdensityGT0" mode="range" sources="density.int" min="1" />
-    <connect client="angle.enabled" governor="isdensityGT0"/>
+		<set id="histogram_opt.varname" to="rk.temp.cltdistrib$avg" />
+		<set id="histogram_opt.allow_freq" to="false" />
+		<set id="histogram_opt.allow_barlabels" to="true" />
+		<set id="histogram_opt.allow_addtoplot" to="false" />
 
-    <convert id="ishistlty_notblank" sources="histlinetype.string" mode="notequals" standard="blank" />
-    <connect client="density.enabled" governor="ishistlty_notblank"/>
-    <connect client="histbordercol.enabled" governor="ishistlty_notblank"/>
-    <connect client="histfillcol.enabled" governor="ishistlty_notblank"/>
+		<convert id="isHistogram" sources="function.string" mode="equals" standard="hist"/>
+		<connect client="tab_histoptions.enabled" governor="isHistogram"/>
 
-    <convert id="isdensityGT0ishistlty_notblank" mode="and" sources="isdensityGT0;ishistlty_notblank" />
-    <connect client="angle.enabled" governor="isdensityGT0ishistlty_notblank"/>
-
-    <convert id="isHistogram" sources="function.string" mode="equals" standard="hist"/>
-    <connect client="moreohistptions.enabled" governor="isHistogram"/>
-
-    <convert id="show_NormalCurveOptions" mode="and" sources="isHistogram;drawnorm.state"/>
-    <connect client="lineoptionsFrame.enabled" governor="show_NormalCurveOptions"/>
-  </logic>
-  <dialog label="Central Limit Theorem: Binomial to Normal" >
-    <tabbook>
-      <tab id="plot_binom_clt" label="Parameters" >
-        <row>
-          <column>
-            <frame label="CLT Samples" >
-              <spinbox type="integer" min = "1" id="nAvg" initial="10" label="Samples for Average" />
-              <spinbox type="integer" min = "10" id="nDist" initial="1000" label="Samples for distribution" />
-            </frame>
-            <frame label="Binomial Parameters">
-              <spinbox type="integer" id="size" min="1" initial="12" label="Number of trials" />
-              <spinbox default_precision="2" type="real" id="prob" initial="0.5" min="0" max="1" label="Probability of success on each trial" />
-            </frame>
-          </column>
-          <column>
-            <radio id="function" label="Choose type of function plot" >
-              <option value="hist" label="Plot Histogram" />
-              <option value="dist" label="Plot distribution" />
-              <option value="qq" label="Plot QQ-plot" />
-            </radio>
-            <checkbox id="scalenorm" label="Use normalised random variable" value="1" value_unchecked="0"/>
-            <checkbox id="drawnorm" label="Draw normal curve" value="1" value_unchecked="0" checked="true"/>
-            <stretch/>
-            <preview id="preview" label="Preview"/>
-            <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
-          </column>
-        </row>
-      </tab>
-      <tab id="moreohistptions" label="More Histogram Options">
-        <row>
-          <column>
-            <radio id="histbreaksFunction" label="Method of setting breakpoints" >
-              <option value="Sturges" label="Sturges"  checked="true" />
-              <option value="Scott" label="Scott" />
-              <option value="FD" label="Friedman-Diaconis" />
-              <option value="cells" label="Equally spaced cells" />
-            </radio>
-            <spinbox id="histbreaks_ncells" label="Suggested number of cells" type="integer" min="1" initial="10"/>
-            <frame id="lineoptionsFrame" label="Nomral Curve Options">
-              <dropdown id="normpointtype" label="Type of points/lines" >
-                <option value="p" label="Plot individual points " />
-                <option value="l" label="Plot lines" checked="true"/>
-                <option value="b" label="Plot points connected by lines (both)" />
-                <option value="o" label="Plot points overlaid by lines " />
-                <option value="h" label="Plot vertical lines (high-density)" />
-                <option value="s" label="Step-function plots: left edge" />
-                <option value="S" label="Step-function plots: right edge" />
-              </dropdown>
-              <dropdown id="normlinecol" label="Normal curve color">
-                <option value="azure" label="Azure" />
-                <option value="black" label="Black" />
-                <option value="blue" label="Blue" />
-                <option value="red" label="Red" checked="true"/>
-              </dropdown>
-            </frame>
-          </column>
-          <column>
-            <frame id="histoptions" label="Histogram plot options">
-              <dropdown id="histlinetype" label="Line type for histogram" >
-                <option value="blank" label="Blank (No lines)" />
-                <option value="solid" label="Solid" checked="true"/>
-                <option value="dashed" label="Dashed" />
-                <option value="dotted" label="Dotted" />
-                <option value="dotdash" label="Dot-Dash" />
-                <option value="longdash" label="Long-dash" />
-                <option value="twodash" label="Two-dash" />
-              </dropdown>
-              <spinbox id="density" label="Density of shading lines" type="integer" min="-1" initial="-1" default_precision="1"/>
-              <spinbox id="angle" label="Angle of shading lines" min="0" max = "360" initial="45" default_precision="0"/>
-              <dropdown id="histbordercol" label="Histogram border color">
-                <option value="FALSE" label="Supress borders" />
-                <option value="TRUE" label="Use fill color" checked="true" />
-                <option value="azure" label="Azure" />
-                <option value="black" label="Black" />
-                <option value="blue" label="Blue" />
-                <option value="red" label="Red" />
-              </dropdown>
-              <dropdown id="histfillcol" label="Histogram fill color">
-                <option value="NULL" label="Do not fill" checked="true"/>
-                <option value="azure" label="Azure" />
-                <option value="black" label="Black" />
-                <option value="blue" label="Blue" />
-                <option value="red" label="Red" />
-              </dropdown>
-            </frame>
-          </column>
-        </row>
-      </tab>
-    </tabbook>
-  </dialog>
+		<connect client="normpointtype.enabled" governor="drawnorm.state"/>
+		<connect client="normlinecol.color.enabled" governor="drawnorm.state"/>
+	</logic>
+	<dialog label="Central Limit Theorem: Binomial to Normal" >
+		<tabbook>
+			<tab id="tab_plot_distrib_clt" label="Parameters" >
+				<row>
+					<column>
+						<frame label="CLT Samples" >
+							<spinbox type="integer" min = "1" id="nAvg" initial="10" label="Samples for Average" />
+							<spinbox type="integer" min = "10" id="nDist" initial="1000" label="Samples for distribution" />
+						</frame>
+						<frame id="frame_binomparam" label="Binomial Parameters">
+							<spinbox type="integer" id="size" min="1" initial="12" label="Number of trials" />
+							<spinbox default_precision="2" type="real" id="prob" initial="0.5" min="0" max="1" label="Probability of success on each trial" />
+						</frame>
+					</column>
+					<column>
+						<radio id="function" label="Choose type of function plot" >
+							<option value="hist" label="Plot Histogram" />
+							<option value="dist" label="Plot distribution" />
+							<option value="qq" label="Plot QQ-plot" />
+						</radio>
+						<checkbox id="scalenorm" label="Use normalised random variable" value="1" value_unchecked="0"/>
+						<frame id="frame_lineoptions" label="Nomral Curve Options">
+							<checkbox id="drawnorm" label="Draw normal curve" value="1" value_unchecked="0" checked="true"/>
+							<dropdown id="normpointtype" label="Type of points/lines" >
+								<option value="p" label="Individual points " />
+								<option value="l" label="Lines" checked="true"/>
+								<option value="b" label="Points connected by lines (both)" />
+								<option value="o" label="Points overlaid by lines " />
+								<option value="h" label="Vertical lines (high-density)" />
+								<option value="s" label="Step-function on left edge" />
+								<option value="S" label="Step-function on right edge" />
+							</dropdown>
+							<embed id="normlinecol" component="rkward::color_chooser" label="Color" />
+						</frame>
+					</column>
+				</row>
+			<stretch/>
+				<row>
+					<embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
+					<preview id="preview" label="Preview"/>
+				</row>
+			</tab>
+			<tab id="tab_histoptions" label="Histogram">
+				<embed id="histogram_opt" component="rkward::histogram_options" label="Histogram Options"/>
+			</tab>
+		</tabbook>
+	</dialog>
 </document>

Added: trunk/rkward/rkward/plugins/plots/histogram_options.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/histogram_options.php	                        (rev 0)
+++ trunk/rkward/rkward/plugins/plots/histogram_options.php	2007-02-24 07:37:13 UTC (rev 1465)
@@ -0,0 +1,56 @@
+<?
+function preprocess () {
+}
+
+function calculate () {
+}
+
+function printout () {
+		$histbreaksoptions = ", breaks=";
+		$histoptions = "";
+		$varname = getRK_val ("varname");
+
+		$histbreaks = getRK_val ("histbreaksFunction");
+		if ($histbreaks == "cells") $histbreaksoptions .= getRK_val ("histbreaks_ncells");
+		else if ($histbreaks == "int") $histbreaksoptions .= "seq (floor (min (" . $varname . ", na.rm=TRUE))-0.5, ceiling (max (" . $varname . ", na.rm=TRUE))+0.5)";
+		else if ($histbreaks == "vec") {
+			$histbreaksoptions .= "(function(x) {y = extendrange(x,f=0.1); seq(from=y[1], to=y[2], length=" . getRK_val ("histbreaks_veclength") . ")})(" . $varname . ")";
+		}
+		else $histbreaksoptions .= "\"" . $histbreaks . "\"";
+
+		$addbars = getRK_val ("addtoplot");
+		if ($addbars) $histoptions .= ", add=TRUE";
+
+		$freq = getRK_val ("freq");
+		if (!$freq) $histoptions .= ", freq=FALSE";
+
+		$labels = getRK_val ("barlabels");
+		if ($labels) $histoptions .= ", labels=TRUE";
+
+		$right = getRK_val ("rightclosed");
+		if (!$right) $histoptions .= ", right=FALSE";
+
+		$inclowest = getRK_val ("include_lowest");
+		if (!$inclowest) $histoptions .= ", include.lowest=FALSE";
+
+		$histlty = getRK_val ("histlinetype");
+		$histoptions .= ", lty=" . "\"" . $histlty . "\"";
+
+		if ($histlty != "blank") {
+			$density = getRK_val ("density");
+			$histoptions .= ", density=" . $density;
+			if ($density > 0) $histoptions .= ", angle=" . getRK_val ("angle");
+			if (getRK_val ("doborder")) $histbordercol = getRK_val ("histbordercol.code.printout");
+			else $histbordercol = ", border=FALSE";
+		}
+
+			$histfillcol = "";
+			if (getRK_val ("usefillcol")) $histfillcol = getRK_val ("histfillcol.code.printout");
+
+			$histoptions .= $histbordercol . $histfillcol;
+		echo ($histbreaksoptions . "HIST_STRING_SPLITTER" . $histoptions);
+}
+
+function cleanup () {
+}
+?>

Added: trunk/rkward/rkward/plugins/plots/histogram_options.rkh
===================================================================
--- trunk/rkward/rkward/plugins/plots/histogram_options.rkh	                        (rev 0)
+++ trunk/rkward/rkward/plugins/plots/histogram_options.rkh	2007-02-24 07:37:13 UTC (rev 1465)
@@ -0,0 +1,48 @@
+<!DOCTYPE rkplugin>
+<document>
+	<summary>
+		This plugin provides various options for <b>hist</b> or <b>plot.histogram</b>.
+	</summary>
+	<usage>
+		This plugin is mostly used as an embeded plugin. All the GUI elements here set various parameters to either hist or plot.histogram functions. For parameter specific help see the respective R references. Few parameter combinations might not produce any sensible plot, so read the R references to make a judicious choice of parameters.
+	</usage>
+	<settings>
+		<setting id="addtoplot">Check this box if the histogram is to be added to the current plot. This is the <i>add</i> parameter.</setting>
+		<setting id="freq">This is the <i>freq</i> parameter.</setting>
+		<setting id="barlabels">This is the <i>label</i> parameter.</setting>
+		<setting id="rightclosed">This is the <i>right</i> parameter.</setting>
+		<setting id="include.lowest">This is the <i>include.lowest</i> parameter.</setting>
+		<caption id="frame_breaks"/>
+		<setting id="histbreaksFunction">This is the <i>breaks</i> parameter to <b>hist</b>, unless either 'Integer numbers' or 'Vector of break points' is chosen. The 'Integer numbers' options sets the break points as the integers between the minimum and the maximum of the variable. The 'Vector of break points' options sets equally spaced break points in the range of the variable. The number of break points in this case is provided by 'Vector length' (see below).</setting>
+		<setting id="histbreaks_ncells">If 'A single number' is chosen in the above field, then this provides a suggestion to the number of cells. This is the <i>breaks</i> parameter with a single number argument.</setting>
+		<setting id="histbreaks_veclength">If 'Vector of break points' is chosen in the above field, then this provides the length of the vector of equally spaced break points in the range of the variable. This is the <i>breaks</i> parameter with a vector argument. The actual sequence is calculated by an inline function call (see the generated code). The range of the variable is extended by 10% before obtaining the sequence, so that both the minimum and maximum points are included.</setting>
+		<caption id="frame_histborderoptions"/>
+		<setting id="doborder">Whether border to the histogram bars are to be drawn. If unchecked then, <i>border=FALSE</i> is added to the code. Otherwise a color is provided as the argument to <i>border</i>.</setting>
+		<setting id="histbordercol">This is the <i>border</i> argument which provides the color of the border. Check the above box to use this option.</setting>
+		<caption id="frame_histlineoptions"/>
+		<setting id="histlinetype">This is the <i>lty</i> parameter. Choosing 'Blank' will not draw any lines, select a fill color to make a sensible plot. See R reference for further details.</setting>
+		<setting id="density">This is the <i>density</i> parameter. See the R reference on 'rect' for more details.</setting>
+		<setting id="angle">This is the <i>angle</i> parameter.</setting>
+		<caption id="frame_histfilloptions"/>
+		<setting id="usefillcol">Check this box to use a fill color for the histogram bars.</setting>
+		<setting id="histfillcol">This is the <i>col</i> parameter. The embeding plugin might set a default color. If it is empty, then <i>col</i> is not used in the code, otherwise the chosen color is used to fill the bars.</setting>
+	</settings>
+	<related>
+		<ul>
+			<li><link href="rkward://rhelp/hist"/></li>
+			<li><link href="rkward://rhelp/plot.histogram"/></li>
+			<li><link href="rkward://rhelp/rect"/></li>
+			<li><link href="rkward://rhelp/extendrange"/></li>
+		</ul>
+	</related>
+	<section id="techdetails" title="Techinical details">General users may skip this section of help, this is primarily for developers.
+		The following external tags are provided for use in the embeding plugin.
+		<ul>
+			<li><i>varname</i>: For linking to the variable name for which histogram is being plotted. This is used in the 'Integer numbers' option for breaks.</li>
+			<li><i>allow_freq</i>: Setting this to "true" ("false") enables ("disables") the display of the 'Frequency' checkbox.</li>
+			<li><i>allow_barlabels</i>: Setting this to "true" ("false") enables ("disables") the display of the 'Bar labels' checkbox.</li>
+			<li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables ("disables") the display of the 'Add bars to current plot' checkbox.</li>
+		</ul>
+			A special string, <b>HIST_STRING_SPLITTER</b> has been embeded in the plugin printout for demarcating the <i>breaks</i> options from other plot.histogram options. Use it to split the <i>code.printout</i> string from the embeding plugin's php file.
+	</section>
+</document>

Added: trunk/rkward/rkward/plugins/plots/histogram_options.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/histogram_options.xml	                        (rev 0)
+++ trunk/rkward/rkward/plugins/plots/histogram_options.xml	2007-02-24 07:37:13 UTC (rev 1465)
@@ -0,0 +1,92 @@
+<!DOCTYPE rkplugin>
+<document>
+	<code file="histogram_options.php"/>
+	<help file="histogram_options.rkh"/>
+	<logic>
+		<external id="varname" default=""/>
+		<external id="allow_freq" default="true"/>
+		<external id="allow_barlabels" default="true"/>
+		<external id="allow_addtoplot" default="true"/>
+
+		<connect client="freq.enabled" governor="allow_freq"/>
+		<connect client="barlabels.enabled" governor="allow_barlabels"/>
+		<connect client="addtoplot.enabled" governor="allow_addtoplot"/>
+
+		<set id="histbordercol.argument" to=", border="/>
+
+		<convert id="isbreaks_cells" sources="histbreaksFunction.string" mode="equals" standard="cells"/>
+		<connect client="histbreaks_ncells.enabled" governor="isbreaks_cells"/>
+
+		<convert id="isbreaks_vec" sources="histbreaksFunction.string" mode="equals" standard="vec"/>
+		<connect client="histbreaks_veclength.enabled" governor="isbreaks_vec"/>
+
+		<convert id="isdensityGT0" mode="range" sources="density.int" min="1" />
+		<convert id="ishistlty_notblank" sources="histlinetype.string" mode="notequals" standard="blank" />
+		<convert id="ishistlty_blank" sources="histlinetype.string" mode="equals" standard="blank" />
+
+		<connect client="density.enabled" governor="ishistlty_notblank"/>
+
+		<convert id="isdensityGT0ishistlty_notblank" mode="and" sources="isdensityGT0;ishistlty_notblank" />
+		<connect client="angle.enabled" governor="isdensityGT0ishistlty_notblank"/>-->
+
+		<connect client="frame_histborderoptions.enabled" governor="ishistlty_notblank"/>
+		<connect client="histbordercol.color.enabled" governor="doborder.state" />
+
+		<convert id="isdensity_non0" sources="density.int" mode="notequals" standard="0" />
+
+		<connect client="frame_histfilloptions.enabled" governor="isdensity_non0"/>
+		<connect client="histfillcol.color.enabled" governor="usefillcol.state" />
+
+		<connect client="usefillcol.enabled" governor="ishistlty_notblank"/>
+		<connect client="usefillcol.state" governor="ishistlty_blank"/>
+
+	</logic>
+	<dialog label="Default histogram options">
+		<row>
+			<column>
+				<checkbox id="addtoplot" label="Add bars to current plot" checked="false"/>
+				<checkbox id="freq" label="Frequency" checked="false"/>
+				<checkbox id="barlabels" label="Bar labels" checked="false"/>
+				<checkbox id="rightclosed" label="Right closed" checked="true"/>
+				<checkbox id="include_lowest" label="Include in lowest cell" checked="true"/>
+				<frame id="frame_breaks" label="Histogram Breakpoints">
+				<radio id="histbreaksFunction" label="Method" >
+					<option value="Sturges" label="Sturges"  checked="true" />
+					<option value="Scott" label="Scott" />
+					<option value="FD" label="Friedman-Diaconis" />
+					<option value="cells" label="A single number" />
+					<option value="int" label="Integer numbers" />
+					<option value="vec" label="Vecor of break points" />
+				</radio>
+				<row>
+				<spinbox id="histbreaks_ncells" label="Suggested cells" type="integer" min="1" initial="10"/>
+				<spinbox id="histbreaks_veclength" label="Vector length" type="integer" min="1" initial="10"/>
+			</row>
+			</frame>
+			</column>
+			<column>
+				<frame id="frame_histlineoptions" label="Histogram Line options">
+					<dropdown id="histlinetype" label="Line type for histogram" >
+						<option value="blank" label="Blank (No lines)" />
+						<option value="solid" label="Solid" checked="true"/>
+						<option value="dashed" label="Dashed" />
+						<option value="dotted" label="Dotted" />
+						<option value="dotdash" label="Dot-Dash" />
+						<option value="longdash" label="Long-dash" />
+						<option value="twodash" label="Two-dash" />
+					</dropdown>
+					<spinbox id="density" label="Density of shading lines" type="integer" min="-1" initial="-1" default_precision="1"/>
+					<spinbox id="angle" label="Angle of shading lines" min="0" max = "360" initial="45" default_precision="0"/>
+				</frame>
+				<frame id="frame_histborderoptions" label="Histogram Border options">
+					<checkbox id="doborder" label="Draw border" checked="true"/>
+					<embed id="histbordercol" component="rkward::color_chooser" label="Color"/>
+				</frame>
+				<frame id="frame_histfilloptions" label="Histogram Fill options">
+					<checkbox id="usefillcol" label="Use Fill color" checked="false"/>
+					<embed id="histfillcol" component="rkward::color_chooser" label="Color"/>
+				</frame>
+			</column>
+		</row>
+	</dialog>
+</document>

Modified: trunk/rkward/rkward/plugins/plots.pluginmap
===================================================================
--- trunk/rkward/rkward/plugins/plots.pluginmap	2007-02-24 01:17:01 UTC (rev 1464)
+++ trunk/rkward/rkward/plugins/plots.pluginmap	2007-02-24 07:37:13 UTC (rev 1465)
@@ -13,6 +13,7 @@
 
 		<component type="standard" id="plot_options" file="plot_options.xml" label="Plot Options" />
 		<component type="standard" id="color_chooser" file="color_chooser.xml" label="Color Chooser" />
+		<component type="standard" id="histogram_options" file="histogram_options.xml" label="Histogram Options" />
 	</components>
 
 	<hierarchy>

Modified: trunk/rkward/rkward/plugins/under_development.pluginmap
===================================================================
--- trunk/rkward/rkward/plugins/under_development.pluginmap	2007-02-24 01:17:01 UTC (rev 1464)
+++ trunk/rkward/rkward/plugins/under_development.pluginmap	2007-02-24 07:37:13 UTC (rev 1465)
@@ -4,9 +4,8 @@
 	<components>
 		<component type="standard" id="export_x11_device_new" file="x11device/export_new.xml" label="Export (new)" />
 		<component type="standard" id="setworkdir" file="00saveload/setworkdir.xml" label="Set Working Directory" />
-		
+
 		<component type="standard" id="plot_binomial_clt" file="distributions/plot_binomial_clt.xml" label="Binomial CLT" />
-		<component type="standard" id="plot_beta_clt" file="distributions/plot_beta_clt.xml" label="Beta CLT" />
 		<component type="standard" id="pareto" file="plots/pareto.xml" label="Pareto Chart" />
 
 		<component type="standard" id="moment" file="analysis/moments/moment.xml" label="Moment" />
@@ -40,12 +39,9 @@
 		</menu>
 		<menu id="plots" label="Plots" index="5">
 			<entry component="pareto" />
-		</menu>		
+		</menu>
 		<menu id="distributions" label="Distributions" index="7">
 			<menu id="univariate_continuous_distributions" label="Univariate continuous distributions" index="2">
-				<menu id="beta_distribution" label="Beta" index="0">
-					<entry component="plot_beta_clt" label="Beta CLT" index="2"/>
-				</menu>
       </menu>
 			<menu id="univariate_discrete_distributions" label="Univariate discrete distributions" index="2">
 				<menu id="binomial_distribution" label="Binomial" index="0">


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