# HG changeset patch
# User davidvanzessen
# Date 1380525644 14400
# Node ID 28cfca2e415d1e8ca7eb5799a5c82f9981de89a3
# Parent  705b77be17cf070b2e47b1e40c4bf87ded403a77
Uploaded

diff -r 705b77be17cf -r 28cfca2e415d RScript.r
--- a/RScript.r	Fri Sep 27 09:40:57 2013 -0400
+++ b/RScript.r	Mon Sep 30 03:20:44 2013 -0400
@@ -91,12 +91,12 @@
 #plotall
 #ggsave(outFile, dpi=125)
 
-#sink(outFile, append=FALSE, split=FALSE)
-#merged
-#unlink(outFile)
+sink(outFile, append=FALSE, split=FALSE)
+merged
+unlink(outFile)
 
-png(outFile,width = 1920, height = 1200)
-print(plotall = grid.arrange(pV, arrangeGrob(pD, pJ, ncol=2), ncol=1, widths=c(1,1.2)))
-dev.off()
+#png(outFile,width = 1920, height = 1200)
+#print(plotall = grid.arrange(pV, arrangeGrob(pD, pJ, ncol=2), ncol=1, widths=c(1,1.2)))
+#dev.off()
 
 
diff -r 705b77be17cf -r 28cfca2e415d tool_dependencies.xml
--- a/tool_dependencies.xml	Fri Sep 27 09:40:57 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<tool_dependency>
-    <package name="R" version="2.15.1">
-        <install version="1.0">
-            <actions>
-                <action type="download_by_url">http://CRAN.R-project.org/src/base/R-2/R-2.15.1.tar.gz</action>
-                <action type="shell_command">./configure --prefix=$INSTALL_DIR --with-x=no</action>
-                <action type="shell_command">make</action>
-                
-                <action type="download_file">http://cran.r-project.org/src/contrib/gridExtra_0.9.1.tar.gz</action>
-                <action type="move_file">
-					<source>gridExtra_0.9.1.tar.gz</source>
-					<destination>$INSTALL_DIR</destination>
-                </action>
-                <action type="shell_command">$INSTALL_DIR/bin/R CMD INSTALL $INSTALL_DIR/gridExtra_0.9.1.tar.gz</action>
-                
-                <action type="download_file">http://cran.r-project.org/src/contrib/ggplot2_0.9.3.1.tar.gz</action>
-				<action type="move_file">
-					<source>ggplot2_0.9.3.1.tar.gz</source>
-					<destination>$INSTALL_DIR</destination>
-                </action>
-                <action type="shell_command">$INSTALL_DIR/bin/R CMD INSTALL $INSTALL_DIR/ggplot2_0.9.3.1.tar.gz</action>
-                
-                <action type="download_file">http://cran.r-project.org/src/contrib/plyr_1.8.tar.gz</action>
-                <action type="move_file">
-					<source>plyr_1.8.tar.gz</source>
-					<destination>$INSTALL_DIR</destination>
-                </action>
-                <action type="shell_command">$INSTALL_DIR/bin/R CMD INSTALL $INSTALL_DIR/plyr_1.8.tar.gz</action>
-                
-                
-                <action type="set_environment">
-                    <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
-                </action>
-                <action type="set_environment">
-                    <environment_variable name="R_SCRIPT_PATH" action="set_to">$REPOSITORY_INSTALL_DIR</environment_variable>
-                </action>
-            </actions>
-        </install>
-        <readme>You need a FORTRAN compiler or perhaps f2c in addition to a C compiler to build R.</readme>
-    </package>
-</tool_dependency>