cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed rstat.getDataFrame()

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2095 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2007-10-08 10:52:26 +00:00
parent c29f109cfa
commit 4c08d6d022
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pyscript/configure.zcml
View file

@ -20,7 +20,7 @@
/> />
<require <require
permission="zope.ManageContent" permission="zope.ManageContent"
set_attributes="parameters source contentType" set_attributes="title parameters source contentType"
/> />
<implements <implements
interface="zope.annotation.interfaces.IAttributeAnnotatable" interface="zope.annotation.interfaces.IAttributeAnnotatable"

9
pyscript/rstat.py
View file

@ -88,7 +88,7 @@ class RStat(object):
rows = {} rows = {}
for rowId, columnId, value in data: for rowId, columnId, value in data:
element = rows.setdefault(rowId, []) element = rows.setdefault(rowId, [])
element.append(rowId) element.append(columnId)
columnsToOmit = [] columnsToOmit = []
for rowId, row in rows.items(): for rowId, row in rows.items():
for columnId in row: for columnId in row:
@ -98,8 +98,7 @@ class RStat(object):
result = {} result = {}
for rowId, columnId, value in data: for rowId, columnId, value in data:
if columnId not in columnsToOmit: if columnId not in columnsToOmit:
element = result.setdefault(rowId, []) result.setdefault(rowId, []).append(value)
element.append(value) #print result
rpy.set_default_mode(rpy.NO_CONVERSION) matrix = rpy.with_mode(rpy.NO_CONVERSION, r.data_frame)(**result)
matrix = r.data_frame(**result)
return matrix return matrix

2
pyscript/script.py
View file

@ -61,7 +61,7 @@ class RExpression(RestrictedPython.RCompile.RestrictedCompileMode):
CodeGeneratorClass = compiler.pycodegen.ExpressionCodeGenerator CodeGeneratorClass = compiler.pycodegen.ExpressionCodeGenerator
def __init__(self, source, filename, mode = "eval"): def __init__(self, source, filename, mode="eval"):
self.mode = mode self.mode = mode
RestrictedPython.RCompile.RestrictedCompileMode.__init__( RestrictedPython.RCompile.RestrictedCompileMode.__init__(
self, source, filename) self, source, filename)

12
pyscript/tests.py
View file

@ -26,7 +26,7 @@ from zope.traversing.interfaces import IPhysicallyLocatable
from zope.traversing.adapters import RootPhysicallyLocatable from zope.traversing.adapters import RootPhysicallyLocatable
from zope.app.container.contained import Contained from zope.app.container.contained import Contained
from zope.app.testing import placelesssetup from zope.app.testing import placelesssetup
from cybertools.pyscript.script import ScriptContainer from cybertools.pyscript.script import ScriptContainer, HAS_R
class Root(ScriptContainer, Contained): class Root(ScriptContainer, Contained):
@ -44,10 +44,12 @@ def setUp(test):
def test_suite(): def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( suites = [DocFileSuite('README.txt', optionflags=flags,
DocFileSuite('README.txt', optionflags=flags, setUp=setUp, tearDown=placelesssetup.tearDown)]
setUp=setUp, tearDown=placelesssetup.tearDown), if HAS_R:
)) suites.append(DocFileSuite('rstat.txt', optionflags=flags,
setUp=setUp, tearDown=placelesssetup.tearDown))
return unittest.TestSuite(suites)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()