Merged from tuesy

Author: clbustos

lib/rinruby.rb

@@ -2,7 +2,7 @@
 #
 #RinRuby is a Ruby library that integrates the R interpreter in Ruby, making R's statistical routines and graphics available within Ruby.  The library consists of a single Ruby script that is simple to install and does not require any special compilation or installation of R.  Since the library is 100% pure Ruby, it works on a variety of operating systems, Ruby implementations, and versions of R.  RinRuby's methods are simple, making for readable code.  The {website [rinruby.ddahl.org]}[http://rinruby.ddahl.org] describes RinRuby usage, provides comprehensive documentation, gives several examples, and discusses RinRuby's implementation.
 #
-#Below is a simple example of RinRuby usage for simple linear regression. The simulation parameters are defined in Ruby, computations are performed in R, and Ruby reports the results. In a more elaborate application, the simulation parameter might come from input from a graphical user interface, the statistical analysis might be more involved, and the results might be an HTML page or PDF report. 
+#Below is a simple example of RinRuby usage for simple linear regression. The simulation parameters are defined in Ruby, computations are performed in R, and Ruby reports the results. In a more elaborate application, the simulation parameter might come from input from a graphical user interface, the statistical analysis might be more involved, and the results might be an HTML page or PDF report.
 #
 #<b>Code</b>:
 #
@@ -34,6 +34,7 @@
 #
 #Coded by:: David B. Dahl
 #Documented by:: David B. Dahl & Scott Crawford
+#Maintained by:: Claudio Bustos
 #Copyright:: 2005-2009
 #Web page:: http://rinruby.ddahl.org
 #E-mail::   mailto:rinruby@ddahl.org
@@ -58,21 +59,19 @@
 #The files "java" and "readline" are used when available to add functionality.
 require 'matrix'
 class RinRuby
-  
+
   require 'socket'
 
-  
   VERSION = '2.0.3'
 
-
   attr_reader :interactive
   attr_reader :readline
   # Exception for closed engine
   EngineClosed=Class.new(Exception)
   # Parse error
   ParseError=Class.new(Exception)
-  
-  
+
+
 #RinRuby is invoked within a Ruby script (or the interactive "irb" prompt denoted >>) using:
 #
 #      >> require "rinruby"
@@ -98,7 +97,7 @@ class RinRuby
 #      >> require "rinruby"
 #      >> R.quit
 #      >> R = RinRuby.new(false)
-attr_reader :echo_enabled
+attr_accessor :echo_enabled
 attr_reader :executable
 attr_reader :port_number
 attr_reader :port_width
@@ -115,7 +114,7 @@ def initialize(*args)
     opts[:port_width]=args.shift unless args.size==0
   end
   default_opts= {:echo=>true, :interactive=>true, :executable=>nil, :port_number=>38442, :port_width=>1000, :hostname=>'127.0.0.1'}
-  
+
     @opts=default_opts.merge(opts)
     @port_width=@opts[:port_width]
     @executable=@opts[:executable]
@@ -187,16 +186,16 @@ def initialize(*args)
 #The quit method will properly close the bridge between Ruby and R, freeing up system resources. This method does not need to be run when a Ruby script ends.
 
   def quit
-    begin 
+    begin
       @writer.puts "q(save='no')"
       # TODO: Verify if read is needed
       @socket.read()
-      #@socket.close 
-      @engine.close 
-  
-      
-      @server_socket.close 
-      #@reader.close 
+      #@socket.close
+      @engine.close
+
+
+      @server_socket.close
+      #@reader.close
       #@writer.close
       true
     ensure
@@ -527,8 +526,8 @@ def echo(enable=nil,stderr=nil)
   RinRuby_Max_R_Integer = 2**31-1
   RinRuby_Min_R_Integer = -2**31+1
   #:startdoc:
-  
-  
+
+
   def r_rinruby_parseable
     @writer.puts <<-EOF
     rinruby_parseable<-function(var) {
@@ -561,7 +560,7 @@ def r_rinruby_get_value
       }
     EOF
   end
-  
+
   def r_rinruby_pull
  @writer.puts <<-EOF
  rinruby_pull <-function(var)
@@ -573,7 +572,7 @@ def r_rinruby_pull
       writeBin(as.integer(#{RinRuby_Type_Matrix}),#{RinRuby_Socket},endian="big")
       writeBin(as.integer(dim(var)[1]),#{RinRuby_Socket},endian="big")
       writeBin(as.integer(dim(var)[2]),#{RinRuby_Socket},endian="big")
-      
+
     }  else if ( is.double(var) ) {
       writeBin(as.integer(#{RinRuby_Type_Double}),#{RinRuby_Socket},endian="big")
       writeBin(as.integer(length(var)),#{RinRuby_Socket},endian="big")
@@ -595,8 +594,8 @@ def r_rinruby_pull
   }
 }
     EOF
-    
-    
+
+
   end
   def to_signed_int(y)
     if y.kind_of?(Integer)
@@ -614,7 +613,7 @@ def assign_engine(name, value)
       eval "#{name}=matrix(c(#{values.join(',')}), #{value.row_size}, #{value.column_size}, TRUE)"
       return original_value
     end
-    
+
     if value.kind_of?(String)
       type = RinRuby_Type_String
       length = 1
@@ -687,7 +686,7 @@ def pull_engine(string)
     end
     @socket.read(4,buffer)
     length = to_signed_int(buffer.unpack('N')[0].to_i)
-    
+
     if ( type == RinRuby_Type_Double )
       @socket.read(8*length,buffer)
       result = buffer.unpack('G'*length)
@@ -730,12 +729,12 @@ def complete?(string)
     @writer.puts "rm(#{RinRuby_Parse_String})"
     result = to_signed_int(buffer.unpack('N')[0].to_i)
     return result==-1 ? false : true
-    
-=begin    
-    
+
+=begin
+
     result = pull_engine("unlist(lapply(c('.*','^Error in parse.*','^Error in parse.*unexpected end of input.*'),
       grep,try({parse(text=#{RinRuby_Parse_String}); 1}, silent=TRUE)))")
-    
+
     return true if result.length == 1
     return false if result.length == 3
     raise ParseError, "Parse error"