Revision: 578
http://rpy.svn.sourceforge.net/rpy/?rev=578&view=rev
Author: lgautier
Date: 2008-07-14 08:21:49 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
rlike:
- new package
- in which there is a module 'container'
- in which there is a class 'NamedList'
doc:
- minor editing of the examples (mostly)
demos:
- piddling changes in the UI
Modified Paths:
--------------
branches/rpy_nextgen/NEWS
branches/rpy_nextgen/demos/radmin.py
branches/rpy_nextgen/doc/source/index.rst
branches/rpy_nextgen/doc/source/robjects.rst
branches/rpy_nextgen/doc/source/rpy_classic.rst
branches/rpy_nextgen/rpy/tests.py
branches/rpy_nextgen/setup.py
Modified: branches/rpy_nextgen/NEWS
===================================================================
--- branches/rpy_nextgen/NEWS 2008-07-13 11:46:37 UTC (rev 577)
+++ branches/rpy_nextgen/NEWS 2008-07-14 15:21:49 UTC (rev 578)
@@ -1,10 +1,24 @@
-Release 2.0a1
-=============
+SVN
+===
New features
------------
+:mod:`rpy2.rlike`:
+
+- new package for R-like features in Python
+
+- new module :mod:`rpy2.rlike.container` with the class :class:`NamedList`.
+
+
+
+Release 2.0.0a1
+===============
+
+New features
+------------
+
:mod:`rpy2.robjects`:
- method :meth:`getnames` for :class:`RVector`
Modified: branches/rpy_nextgen/demos/radmin.py
===================================================================
--- branches/rpy_nextgen/demos/radmin.py 2008-07-13 11:46:37 UTC (rev
577)
+++ branches/rpy_nextgen/demos/radmin.py 2008-07-14 15:21:49 UTC (rev
578)
@@ -289,6 +289,7 @@
slabel.show()
sbox.pack_start(slabel, True, True, 0)
self.sentry = gtk.Entry()
+ self.sentry.connect("key_press_event", self.actionKeyPress)
self.sentry.show()
sbox.add(self.sentry)
fbutton = gtk.CheckButton("fuzzy")
@@ -299,6 +300,7 @@
sbutton.connect("clicked", self.searchAction, "search")
sbutton.show()
+ self._sbutton = sbutton
sbox.add(sbutton)
self.pack_start(sbox, expand=False, fill=False, padding=0)
s_window = gtk.ScrolledWindow()
@@ -327,6 +329,10 @@
row.append(pack)
self._table.append(row)
+ def actionKeyPress(self, view, event):
+ if (event.keyval == gtk.gdk.keyval_from_name("Return")):
+ self.searchAction(self._sbutton)
+
def searchAction(self, widget, data=None):
self.updateRelevantHelp(self.sentry.get_text())
@@ -475,6 +481,10 @@
self.append("\n", "input")
self.evaluateAction(self._evalButton)
return True
+ if (event.keyval == gtk.gdk.keyval_from_name("Up")):
+ print('up')
+ if (event.keyval == gtk.gdk.keyval_from_name("Down")):
+ print('down')
def append(self, text, tag="input"):
tag = self.tag_table.lookup(tag)
Modified: branches/rpy_nextgen/doc/source/index.rst
===================================================================
--- branches/rpy_nextgen/doc/source/index.rst 2008-07-13 11:46:37 UTC (rev
577)
+++ branches/rpy_nextgen/doc/source/index.rst 2008-07-14 15:21:49 UTC (rev
578)
@@ -26,6 +26,7 @@
robjects
rinterface
rpy_classic
+ rlike
changes
Modified: branches/rpy_nextgen/doc/source/robjects.rst
===================================================================
--- branches/rpy_nextgen/doc/source/robjects.rst 2008-07-13 11:46:37 UTC
(rev 577)
+++ branches/rpy_nextgen/doc/source/robjects.rst 2008-07-14 15:21:49 UTC
(rev 578)
@@ -328,13 +328,12 @@
specification, that environment is the environment in which the
the formula is created.
-The class :class:`robjects.RFormula` is representing an `R` formula,
-and represents a convenient way of specifying your code.
+The class :class:`robjects.RFormula` is representing an `R` formula.
.. code-block:: python
x = robjects.RVector(array.array('i', range(1, 11)))
- y = x + robjects.r.rnorm(10, sd=0.2)
+ y = x.r + robjects.r.rnorm(10, sd=0.2)
fmla = robjects.RFormula('y ~ x')
env = fmla.getenvironment()
@@ -426,8 +425,8 @@
r.X11()
- r.par(mfrow=array.array('i', [2,2]))
- r.plot(x, y, ylab="foo/bar", col="red")
+ r.layout(r.matrix(array.array('i', [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"}
r.plot(x, y, **kwargs)
Modified: branches/rpy_nextgen/doc/source/rpy_classic.rst
===================================================================
--- branches/rpy_nextgen/doc/source/rpy_classic.rst 2008-07-13 11:46:37 UTC
(rev 577)
+++ branches/rpy_nextgen/doc/source/rpy_classic.rst 2008-07-14 15:21:49 UTC
(rev 578)
@@ -3,6 +3,9 @@
rpy_classic
***********
+.. module:: rpy2.rpy_classix
+ :platform: Unix, Windows
+ :synopsis: Emulate the orignal rpy
This module provides an API similar to the one
Modified: branches/rpy_nextgen/rpy/tests.py
===================================================================
--- branches/rpy_nextgen/rpy/tests.py 2008-07-13 11:46:37 UTC (rev 577)
+++ branches/rpy_nextgen/rpy/tests.py 2008-07-14 15:21:49 UTC (rev 578)
@@ -2,12 +2,17 @@
import rpy2.robjects.tests
import rpy2.rinterface.tests
+import rpy2.rlike.tests
def suite():
suite_robjects = rpy2.robjects.tests.suite()
suite_rinterface = rpy2.rinterface.tests.suite()
- alltests = unittest.TestSuite([suite_robjects, suite_rinterface])
+ suite_rlike = rpy2.rlike.tests.suite()
+ alltests = unittest.TestSuite([suite_robjects,
+ suite_rinterface,
+ suite_rlike])
return alltests
if __name__ == "__main__":
unittest.main(defaultTest = "suite")
+
Modified: branches/rpy_nextgen/setup.py
===================================================================
--- branches/rpy_nextgen/setup.py 2008-07-13 11:46:37 UTC (rev 577)
+++ branches/rpy_nextgen/setup.py 2008-07-14 15:21:49 UTC (rev 578)
@@ -133,8 +133,8 @@
ext_modules = rinterface_exts,
package_dir = pack_dir,
packages = [pack_name,
- # pack_name+'.rlike',
- # pack_name+'.rlike.tests',
+ pack_name+'.rlike',
+ pack_name+'.rlike.tests',
pack_name+'.robjects',
pack_name+'.robjects.tests'] + \
[pack_name + '.rinterface', pack_name + '.rinterface.tests']
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
