Revision: 717
http://rpy.svn.sourceforge.net/rpy/?rev=717&view=rev
Author: lgautier
Date: 2008-12-14 12:35:42 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
- version is now 2.0.x-dev
- minor editing in the doc
Modified Paths:
--------------
rpy2/branches/version_2.0.x/doc/source/introduction.rst
rpy2/branches/version_2.0.x/doc/source/robjects.rst
rpy2/branches/version_2.0.x/setup.py
Modified: rpy2/branches/version_2.0.x/doc/source/introduction.rst
===================================================================
--- rpy2/branches/version_2.0.x/doc/source/introduction.rst 2008-12-13
14:48:26 UTC (rev 716)
+++ rpy2/branches/version_2.0.x/doc/source/introduction.rst 2008-12-14
12:35:42 UTC (rev 717)
@@ -126,7 +126,7 @@
Simple example:
>>> letters = robjects.r['letters']
->>> rcode = 'paste(%s, collapse="-")' %(repr(letters))
+>>> rcode = 'paste(%s, collapse="-")' %(letters.r_repr())
>>> robjects.r(rcode)
"a-b-c-d-e-f-g-h-i-j-k-l-m-n-o-p-q-r-s-t-u-v-w-x-y-z"
@@ -214,23 +214,24 @@
========
This section demonstrates some of the features of
-rpy2 by the example. The wiki on the sourceforge website
-will hopefully be used as a cookbook.
+rpy2 by the example.
+Function calls and plotting
+---------------------------
+
.. code-block:: python
import rpy2.robjects as robjects
- import array
r = robjects.r
- x = array.array('i', range(10))
+ x = robjects.IntVector(range(10))
y = r.rnorm(10)
r.X11()
- r.layout(r.matrix(array.array('i', [1,2,3,2]), nrow=2, ncol=2))
+ r.layout(r.matrix(robjects.IntVector([1,2,3,2]), nrow=2, ncol=2))
r.plot(r.runif(10), y, xlab="runif", ylab="foo/bar", col="red")
kwargs = {'ylab':"foo/bar", 'type':"b", 'col':"blue", 'log':"x"}
@@ -307,21 +308,4 @@
-S4 classes
-----------
-.. code-block:: python
-
- import rpy2.robjects as robjects
- import array
-
- r = robjects.r
-
- r.setClass("Track",
- r.representation(x="numeric", y="numeric"))
-
- a = r.new("Track", x=0, y=1)
-
- a.x
-
-
Modified: rpy2/branches/version_2.0.x/doc/source/robjects.rst
===================================================================
--- rpy2/branches/version_2.0.x/doc/source/robjects.rst 2008-12-13 14:48:26 UTC
(rev 716)
+++ rpy2/branches/version_2.0.x/doc/source/robjects.rst 2008-12-14 12:35:42 UTC
(rev 717)
@@ -228,10 +228,19 @@
The python :meth:`__getitem__` method behaves like a Python user would expect
it for a vector (and indexing starts at zero),
-while the method :meth:`subset` behaves like a R user would expect it
-(indexing starts at one, and a vector of integers, booleans, or strings can
-be given to subset elements).
+while the method :meth:`subset` behaves like a R user would expect subsetting
+to happen that is:
+* indexing starts at one
+
+* the parameter to subset on can be a vector of
+
+ - integers (negative integers meaning exlusion of the element)
+
+ - booleans
+
+ - strings
+
>>> x = robjects.r.seq(1, 10)
>>> x[0]
1
@@ -257,7 +266,7 @@
>>> x.r[True]
1:10
-This class is using the class :class:`rinterface.SexpVector`,
+This class is extending the class :class:`rinterface.SexpVector`,
and its documentation can be referred to for details of what is happenening
at the low-level.
Modified: rpy2/branches/version_2.0.x/setup.py
===================================================================
--- rpy2/branches/version_2.0.x/setup.py 2008-12-13 14:48:26 UTC (rev
716)
+++ rpy2/branches/version_2.0.x/setup.py 2008-12-14 12:35:42 UTC (rev
717)
@@ -4,7 +4,7 @@
pack_name = 'rpy2'
-pack_version = '2.0.0'
+pack_version = '2.0.x-dev'
RHOMES = os.getenv('RHOMES')
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
