[rkward-cvs] SF.net SVN: rkward: [1368] branches/release_branch_0.4.6

tfry at users.sourceforge.net tfry at users.sourceforge.net
Fri Feb 9 10:49:59 UTC 2007


Revision: 1368
          http://svn.sourceforge.net/rkward/?rev=1368&view=rev
Author:   tfry
Date:     2007-02-09 02:49:59 -0800 (Fri, 09 Feb 2007)

Log Message:
-----------
Merge 1364, 1365, 1366, 1367 from trunk

Modified Paths:
--------------
    branches/release_branch_0.4.6/ChangeLog
    branches/release_branch_0.4.6/configure.in.in
    branches/release_branch_0.4.6/debian/rules
    branches/release_branch_0.4.6/rkward/plugins/analysis.pluginmap
    branches/release_branch_0.4.6/rkward/plugins/distributions.pluginmap
    branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap
    branches/release_branch_0.4.6/rkward/plugins/plots.pluginmap
    branches/release_branch_0.4.6/rkward/plugins/under_development.pluginmap
    branches/release_branch_0.4.6/rkward/plugins/x11device.pluginmap

Modified: branches/release_branch_0.4.6/ChangeLog
===================================================================
--- branches/release_branch_0.4.6/ChangeLog	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/ChangeLog	2007-02-09 10:49:59 UTC (rev 1368)
@@ -1,3 +1,4 @@
+--- Version 0.4.6 - Feb-15-2007
 - single line input fields in plugins no longer accept new-lines
 - support for calculating p-values in correlation matrix plugin
 - fixed: pressing F8 in the console would remove input focus from the console
@@ -14,22 +15,17 @@
 		logistics, lognormal, negative binomail, tukey, uniform, weibull, wilcoxon
 - fixed: installing packages as root would not work, when $R_HOME is not defined
 - new plugin element to select name of an R object to save to
-- new plugin: Ansari-Bradley two-sample test						TODO: document, make it stable
+- new plugin: Ansari-Bradley two-sample test
 - place internal objects .rk.rkreply and .rk.available.packages.cache into rkward package environment
 - support for preview functionality in graphing plugins
 - new plugin: barplot
 - new plugin: export contents of an X11 device to several different file formats
 - plugins can now be context sensitive (e.g. work on a particular x11 device)
-- new plugin: Wilcoxon Rank Sum test and Wilcoxon Exact Rank Sum test			TODO: document, make it stable
+- new plugin: Wilcoxon Rank Sum test and Wilcoxon Exact Rank Sum test
 - new plugin: scatterplot matrix
 - new plugin: correlation matrix plot
 - safer destruction of R backend on quitting
-- fix compilation for the upcoming R 2.5.0		TODO: check again
-							TODO: update debian dependencies:
-							- the old depends + :
-							- if compiled with R < 2.4.0: dependes r-base-core < 2.4.0
-							- if compiled with R 2.4.0 or greater: dependes r-base-core >= 2.4.0
-							- if compiled with R 2.5.0 or greater: dependes r-base-core >= 2.5.0 (or pre-versions!)
+- fix compilation for the upcoming R 2.5.0						TODO: check again
 - show full error message for syntax errors (only if compiled with R 2.4.0 or newer)
 - more correct auto-printing of values for user commands (only if compiled with R 2.4.0 or newer)
 - more correct handling of user commands consisting of several statements (only if compiled with R 2.4.0 or newer)

Modified: branches/release_branch_0.4.6/configure.in.in
===================================================================
--- branches/release_branch_0.4.6/configure.in.in	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/configure.in.in	2007-02-09 10:49:59 UTC (rev 1368)
@@ -1,6 +1,6 @@
 #MIN_CONFIG(3)
 
-AM_INIT_AUTOMAKE(rkward,0.4.6pre1)
+AM_INIT_AUTOMAKE(rkward,0.4.6pre2)
 
 dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
 dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__

Modified: branches/release_branch_0.4.6/debian/rules
===================================================================
--- branches/release_branch_0.4.6/debian/rules	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/debian/rules	2007-02-09 10:49:59 UTC (rev 1368)
@@ -105,11 +105,11 @@
 	dh_shlibdeps
 	# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
 	@if [[ "$(RVERS)" > "2.4.9" ]] ; then \
-		echo "rvers=r-base-core (>= 2.4.9)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rvers=r-base-core (> 2.4.9)" >> $(CURDIR)/debian/rkward.substvars ; \
 	else if [[ "$(RVERS)" > "2.3.9" ]] ; then \
-		echo "rvers=r-base-core (<= 2.4.9), r-base-core (>= 2.3.9)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rvers=r-base-core (<= 2.4.9), r-base-core (> 2.3.9)" >> $(CURDIR)/debian/rkward.substvars ; \
 	else if [[ "$(RVERS)" > "2.2.1.svn37823" ]] ; then \
-		echo "rvers=r-base-core (>= 2.3.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rvers=r-base-core (< 2.3.9), r-base-core (>= 2.3.0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	else \
 		echo "rvers=r-base-core (<= 2.2.1-6), r-base-core (>= 2.1.0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	fi

Modified: branches/release_branch_0.4.6/rkward/plugins/analysis.pluginmap
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/analysis.pluginmap	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/rkward/plugins/analysis.pluginmap	2007-02-09 10:49:59 UTC (rev 1368)
@@ -10,6 +10,10 @@
 		<component type="standard" id="simple_anova" file="simple_anova/description.xml" label="Simple Anova" />
 		<component type="standard" id="skewness_kurtosis" file="descriptive/skewness_kurtosis_test.xml" label="Skewness and Kurtosis" />
 
+		<component type="standard" id="wilcoxon_test" file="analysis/wilcoxon/wilcoxon_test.xml" label="Wilcoxon Test" />
+		<component type="standard" id="wilcoxon_exact_test" file="analysis/wilcoxon/wilcoxon_exact_test.xml" label="Wilcoxon exact test" />
+		<component type="standard" id="ansari_bradley_test" file="analysis/ansari_bradley/ansari_bradley_test.xml" label="Ansari-Bradley two-sample test" />
+		<component type="standard" id="ansari_bradley_exact_test" file="analysis/ansari_bradley/ansari_bradley_exact_test.xml" label="Ansari-Bradley two-sample exact test" />
 	</components>
 
 	<hierarchy>
@@ -27,6 +31,14 @@
 			</menu>
 			<entry component="simple_anova" index="4"/>
 			<entry component="skewness_kurtosis" index="5"/>
+			<menu id="wilcoxon_test" label="Wilcoxon Tests" index="6">
+				<entry component="wilcoxon_test" />
+				<entry component="wilcoxon_exact_test" />
+			</menu>
+			<menu id="ansari_bradley" label="Ansari-Bradley Tests" index="7">
+				<entry component="ansari_bradley_test" />
+				<entry component="ansari_bradley_exact_test" />
+			</menu>
 		</menu>
 	</hierarchy>
 </document>

Modified: branches/release_branch_0.4.6/rkward/plugins/distributions.pluginmap
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/distributions.pluginmap	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/rkward/plugins/distributions.pluginmap	2007-02-09 10:49:59 UTC (rev 1368)
@@ -13,6 +13,7 @@
 
 		<component type="standard" id="beta_quantiles" file="beta_quantiles.xml" label="Beta quantiles" />
 		<component type="standard" id="beta_probabilities" file="beta_probabilities.xml" label="Beta probabilities" />
+		<component type="standard" id="plot_beta_distribution" file="plot_beta_distribution.xml" label="Plot Beta distribution" />
 
 		<component type="standard" id="binomial_quantiles" file="binomial_quantiles.xml" label="Binomial quantiles" />
 		<component type="standard" id="binomial_tail_probabilities" file="binomial_tail_probabilities.xml" label="Binomial tail probabilities" />
@@ -20,12 +21,15 @@
 
 		<component type="standard" id="cauchy_quantiles" file="cauchy_quantiles.xml" label="Cauchy quantiles" />
 		<component type="standard" id="cauchy_probabilities" file="cauchy_probabilities.xml" label="Cauchy probabilities" />
+		<component type="standard" id="plot_cauchy_distribution" file="plot_cauchy_distribution.xml" label="Plot Cauchy distribution" />
 
 		<component type="standard" id="chi_squared_quantiles" file="chi_squared_quantiles.xml" label="Chi-squared quantiles" />
 		<component type="standard" id="chi_squared_probabilities" file="chi_squared_probabilities.xml" label="Chi-squared probabilities" />
 		<component type="standard" id="plot_chi_squared_distribution" file="plot_chi_squared_distribution.xml" label="Plot Chi-squared distribution" />
+
 		<component type="standard" id="exponential_quantiles" file="exponential_quantiles.xml" label="Exponential quantiles" />
 		<component type="standard" id="exponential_probabilities" file="exponential_probabilities.xml" label="Exponential probabilities" />
+		<component type="standard" id="plot_exponential_distribution" file="plot_exponential_distribution.xml" label="Plot Exponential distribution" />
 
 		<component type="standard" id="f_quantiles" file="f_quantiles.xml" label="F quantiles" />
 		<component type="standard" id="f_probabilities" file="f_probabilities.xml" label="F probabilities" />
@@ -33,24 +37,30 @@
 
 		<component type="standard" id="gamma_quantiles" file="gamma_quantiles.xml" label="Gamma quantiles" />
 		<component type="standard" id="gamma_probabilities" file="gamma_probabilities.xml" label="Gamma probabilities" />
+		<component type="standard" id="plot_gamma_distribution" file="plot_gamma_distribution.xml" label="Plot Gamma distribution" />
 
 		<component type="standard" id="geom_quantiles" file="geom_quantiles.xml" label="Geometric quantiles" />
 		<component type="standard" id="geom_probabilities" file="geom_probabilities.xml" label="Geometric probabilities" />
+		<component type="standard" id="plot_geometric_distribution" file="plot_geometric_distribution.xml" label="Plot Geometric distribution" />
 
 		<component type="standard" id="gumbel_quantiles" file="gumbel_quantiles.xml" label="Gumbel quantiles" />
 		<component type="standard" id="gumbel_probabilities" file="gumbel_probabilities.xml" label="Gumbel probabilities" />
 
 		<component type="standard" id="hypergeometric_quantiles" file="hypergeometric_quantiles.xml" label="Hypergeometric quantiles" />
 		<component type="standard" id="hypergeometric_probabilities" file="hypergeometric_probabilities.xml" label="Hypergeometric probabilities" />
+		<component type="standard" id="plot_hypergeometric_distribution" file="plot_hypergeometric_distribution.xml" label="Plot Hypergeometric distribution" />
 
 		<component type="standard" id="logistic_quantiles" file="logistic_quantiles.xml" label="Logistic quantiles" />
 		<component type="standard" id="logistic_probabilities" file="logistic_probabilities.xml" label="Logistic probabilities" />
+		<component type="standard" id="plot_logistic_distribution" file="plot_logistic_distribution.xml" label="Plot Logistic distribution" />
 
 		<component type="standard" id="log_normal_quantiles" file="log_normal_quantiles.xml" label="Log Normal quantiles" />
 		<component type="standard" id="log_normal_probabilities" file="log_normal_probabilities.xml" label="Log Normal probabilities" />
+		<component type="standard" id="plot_lognormal_distribution" file="plot_lognormal_distribution.xml" label="Plot Lognormal distribution" />
 
 		<component type="standard" id="negative_binomial_quantiles" file="negative_binomial_quantiles.xml" label="Negative Binomial quantiles" />
 		<component type="standard" id="negative_binomial_probabilities" file="negative_binomial_probabilities.xml" label="Negative Binomial probabilities" />
+		<component type="standard" id="plot_negbinomial_distribution" file="plot_negbinomial_distribution.xml" label="Plot Negative Binomial distribution" />
 
 		<component type="standard" id="normal_quantiles" file="normal_quantiles.xml" label="Normal quantiles" />
 		<component type="standard" id="normal_probabilities" file="normal_probabilities.xml" label="Normal probabilities" />
@@ -66,15 +76,19 @@
 
 		<component type="standard" id="tukey_probabilities" file="tukey_probabilities.xml" label="Studentized Range probabilities (Tukey)" />
 		<component type="standard" id="tukey_quantiles" file="tukey_quantiles.xml" label="Studentized Range quantiles (Tukey)" />
+		<component type="standard" id="plot_tukey_distribution" file="plot_tukey_distribution.xml" label="Plot Studentized Range (Tukey) distribution" />
 
 		<component type="standard" id="uniform_quantiles" file="uniform_quantiles.xml" label="Uniform quantiles" />
 		<component type="standard" id="uniform_probabilities" file="uniform_probabilities.xml" label="Uniform probabilities" />
+		<component type="standard" id="plot_uniform_distribution" file="plot_uniform_distribution.xml" label="Plot Uniform distribution" />
 
 		<component type="standard" id="weibull_quantiles" file="weibull_quantiles.xml" label="Weibull quantiles" />
 		<component type="standard" id="weibull_probabilities" file="weibull_probabilities.xml" label="Weibull probabilities" />
+		<component type="standard" id="plot_weibull_distribution" file="plot_weibull_distribution.xml" label="Plot Weibull distribution" />
 
 		<component type="standard" id="wilcoxon_quantiles" file="wilcoxon_quantiles.xml" label="Wilcoxon Rank Sum quantiles" />
 		<component type="standard" id="wilcoxon_probabilities" file="wilcoxon_probabilities.xml" label="Wilcoxon Rank Sum probabilities" />
+		<component type="standard" id="plot_wilcoxon_distribution" file="plot_wilcoxon_distribution.xml" label="Plot Wilcoxon Rank Sum distribution" />
 
 	</components>
 
@@ -93,10 +107,12 @@
 				<menu id="beta_distribution" label="Beta" index="0">
 					<entry component="beta_quantiles" label="Beta quantiles" index="1"/>
 					<entry component="beta_probabilities" label="Beta probabilities" index="0"/>
+					<entry component="plot_beta_distribution" label="Plot Beta distribution" index="2"/>
 				</menu>
 				<menu id="cauchy_distribution" label="Cauchy" index="1">
 					<entry component="cauchy_quantiles" label="Cauchy quantiles" index="1"/>
 					<entry component="cauchy_probabilities" label="Cauchy probabilities" index="0"/>
+					<entry component="plot_cauchy_distribution" label="Plot Cauchy distribution" index="2"/>
 				</menu>
 				<menu id="chi_squared_distribution" label="Chi-squared" index="2">
 					<entry component="chi_squared_quantiles" label="Chi-squared quantiles" index="1"/>
@@ -106,6 +122,7 @@
 				<menu id="exponential_distribution" label="Exponential" index="3">
 					<entry component="exponential_quantiles" label="Exponential quantiles" index="1"/>
 					<entry component="exponential_probabilities" label="Exponential probabilities" index="0"/>
+					<entry component="plot_exponential_distribution" label="Plot Exponential distribution" index="2"/>
 				</menu>
 				<menu id="f_distribution" label="F" index="4">
 					<entry component="f_quantiles" label="F quantiles" index="1"/>
@@ -115,6 +132,7 @@
 				<menu id="gamma_distribution" label="Gamma" index="5">
 					<entry component="gamma_quantiles" label="Gamma quantiles" index="1"/>
 					<entry component="gamma_probabilities" label="Gamma probabilities" index="0"/>
+					<entry component="plot_gamma_distribution" label="Plot Gamma distribution" index="2"/>
 				</menu>
 				<menu id="gumbel_distribution" label="Gumbel" index="6">
 					<entry component="gumbel_quantiles" label="Gumbel quantiles" index="1"/>
@@ -123,10 +141,12 @@
 				<menu id="logistic_distribution" label="Logistic" index="7">
 					<entry component="logistic_quantiles" label="Logistic quantiles" index="1"/>
 					<entry component="logistic_probabilities" label="Logistic probabilities" index="0"/>
+					<entry component="plot_logistic_distribution" label="Plot Logistic distribution" index="2"/>
 				</menu>
 				<menu id="log_normal_distribution" label="Log Normal" index="8">
 					<entry component="log_normal_quantiles" label="Log Normal quantiles" index="1"/>
 					<entry component="log_normal_probabilities" label="Log Normal probabilities" index="0"/>
+					<entry component="plot_lognormal_distribution" label="Plot Lognormal distribution" index="2"/>
 				</menu>
 				<menu id="normal_distribution" label="Normal" index="9">
 					<entry component="normal_quantiles" label="Normal quantiles" index="1"/>
@@ -136,6 +156,7 @@
 				<menu id="tukey_distribution" label="Tukey" index="11">
 					<entry component="tukey_probabilities" label="Tukey probabilities" index="0"/>
 					<entry component="tukey_quantiles" label="Tukey quantiles" index="1"/>
+					<entry component="plot_tukey_distribution" label="Plot Studentized Range (Tukey) distribution" index="2"/>
 				</menu>
 				<menu id="t_distribution" label="t" index="10">
 					<entry component="t_quantiles" label="t quantiles" index="1"/>
@@ -145,10 +166,12 @@
 				<menu id="uniform_distribution" label="Uniform" index="12">
 					<entry component="uniform_quantiles" label="Uniform quantiles" index="1"/>
 					<entry component="uniform_probabilities" label="Uniform probabilities" index="0"/>
+					<entry component="plot_uniform_distribution" label="Plot Uniform distribution" index="2"/>
 				</menu>
 				<menu id="weibull_distribution" label="Weibull" index="13">
 					<entry component="weibull_quantiles" label="Weibull quantiles" index="1"/>
 					<entry component="weibull_probabilities" label="Weibull probabilities" index="0"/>
+					<entry component="plot_weibull_distribution" label="Plot Weibull distribution" index="2"/>
 				</menu>
 			</menu>
 
@@ -161,14 +184,17 @@
 				<menu id="geom_distribution" label="Geometric" index="1">
 					<entry component="geom_probabilities" label="Geometric probabilities" index="0"/>
 					<entry component="geom_quantiles" label="Geometric quantiles" index="1"/>
+					<entry component="plot_geometric_distribution" label="Plot Geometric distribution" index="2"/>
 				</menu>
 				<menu id="hypergeometric_distribution" label="Hypergeometric" index="2">
 					<entry component="hypergeometric_probabilities" label="Hypergeometric probabilities" index="0"/>
 					<entry component="hypergeometric_quantiles" label="Hypergeometric quantiles" index="1"/>
+					<entry component="plot_hypergeometric_distribution" label="Plot Hypergeometric distribution" index="2"/>
 				</menu>
 				<menu id="negative_binomial_distribution" label="Negative Binomial" index="3">
 					<entry component="negative_binomial_probabilities" label="Negative Binomial probabilities" index="0"/>
 					<entry component="negative_binomial_quantiles" label="Hypergeometric quantiles" index="1"/>
+					<entry component="plot_negbinomial_distribution" label="Plot Negative Binomial distribution" index="2"/>
 				</menu>
 				<menu id="poisson_distribution" label="Poisson" index="4">
 					<entry component="poisson_probabilities" label="Poisson probabilities" index="0"/>
@@ -176,11 +202,11 @@
 					<entry component="plot_poisson_distribution" label="Plot Poisson distribution" index="2"/>
 				</menu>
 				<menu id="wilcoxon_distribution" label="Wilcoxon Rank Sum" index="14">
-                                        <entry component="wilcoxon_quantiles" label="Wilcoxon Rank Sum quantiles" index="1"/>
+					<entry component="wilcoxon_quantiles" label="Wilcoxon Rank Sum quantiles" index="1"/>
 					<entry component="wilcoxon_probabilities" label="Wilcoxon Rank Sum probabilities" index="0"/>
+					<entry component="plot_wilcoxon_distribution" label="Plot Wilcoxon Rank Sum distribution" index="2"/>
 				</menu>
 			</menu>
 		</menu>
 	</hierarchy>
 </document>
-

Modified: branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap	2007-02-09 10:49:59 UTC (rev 1368)
@@ -9,11 +9,22 @@
 		<component type="standard" id="save_skeleton" file="00saveload/save/skeleton/description.xml" label="Save package" />
 		<component type="standard" id="save_variables" file="00saveload/save/write/description.xml" label="Save variables" />
 		<component type="standard" id="save_table" file="writetable/description.xml" label="Save as table" />
+
+		<component type="standard" id="import_spss" file="00saveload/import/import_spss.xml" label="Import SPSS">
+			<attribute id="format" value="*.sav *.por" label="SPSS data files"/>
+		</component>
+		<component type="standard" id="import_csv" file="00saveload/import/import_csv.xml" label="Import CSV data">
+			<attribute id="format" value="*.txt *.csv" label="Comma Separated Values"/>
+		</component>
 	</components>
 
 	<hierarchy>
 		<menu id="file" label="File">
 			<menu id="import" label="Import" index="4">
+				<menu id="import_format" label="Import format">
+					<entry component="import_spss"/>
+					<entry component="import_csv"/>
+				</menu>
 				<entry component="load_r_object" />
 				<entry component="load_source" />
 			</menu>
@@ -25,6 +36,13 @@
 			</menu>
 		</menu>
 	</hierarchy>
+
+	<context id="import">
+		<menu id="import" label="Import">
+			<entry component="import_spss"/>
+			<entry component="import_csv"/>
+		</menu>
+	</context>
 </document>
  
  

Modified: branches/release_branch_0.4.6/rkward/plugins/plots.pluginmap
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/plots.pluginmap	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/rkward/plugins/plots.pluginmap	2007-02-09 10:49:59 UTC (rev 1368)
@@ -2,6 +2,7 @@
 
 <document base_prefix="plots/" namespace="rkward">
 	<components>
+		<component type="standard" id="barplot" file="barplot.xml" label="Barplot" />
 		<component type="standard" id="box_plot" file="box_plot.xml" label="Box Plot" />
 		<component type="standard" id="density_plot" file="density_plot.xml" label="Density Plot" />
 		<component type="standard" id="ecdf_plot" file="ecdf_plot.xml" label="ECDF Plot" />
@@ -14,6 +15,7 @@
 
 	<hierarchy>
 		<menu id="plots" label="Plots" index="5">
+			<entry component="barplot" />
 			<entry component="box_plot" />
 			<entry component="density_plot" />
 			<entry component="ecdf_plot" />

Modified: branches/release_branch_0.4.6/rkward/plugins/under_development.pluginmap
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/under_development.pluginmap	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/rkward/plugins/under_development.pluginmap	2007-02-09 10:49:59 UTC (rev 1368)
@@ -2,124 +2,23 @@
 
 <document base_prefix="" namespace="rkward">
 	<components>
-		<component type="standard" id="export_x11_device" file="x11device/export.xml" label="Export..." />
-		<!-- The entry below is bogus for now, still testing some concepts with it -->
-		<component type="standard" id="import_spss" file="00saveload/import/import_spss.xml" label="Import SPSS">
-			<attribute id="format" value="*.sav *.por" label="SPSS data files"/>
-		</component>
-		<component type="standard" id="import_csv" file="00saveload/import/import_csv.xml" label="Import CSV data">
-			<attribute id="format" value="*.txt *.csv" label="Comma Separated Values"/>
-		</component>
 
-		<component type="standard" id="wilcoxon_test" file="analysis/wilcoxon/wilcoxon_test.xml" label="Wilcoxon Test" />
-		<component type="standard" id="wilcoxon_exact_test" file="analysis/wilcoxon/wilcoxon_exact_test.xml" label="Wilcoxon exact test" />
-		<component type="standard" id="ansari_bradley_test" file="analysis/ansari_bradley/ansari_bradley_test.xml" label="Ansari-Bradley two-sample test" />
-		<component type="standard" id="ansari_bradley_exact_test" file="analysis/ansari_bradley/ansari_bradley_exact_test.xml" label="Ansari-Bradley two-sample exact test" />
-
-		<component type="standard" id="barplot" file="plots/barplot.xml" label="Barplot" />
-
-					<component type="standard" id="plot_beta_distribution" file="distributions/plot_beta_distribution.xml" label="Plot Beta distribution" />
-					<component type="standard" id="plot_cauchy_distribution" file="distributions/plot_cauchy_distribution.xml" label="Plot Cauchy distribution" />
-					<component type="standard" id="plot_exponential_distribution" file="distributions/plot_exponential_distribution.xml" label="Plot Exponential distribution" />
-					<component type="standard" id="plot_gamma_distribution" file="distributions/plot_gamma_distribution.xml" label="Plot Gamma distribution" />
-					<component type="standard" id="plot_geometric_distribution" file="distributions/plot_geometric_distribution.xml" label="Plot Geometric distribution" />
-					<component type="standard" id="plot_hypergeometric_distribution" file="distributions/plot_hypergeometric_distribution.xml" label="Plot Hypergeometric distribution" />
-					<component type="standard" id="plot_logistic_distribution" file="distributions/plot_logistic_distribution.xml" label="Plot Logistic distribution" />
-					<component type="standard" id="plot_lognormal_distribution" file="distributions/plot_lognormal_distribution.xml" label="Plot Lognormal distribution" />
-					<component type="standard" id="plot_negbinomial_distribution" file="distributions/plot_negbinomial_distribution.xml" label="Plot Negative Binomial distribution" />
-					<component type="standard" id="plot_tukey_distribution" file="distributions/plot_tukey_distribution.xml" label="Plot Studentized Range (Tukey) distribution" />
-					<component type="standard" id="plot_uniform_distribution" file="distributions/plot_uniform_distribution.xml" label="Plot Uniform distribution" />
-					<component type="standard" id="plot_weibull_distribution" file="distributions/plot_weibull_distribution.xml" label="Plot Weibull distribution" />
-					<component type="standard" id="plot_wilcoxon_distribution" file="distributions/plot_wilcoxon_distribution.xml" label="Plot Wilcoxon Rank Sum distribution" />
 	</components>
 
 	<hierarchy>
 		<menu id="file" label="File">
 			<menu id="import" label="Import" index="4">
-				<!-- Do we want this? -->
-				<menu id="import_format" label="Import format" index="0">
-					<entry component="import_spss"/>
-					<entry component="import_csv"/>
-				</menu>
 			</menu>
 			<menu id="export" label="Export" index="5">
 			</menu>
 		</menu>
 		<menu id="analysis" label="Analysis" index="4">
-			<menu id="wilcoxon_test" label="Wilcoxon Tests" index="6">
-				<entry component="wilcoxon_test" />
-				<entry component="wilcoxon_exact_test" />
-			</menu>
-			<menu id="ansari_bradley" label="Ansari-Bradley Tests" index="7">
-				<entry component="ansari_bradley_test" />
-				<entry component="ansari_bradley_exact_test" />
-			</menu>
 		</menu>
 		<menu id="plots" label="Plots" index="5">
-			<entry component="barplot" />
 		</menu>
 
-				<menu id="distributions" label="Distributions" index="7">
-					<menu id="univariate_continuous_distributions" label="Univariate continuous distributions" index="1">
-						<menu id="beta_distribution" label="Beta Distribution" index="0">
-								<entry component="plot_beta_distribution" label="Plot Beta distribution" index="2"/>
-						</menu>
-						<menu id="cauchy_distribution" label="Cauchy Distribution" index="1">
-								<entry component="plot_cauchy_distribution" label="Plot Cauchy distribution" index="2"/>
-						</menu>
-						<menu id="exponential_distribution" label="Exponential Distribution" index="3">
-								<entry component="plot_exponential_distribution" label="Plot Exponential distribution" index="2"/>
-						</menu>
-						<menu id="gamma_distribution" label="Gamma Distribution" index="5">
-								<entry component="plot_gamma_distribution" label="Plot Gamma distribution" index="2"/>
-						</menu>
-						<menu id="logistic_distribution" label="Logistic Distribution" index="7">
-								<entry component="plot_logistic_distribution" label="Plot Logistic distribution" index="2"/>
-						</menu>
-						<menu id="log_normal_distribution" label="Log Normal Distribution" index="8">
-								<entry component="plot_lognormal_distribution" label="Plot Lognormal distribution" index="2"/>
-						</menu>
-						<menu id="tukey_distribution" label="Studentized Range Distribution (Tukey)" index="11">
-								<entry component="plot_tukey_distribution" label="Plot Studentized Range (Tukey) distribution" index="2"/>
-						</menu>
-						<menu id="uniform_distribution" label="Uniform Distribution" index="12">
-								<entry component="plot_uniform_distribution" label="Plot Uniform distribution" index="2"/>
-						</menu>
-						<menu id="weibull_distribution" label="Weibull Distribution" index="13">
-								<entry component="plot_weibull_distribution" label="Plot Weibull distribution" index="2"/>
-						</menu>
-					</menu>
-
-					<menu id="univariate_discrete_distributions" label="Univariate discrete distributions" index="2">
-						<menu id="geom_distribution" label="Geometric Distribution" index="1">
-								<entry component="plot_geometric_distribution" label="Plot Geometric distribution" index="2"/>
-						</menu>
-						<menu id="hypergeometric_distribution" label="Hypergeometric Distribution" index="2">
-								<entry component="plot_hypergeometric_distribution" label="Plot Hypergeometric distribution" index="2"/>
-						</menu>
-						<menu id="negative_binomial_distribution" label="Negative Binomial Distribution" index="3">
-								<entry component="plot_negbinomial_distribution" label="Plot Negative Binomial distribution" index="2"/>
-						</menu>
-						<menu id="wilcoxon_distribution" label="Wilcoxon Rank Sum Distribution" index="5">
-								<entry component="wilcoxon_quantiles" label="Wilcoxon Rank Sum quantiles" index="1"/>
-								<entry component="wilcoxon_probabilities" label="Wilcoxon Rank Sum probabilities" index="0"/>
-								<entry component="plot_wilcoxon_distribution" label="Plot Wilcoxon Rank Sum distribution" index="2"/>
-						</menu>
-					</menu>
-				</menu>
-	</hierarchy>
-
-	<context id="x11">
-		<menu id="device" label="Device" index="1">
-			<entry component="export_x11_device" />
+		<menu id="distributions" label="Distributions" index="7">
 		</menu>
-	</context>
-
-	<context id="import">
-		<menu id="import" label="Import">
-			<entry component="import_spss"/>
-			<entry component="import_csv"/>
-		</menu>
-	</context>
+	</hierarchy>
 </document>
 

Modified: branches/release_branch_0.4.6/rkward/plugins/x11device.pluginmap
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/x11device.pluginmap	2007-02-09 10:45:17 UTC (rev 1367)
+++ branches/release_branch_0.4.6/rkward/plugins/x11device.pluginmap	2007-02-09 10:49:59 UTC (rev 1368)
@@ -2,10 +2,12 @@
 
 <document base_prefix="x11device/" namespace="rkward">
 	<components>
+		<component type="standard" id="export_x11_device" file="export.xml" label="Export..." />
 	</components>
 
 	<context id="x11">
 		<menu id="device" label="Device" index="1">
+			<entry component="export_x11_device" />
 		</menu>
 	</context>
 </document>


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