changeset 100:d2a6bbeeb474 draft

Uploaded
author bgruening
date Sun, 16 Feb 2014 06:16:54 -0500
parents 399ed00e59c3
children 4235fcb5b090
files cca.xml statistic_tools_macros.xml test-data/cca_out2.pdf test-data/kpca_out2.pdf test-data/pca_out2.pdf test-data/pca_out4.pdf test-data/pca_out6.pdf test-data/regr_out.pdf test-data/regr_out.tabular tool_dependencies.xml
diffstat 10 files changed, 19 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/cca.xml	Mon Feb 10 15:03:58 2014 -0500
+++ b/cca.xml	Sun Feb 16 06:16:54 2014 -0500
@@ -69,7 +69,8 @@
 
 **What it does**
 
-This tool uses functions from 'yacca' library from R statistical package to perform Canonical Correlation Analysis (CCA) on the input data. It outputs two files, one containing the summary statistics of the performed CCA, and the other containing helioplots, which display structural loadings of X and Y variables on different canonical components.   
+This tool uses functions from 'yacca' library from R statistical package to perform Canonical Correlation Analysis (CCA) on the input data. 
+It outputs two files, one containing the summary statistics of the performed CCA, and the other containing helioplots, which display structural loadings of X and Y variables on different canonical components.   
 
 *Carter T. Butts (2009). yacca: Yet Another Canonical Correlation Analysis Package. R package version 1.1.*
 
--- a/statistic_tools_macros.xml	Mon Feb 10 15:03:58 2014 -0500
+++ b/statistic_tools_macros.xml	Sun Feb 16 06:16:54 2014 -0500
@@ -4,33 +4,9 @@
         <requirement type="package" version="3.0.1">R_3_0_1</requirement>
         <requirement type="package" version="2.2.3.6">rpy2</requirement>
         <requirement type="package" version="1.7.1">numpy</requirement>
+        <requirement type="package" version="5.9">ncurses</requirement>
         <requirement type="package" version="6.2">readline</requirement>
         <requirement type="package" version="1.0">R_statistic_tools</requirement>
     </requirements>
   </xml>
-  <xml name="environment">
-    <install version="1.0">
-            <actions>
-                <action type="set_environment_for_install">
-                    <repository name="package_ncurses_5_9" owner="iuc">
-                        <package name="ncurses" version="5.9" />
-                    </repository>
-                    <repository name="package_readline_6_2" owner="iuc">
-                        <package name="readline" version="6.2" />
-                    </repository>
-                    <repository name="package_r_3_0_1" owner="iuc">
-                        <package name="R_3_0_1" version="3.0.1" />
-                    </repository>
-                    <repository name="package_rpy2_2_3_6" owner="bgruening">
-                        <package name="rpy" version="2.2.3.6" />
-                    </repository>
-                </action>
-                <action type="set_environment">
-                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[READLINE_LIB_PATH]</environment_variable>
-                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[NCURSES_LIB_PATH]</environment_variable>
-                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[RHOME]/lib</environment_variable>
-                </action>
-            </actions>
-    </install>
-    </xml>
 </macros>
Binary file test-data/cca_out2.pdf has changed
Binary file test-data/kpca_out2.pdf has changed
Binary file test-data/pca_out2.pdf has changed
Binary file test-data/pca_out4.pdf has changed
Binary file test-data/pca_out6.pdf has changed
Binary file test-data/regr_out.pdf has changed
--- a/test-data/regr_out.tabular	Mon Feb 10 15:03:58 2014 -0500
+++ b/test-data/regr_out.tabular	Sun Feb 16 06:16:54 2014 -0500
@@ -1,10 +1,13 @@
-Y-intercept	-28.1169126094
-p-value (Y-intercept)	0.2942632048
-Slope (c1)	5.7471341245
-p-value (c1)	0.001732877
-Slope (c2)	0.9042745374
-p-value (c2)	0.1146675468
-R-squared	0.93881
-Adjusted R-squared	0.92132
-F-statistic	{'dendf': 7.0, 'value': '53.69463', 'numdf': 2.0}
-Sigma	7.4345007113
+p-value (Y-intercept)	0.294263204753
+Slope (c1)	5.74713412453
+p-value (c1)	[1] 0.001732877
+
+Slope (c2)	0.904274537427
+p-value (c2)	[1] 0.1146675
+
+R-squared	[1] 0.93881
+
+Adjusted R-squared	[1] 0.92132
+
+F-statistic	53.694626423
+Sigma	7.43450071131
--- a/tool_dependencies.xml	Mon Feb 10 15:03:58 2014 -0500
+++ b/tool_dependencies.xml	Sun Feb 16 06:16:54 2014 -0500
@@ -22,9 +22,9 @@
                     <repository changeset_revision="4666f68ad4d5" name="package_r_3_0_1" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="R_3_0_1" version="3.0.1" />
                     </repository>
-                        <package>https://github.com/bgruening/download_store/raw/master/r_statistic_tools/kernlab_0.9-19.tar.gz</package>
-                        <package>https://github.com/bgruening/download_store/raw/master/r_statistic_tools/yacca_1.1.tar.gz</package>
-                        <package>https://github.com/bgruening/download_store/raw/master/r_statistic_tools/car_2.0-19.tar.gz</package>
+                    <package>https://github.com/bgruening/download_store/raw/master/r_statistic_tools/kernlab_0.9-19.tar.gz</package>
+                    <package>https://github.com/bgruening/download_store/raw/master/r_statistic_tools/yacca_1.1.tar.gz</package>
+                    <package>https://github.com/bgruening/download_store/raw/master/r_statistic_tools/car_2.0-19.tar.gz</package>
                 </action>
             </actions>
         </install>