Skip to content

Master root r #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
omazapa wants to merge 29 commits into from
Closed

Master root r #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
352d480
ROOTR: fixed TRDataFrame to support operators on Linux
omazapa May 16, 2015
af0714f
ROOTR: if TRDataFrame is empty then df["var"]=v create the first column
omazapa May 16, 2015
f020397
Merge remote-tracking branch 'upstream/master' into master-root-R
omazapa May 27, 2015
326475c
Merge remote-tracking branch 'upstream/master' into master-root-R
omazapa May 28, 2015
ed53da7
Merge branch 'master' into master-root-R
omazapa Jun 4, 2015
539ce7a
ROOTR: TRFunction changed to TRFunctionExport that is the class expor…
omazapa Jun 29, 2015
2f98d0b
ROOTR: added TRFunctionImport, now you can call R's fucntion from c++…
omazapa Jun 29, 2015
74e0ffa
ROOTR:
omazapa Jun 29, 2015
ff3aefc
ROOTR: exported TRFunctionImport using wrap/as from Rcpp
omazapa Jun 29, 2015
05b16fe
ROOTR: working in TRObject, Attr is not working for assignation TRObj…
omazapa Jul 2, 2015
87ed909
ROOTR: added methods Set/GetAttribute to work with the TRObject Attri…
omazapa Jul 5, 2015
0e753a9
ROOTR: fixed tutorials for TRFunctionExport and TRFunctionExport
omazapa Jul 26, 2015
88f2e97
Merge branch 'master' into master-root-R
omazapa Jul 26, 2015
b642a7c
ROOTR: added support for assignation in TRFunctionImport
omazapa Jul 26, 2015
d06a2a8
ROOTR: added example in tutorials for TRFunctionImport
omazapa Jul 27, 2015
dde7035
Merge remote-tracking branch 'root-mirror/master' into master-root-R
omazapa Jul 30, 2015
5e7c3ec
ROOTR: fixed issue with ROOT::R::Label
omazapa Jul 30, 2015
770095a
ROOTR: documented TRObject with Doxygen
omazapa Aug 1, 2015
3e95e32
ROOTR: added documentation for TRDataFrame with doxygen
omazapa Aug 2, 2015
28484e5
ROOTR: working to improved ROOTR documentation with doxygen
omazapa Aug 3, 2015
f81b074
ROOTR: added documentation for TRInterface and removed unneeded method
omazapa Aug 3, 2015
8f4ea50
ROOTR: fixed markdown users guide to support github and doxygen synta…
omazapa Aug 3, 2015
a2baf02
ROOTR: small fixes in doc generation, all working very fine.
omazapa Aug 3, 2015
f3e737b
Merge remote-tracking branch 'root-mirror/master' into master-root-R
omazapa Aug 3, 2015
ae884ee
ROOTR: added default graphics device option in TRInterface
omazapa Aug 17, 2015
77417fe
Merge branch 'master' into master-root-R
omazapa Aug 23, 2015
b136f9c
Merge branch 'master' into master-root-R
omazapa Aug 26, 2015
8e5205d
ROOTR: fixed compilation with autotools
omazapa Aug 30, 2015
2c36667
ROOTR: added needed cast operator to SEXP(Raw R object)
omazapa Aug 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions bindings/r/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@ set(libname RInterface)
include_directories(${R_INCLUDE_DIRS})

set(R_HEADERS ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRInterface.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRObjectProxy.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRFunction.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRObject.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRFunctionExport.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRFunctionImport.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRInternalFunction.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRDataFrame.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/RExports.h)
set(RHIST_HEADERS ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRF1.h
${CMAKE_SOURCE_DIR}/bindings/r/inc/TRGraph.h)
set(ROI_HEADERS ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRFile.h)
set(RGPAD_HEADERS ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRCanvas.h)
set(RRINT_HEADERS ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRRint.h)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)

ROOT_GENERATE_DICTIONARY(G__RInterface ${R_HEADERS} MODULE ${libname} LINKDEF LinkDef.h)
Expand Down
19 changes: 9 additions & 10 deletions bindings/r/Module.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,19 @@ RDO := $(RDS:.cxx=.o)

RDH := $(MODDIRI)/RExports.h \
$(MODDIRI)/TRInterface.h \
$(MODDIRI)/TRObjectProxy.h \
$(MODDIRI)/TRFunction.h \
$(MODDIRI)/TRInterface_Binding.h \
$(MODDIRI)/TRObject.h \
$(MODDIRI)/TRDataFrame.h \
$(MODDIRI)/TRDataFrame__ctors.h \
$(MODDIRI)/TRFunctionImport.h \
$(MODDIRI)/TRFunctionImport__oprtr.h \
$(MODDIRI)/TRFunctionExport.h \
$(MODDIRI)/TRInternalFunction.h \
$(MODDIRI)/TRInternalFunction__ctors.h
$(MODDIRI)/TRInternalFunction__ctors.h

RDHMOD := $(MODDIRI)/TRCanvas.h \
$(MODDIRI)/TRF1.h \
$(MODDIRI)/TRRint.h \
$(MODDIRI)/TRFile.h \
$(MODDIRI)/TRGraph.h \
$(MODDIRI)/TRSystem.h


RH := $(RDH) $(RDHMOD)
RH := $(RDH)
RS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
RO := $(call stripsrc,$(RS:.cxx=.o))

Expand Down
Loading