Master root r by omazapa · Pull Request #74 · root-project/root

omazapa · 2015-07-30T22:17:53Z

Code from ROOT R project,
-> New features added. now you can use R functions in C++ very easy using the class TRFunctionImport, that have overloaded operators to use objects like functions that receives template arguments and return TRObjects.
-> Documentation updated in http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide#Import

Best Regards

Conflicts: bindings/r/src/TRInterface.cxx

…t c++ function to R's environment othar class will be create called TRFunctionImport to call R's function in c++ like c++ functions

… very easy

->removed unneeded code -> added method AsMatrix and Print in TRDataFrame

…ect c=robj.Attr["someatt"]

…butes requires error control in the returned TRObject seeting status and in set paasing nullprt

Axel-Naumann · 2015-07-31T07:55:47Z

Hi Omar,

we have changed the documentation syntax to doxygen; you have reverted some of these changes in your patch. Could you fix that, please?

Cheers, Axel.

Axel-Naumann · 2015-07-31T08:49:47Z

Can you add a newline?

omazapa · 2015-07-31T17:05:59Z

Hi Axel,
Yes, I will to write the doc in doxygen.

Thanks you

…x, added entry to generate doxugen doc for ROOT R in documentation/doxygen/Doxyfile

omazapa · 2015-08-03T07:45:49Z

Hi Axel,

The fixes are ready and the documentation in doxygen is ready
http://files.oproject.org/root/rootdoc/html/group___r.html
users guide in markdown integrate to doxygen
http://files.oproject.org/root/rootdoc/html/md__home_omazapa_root_bindings_r_doc_users-guide__r_o_o_t_r__users__guide.html

Best regards

and a new constructor for TRFunctionImport

omazapa · 2015-08-30T03:23:48Z

Hi Axel and Lorenzo,

I have all updated, well tested and ready for merge.
If you want to do other review and you have corrections please let me know.

On the other hand I have a question:
I have a users guide in markdown in $ROOTSYS/bindings/r/doc/users-guide and I can see that in the last commits you have the users guides in $ROOTSYS/documentation/users-guide
must I move my users guide there?

Best Regards!

For small unit tests like the RooFit pythonization tests, the overhead of starting the Python interpreter is dominant. That means the tests should not be too granular. I think testing the RooFit pythonizations with separate Python executions at the level of the different RooFit classes was indeed too granular. Therefore, this commit suggests to have a single RooFit pythonization unit test. Running the unit tests before (single thread): ```txt Test project /home/rembserj/code/root/root_build/bindings/pyroot/pythonizations/test Start 64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabscollection 1/14 Test root-project#64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabscollection ....... Passed 1.09 sec Start 65: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabspdf-fitto 2/14 Test root-project#65: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabspdf-fitto ........ Passed 1.13 sec Start 66: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabsreal-ploton 3/14 Test root-project#66: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabsreal-ploton ...... Passed 1.14 sec Start 67: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooarglist 4/14 Test root-project#67: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooarglist ............. Passed 0.93 sec Start 68: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roocmdarg 5/14 Test root-project#68: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roocmdarg .............. Passed 0.95 sec Start 69: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-numpy 6/14 Test root-project#69: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-numpy ...... Passed 1.32 sec Start 70: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-ploton 7/14 Test root-project#70: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-ploton ..... Passed 1.09 sec Start 71: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset 8/14 Test root-project#71: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset ............. Passed 1.03 sec Start 72: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset-numpy 9/14 Test root-project#72: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset-numpy ....... Passed 1.70 sec Start 73: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooglobalfunc 10/14 Test root-project#73: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooglobalfunc .......... Passed 1.21 sec Start 74: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roojsonfactorywstool 11/14 Test root-project#74: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roojsonfactorywstool ... Passed 1.40 sec Start 75: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roolinkedlist 12/14 Test root-project#75: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roolinkedlist .......... Passed 0.87 sec Start 76: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roosimultaneous 13/14 Test root-project#76: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roosimultaneous ........ Passed 1.09 sec Start 77: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooworkspace 14/14 Test root-project#77: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooworkspace ........... Passed 1.21 sec 100% tests passed, 0 tests failed out of 14 Label Time Summary: python = 16.16 sec*proc (14 tests) python_runtime_deps = 3.02 sec*proc (2 tests) Total Test time (real) = 16.17 sec ``` With this commit: ```txt Test project /home/rembserj/code/root/root_build/bindings/pyroot/pythonizations/test Start 64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit 1/1 Test root-project#64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit ... Passed 3.27 sec 100% tests passed, 0 tests failed out of 1 Label Time Summary: python = 3.27 sec*proc (1 test) Total Test time (real) = 3.27 sec ```

For small unit tests like the RooFit pythonization tests, the overhead of starting the Python interpreter is dominant. That means the tests should not be too granular. I think testing the RooFit pythonizations with separate Python executions at the level of the different RooFit classes was indeed too granular. Therefore, this commit suggests to have a single RooFit pythonization unit test. Running the unit tests before (single thread): ```txt Test project /home/rembserj/code/root/root_build/bindings/pyroot/pythonizations/test Start 64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabscollection 1/14 Test #64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabscollection ....... Passed 1.09 sec Start 65: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabspdf-fitto 2/14 Test #65: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabspdf-fitto ........ Passed 1.13 sec Start 66: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabsreal-ploton 3/14 Test #66: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooabsreal-ploton ...... Passed 1.14 sec Start 67: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooarglist 4/14 Test #67: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooarglist ............. Passed 0.93 sec Start 68: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roocmdarg 5/14 Test #68: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roocmdarg .............. Passed 0.95 sec Start 69: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-numpy 6/14 Test #69: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-numpy ...... Passed 1.32 sec Start 70: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-ploton 7/14 Test #70: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodatahist-ploton ..... Passed 1.09 sec Start 71: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset 8/14 Test #71: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset ............. Passed 1.03 sec Start 72: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset-numpy 9/14 Test #72: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roodataset-numpy ....... Passed 1.70 sec Start 73: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooglobalfunc 10/14 Test #73: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooglobalfunc .......... Passed 1.21 sec Start 74: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roojsonfactorywstool 11/14 Test #74: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roojsonfactorywstool ... Passed 1.40 sec Start 75: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roolinkedlist 12/14 Test #75: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roolinkedlist .......... Passed 0.87 sec Start 76: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roosimultaneous 13/14 Test #76: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-roosimultaneous ........ Passed 1.09 sec Start 77: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooworkspace 14/14 Test #77: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit-rooworkspace ........... Passed 1.21 sec 100% tests passed, 0 tests failed out of 14 Label Time Summary: python = 16.16 sec*proc (14 tests) python_runtime_deps = 3.02 sec*proc (2 tests) Total Test time (real) = 16.17 sec ``` With this commit: ```txt Test project /home/rembserj/code/root/root_build/bindings/pyroot/pythonizations/test Start 64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit 1/1 Test #64: pyunittests-bindings-pyroot-pythonizations-pyroot-roofit ... Passed 3.27 sec 100% tests passed, 0 tests failed out of 1 Label Time Summary: python = 3.27 sec*proc (1 test) Total Test time (real) = 3.27 sec ```

omazapa added 17 commits May 16, 2015 00:34

ROOTR: fixed TRDataFrame to support operators on Linux

352d480

ROOTR: if TRDataFrame is empty then df["var"]=v create the first column

af0714f

Merge remote-tracking branch 'upstream/master' into master-root-R

f020397

Conflicts: bindings/r/src/TRInterface.cxx

Merge remote-tracking branch 'upstream/master' into master-root-R

326475c

Merge branch 'master' into master-root-R

ed53da7

ROOTR: TRFunction changed to TRFunctionExport that is the class expor…

539ce7a

…t c++ function to R's environment othar class will be create called TRFunctionImport to call R's function in c++ like c++ functions

ROOTR: added TRFunctionImport, now you can call R's fucntion from c++…

2f98d0b

… very easy

ROOTR:

74e0ffa

->removed unneeded code -> added method AsMatrix and Print in TRDataFrame

ROOTR: exported TRFunctionImport using wrap/as from Rcpp

ff3aefc

ROOTR: working in TRObject, Attr is not working for assignation TRObj…

05b16fe

…ect c=robj.Attr["someatt"]

ROOTR: added methods Set/GetAttribute to work with the TRObject Attri…

87ed909

…butes requires error control in the returned TRObject seeting status and in set paasing nullprt

ROOTR: fixed tutorials for TRFunctionExport and TRFunctionExport

0e753a9

Merge branch 'master' into master-root-R

88f2e97

ROOTR: added support for assignation in TRFunctionImport

b642a7c

ROOTR: added example in tutorials for TRFunctionImport

d06a2a8

Merge remote-tracking branch 'root-mirror/master' into master-root-R

dde7035

ROOTR: fixed issue with ROOT::R::Label

5e7c3ec

Axel-Naumann reviewed Jul 31, 2015
View reviewed changes

Comment thread tutorials/r/Function.C

Copy link
Copy Markdown

Member

Axel-Naumann Jul 31, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a newline?

omazapa added 7 commits August 1, 2015 18:21

ROOTR: documented TRObject with Doxygen

770095a

ROOTR: added documentation for TRDataFrame with doxygen

3e95e32

ROOTR: working to improved ROOTR documentation with doxygen

28484e5

ROOTR: added documentation for TRInterface and removed unneeded method

f81b074

ROOTR: fixed markdown users guide to support github and doxygen synta…

8f4ea50

…x, added entry to generate doxugen doc for ROOT R in documentation/doxygen/Doxyfile

ROOTR: small fixes in doc generation, all working very fine.

a2baf02

Merge remote-tracking branch 'root-mirror/master' into master-root-R

f3e737b

ROOTR: added default graphics device option in TRInterface

ae884ee

and a new constructor for TRFunctionImport

Axel-Naumann assigned lmoneta Aug 21, 2015

omazapa added 3 commits August 23, 2015 16:37

Merge branch 'master' into master-root-R

77417fe

Merge branch 'master' into master-root-R

b136f9c

ROOTR: fixed compilation with autotools

8e5205d

ROOTR: added needed cast operator to SEXP(Raw R object)

2c36667

omazapa closed this Sep 4, 2015

peremato unassigned lmoneta Mar 1, 2017

ethereal-space-cadet16 mentioned this pull request May 31, 2022

Accessing pyROOT #10676

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Master root r#74

Master root r#74
omazapa wants to merge 29 commits intoroot-project:masterfrom
omazapa:master-root-R

omazapa commented Jul 30, 2015

Uh oh!

Axel-Naumann commented Jul 31, 2015

Uh oh!

Axel-Naumann Jul 31, 2015

Uh oh!

omazapa commented Jul 31, 2015

Uh oh!

omazapa commented Aug 3, 2015

Uh oh!

omazapa commented Aug 30, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

omazapa commented Jul 30, 2015

Uh oh!

Axel-Naumann commented Jul 31, 2015

Uh oh!

Axel-Naumann Jul 31, 2015

Choose a reason for hiding this comment

Uh oh!

omazapa commented Jul 31, 2015

Uh oh!

omazapa commented Aug 3, 2015

Uh oh!

omazapa commented Aug 30, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants