Skip to content

[DF][Fix root-project#9116] Display pretty Print and AsString#9203

Merged
eguiraud merged 1 commit intoroot-project:masterfrom
ikabadzhov:Beautiful_Display
Nov 1, 2021
Merged

[DF][Fix root-project#9116] Display pretty Print and AsString#9203
eguiraud merged 1 commit intoroot-project:masterfrom
ikabadzhov:Beautiful_Display

Conversation

@ikabadzhov
Copy link
Copy Markdown
Contributor

@ikabadzhov ikabadzhov commented Oct 28, 2021 •
edited
Loading

This Pull request:

Additional custom column "rdfentry_" added to the Display()

The RDisplay constructor is adjusted so that is prints the name of the
first column as "Row" (that is always "rdfentry_").

Function DashesBetweenLines added to display dashes in the beginning,
between entries and in the end of the Print() and AsString() methods.
To first column is used to check if there is a new entry in the table.

Moreover, the GetColumnsToShorten() method now considers spaces between
columns when counting the total width of the table.

All tests are adjusted accordingly.

Changes or fixes:

More beatiful Display.

Checklist:

  • tested changes locally
  • updated the docs (if necessary)

This PR fixes #9116

@ikabadzhov ikabadzhov requested a review from eguiraud as a code owner October 28, 2021 11:12
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu2004/soversion, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Build failed on ROOT-ubuntu16/nortcxxmod.
Running on sft-ubuntu-1604-1.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-10-28T11:18:37.537Z] FAILED: /usr/bin/ccache /usr/bin/c++ -DVECCORE_ENABLE_VC -I/mnt/build/workspace/root-pullrequests-build/root/tree/dataframe/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/unix/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/foundation/v7/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/base/v7/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/clingutils/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/textinput/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/thread/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/zip/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/rint/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/clib/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/meta/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/gui/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/cont/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/foundation/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/base/inc -Iginclude -I/mnt/build/workspace/root-pullrequests-build/root/tree/tree/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/imt/inc -I/mnt/build/workspace/root-pullrequests-build/root/core/multiproc/inc -I/mnt/build/workspace/root-pullrequests-build/root/math/mathcore/inc -I/mnt/build/workspace/root-pullrequests-build/root/math/mathcore/v7/inc -Iexternals/mnt/build/workspace/root-pullrequests-build/install/include -I/mnt/build/workspace/root-pullrequests-build/root/tree/treeplayer/inc -I/mnt/build/workspace/root-pullrequests-build/root/hist/hist/inc -I/mnt/build/workspace/root-pullrequests-build/root/math/matrix/inc -I/mnt/build/workspace/root-pullrequests-build/root/math/vecops/inc -I/mnt/build/workspace/root-pullrequests-build/root/net/net/inc -I/mnt/build/workspace/root-pullrequests-build/root/io/io/inc -I/mnt/build/workspace/root-pullrequests-build/root/graf2d/gpad/inc -I/mnt/build/workspace/root-pullrequests-build/root/graf2d/graf/inc -I/mnt/build/workspace/root-pullrequests-build/root/graf3d/g3d/inc -fdiagnostics-color=always -std=c++14 -pipe -Wshadow -Wall -W -Woverloaded-virtual -fsigned-char -pthread -O3 -fPIC -std=c++14 -MD -MT tree/dataframe/CMakeFiles/ROOTDataFrame.dir/src/RDFInterfaceUtils.cxx.o -MF tree/dataframe/CMakeFiles/ROOTDataFrame.dir/src/RDFInterfaceUtils.cxx.o.d -o tree/dataframe/CMakeFiles/ROOTDataFrame.dir/src/RDFInterfaceUtils.cxx.o -c /mnt/build/workspace/root-pullrequests-build/root/tree/dataframe/src/RDFInterfaceUtils.cxx
  • [2021-10-28T11:18:37.538Z] /mnt/build/workspace/root-pullrequests-build/root/tree/dataframe/inc/ROOT/RDF/RInterface.hxx:110:18: error: ‘ROOT::RDF::RInterface<ROOT::Detail::RDF::RNodeBase, void>::RLoopManager* ROOT::RDF::RInterface<ROOT::Detail::RDF::RNodeBase, void>::fLoopManager’ is private
  • [2021-10-28T11:18:37.538Z] /mnt/build/workspace/root-pullrequests-build/root/tree/dataframe/src/RDFInterfaceUtils.cxx:899:9: error: within this context

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Build failed on ROOT-performance-centos8-multicore/default.
Running on olbdw-01.cern.ch:/data/sftnight/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-10-28T11:21:27.118Z] /data/sftnight/workspace/root-pullrequests-build/root/tree/dataframe/src/RDFInterfaceUtils.cxx:899:9: error: ‘ROOT::RDF::RInterface<ROOT::Detail::RDF::RNodeBase, void>::RLoopManager* ROOT::RDF::RInterface<ROOT::Detail::RDF::RNodeBase, void>::fLoopManager’ is private within this context

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Build failed on mac1014/python3.
Running on macitois21.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-10-28T11:55:53.254Z] FAILED: tree/dataframe/CMakeFiles/ROOTDataFrame.dir/src/RDFInterfaceUtils.cxx.o
  • [2021-10-28T11:55:54.192Z] /Volumes/HD2/build/workspace/root-pullrequests-build/root/tree/dataframe/src/RDFInterfaceUtils.cxx:899:9: error: 'fLoopManager' is a private member of 'ROOT::RDF::RInterface<ROOT::Detail::RDF::RNodeBase, void>'

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Build failed on ROOT-ubuntu2004/soversion.
Running on root-ubuntu-2004-3.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-10-28T12:18:29.091Z] FAILED: tree/dataframe/CMakeFiles/ROOTDataFrame.dir/src/RDFInterfaceUtils.cxx.o
  • [2021-10-28T12:18:29.361Z] /home/sftnight/build/workspace/root-pullrequests-build/root/tree/dataframe/src/RDFInterfaceUtils.cxx:899:9: error: ‘ROOT::RDF::RInterface<ROOT::Detail::RDF::RNodeBase, void>::RLoopManager* ROOT::RDF::RInterface<ROOT::Detail::RDF::RNodeBase, void>::fLoopManager’ is private within this context

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu2004/soversion, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

1 similar comment
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu2004/soversion, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

eguiraud
eguiraud suggested changes Oct 28, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@eguiraud eguiraud left a comment

Choose a reason for hiding this comment

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

Beautiful, great work Ivan! Just some leftover code to remove, and we can merge this. Can you also squash the fix commits into the first please (so ROOT's master branch gets a cleaner history)?

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 28, 2021

Build failed on mac11.0/cxx17.
Running on macphsft20.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 29, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu2004/soversion, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 29, 2021

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Errors:

  • [2021-10-29T07:19:04.412Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1056 (message):

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 29, 2021

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@eguiraud
Copy link
Copy Markdown
Contributor

eguiraud commented Oct 29, 2021

@phsft-bot build just on windows10/cxx14, mac11.0/cxx17

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 29, 2021

Starting build on windows10/cxx14, mac11.0/cxx17
How to customize builds

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 29, 2021

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Errors:

  • [2021-10-29T13:08:16.362Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1056 (message):

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Nov 1, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu2004/soversion, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@ikabadzhov
[DF][Fix root-project#9116] Display pretty Print and AsString
a86a407 
Additional custom column "rdfentry_" added to the Display()

The RDisplay constructor is adjusted so that is prints the name of the
first column as "Row" (that is always "rdfentry_").

Function DashesBetweenLines added to display dashes in the beginning,
between entries and in the end of the Print() and AsString() methods.
To first column is used to check if there is a new entry in the table.

Moreover, the GetColumnsToShorten() method now considers spaces between
columns when counting the total width of the table.

All tests are adjusted accordingly.
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Nov 1, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu2004/soversion, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

eguiraud
eguiraud approved these changes Nov 1, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@eguiraud eguiraud left a comment

Choose a reason for hiding this comment

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

All good, must remember to squash on merge.

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Nov 1, 2021

Build failed on mac11.0/cxx17.
Running on macphsft20.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@eguiraud eguiraud merged commit 33a1731 into root-project:master Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@eguiraud eguiraud eguiraud approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@eguiraud eguiraud

Labels

in:RDataFrame pr:squash on merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[DF] Beauty fixes to Display

4 participants

@ikabadzhov @phsft-bot @eguiraud @bellenot