Skip to content

[WIP] More sophisticated RHist binning comparisons #5725

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
HadrienG2 wants to merge 78 commits into from
Closed

[WIP] More sophisticated RHist binning comparisons #5725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
1ff5ef8
Use smarter bitfield design for labels comparison
HadrienG2 May 5, 2020
668692f
First draft of binning comparison API
HadrienG2 May 5, 2020
523ba1f
Second draft of binning comparison API contract
HadrienG2 May 13, 2020
0cdcab5
Typo fix
HadrienG2 May 13, 2020
bf69d36
Some clarifications
HadrienG2 May 13, 2020
da85135
Introduce new BinningCmpResult design
HadrienG2 May 18, 2020
739c956
Rework BinningCmpResult
HadrienG2 May 19, 2020
f763528
Move binning comparison to RAxisBase
HadrienG2 May 19, 2020
6d0a99c
Add TODO for variant-ification
HadrienG2 May 20, 2020
725e47d
Give BinningCmpResult some constructors
HadrienG2 May 20, 2020
bf099cb
Start CompareBinningWith implementation
HadrienG2 May 20, 2020
e24ca16
Add approximate bin border comparison
HadrienG2 May 20, 2020
cb96d8a
Constify
HadrienG2 May 20, 2020
e51999f
Support axis growth
HadrienG2 May 20, 2020
7fb5f62
More logical CompareBinBorders definition, check needEmpty(Und|Ov)erflow
HadrienG2 May 20, 2020
7583739
Skeleton of what remains to be done
HadrienG2 May 20, 2020
82815f3
Minor tweaks
HadrienG2 May 20, 2020
af01685
Some code and docs cleanup
HadrienG2 May 22, 2020
be8d54a
I _think_ that's correct
HadrienG2 May 26, 2020
e3b5c6e
Doc tweaks
HadrienG2 May 26, 2020
d26d337
Remove implementation notes
HadrienG2 May 26, 2020
911364f
Remove magic numbers
HadrienG2 May 26, 2020
0dfa2f7
Introduce and use higher-level bin border comparisons
HadrienG2 May 26, 2020
dca081d
Break down the BinningCmpResult into numeric and labeled results
HadrienG2 May 26, 2020
39e510a
Use LabeledBinningCmpResult for CompareBinLabels
HadrienG2 May 26, 2020
f67341d
Okay, those switch defaults are overkill
HadrienG2 May 26, 2020
c5280a5
Add some missing qualifiers
HadrienG2 May 26, 2020
a59998b
No need for that early exit
HadrienG2 May 26, 2020
e9cf6ca
Remove useless With and extract numerical binning comparison
HadrienG2 May 27, 2020
56af9a3
Split growable axis vs non-growable axis hooks
HadrienG2 May 27, 2020
f20e844
Implement axis growth hook at RAxisGrow layer
HadrienG2 May 27, 2020
f5784ad
Add debug assertion that CompareNumericalBinning is overriden by grow…
HadrienG2 May 27, 2020
38bf963
Clean up RAxisGrow's CompareNumericalBinning override
HadrienG2 May 27, 2020
91e1c86
Add missing header
HadrienG2 May 27, 2020
0a9e290
A performance override mechanism now exists, it's CompareNumericalBin…
HadrienG2 May 27, 2020
24e31a0
Fix CompareBinLabels tests
HadrienG2 May 27, 2020
1cf1857
Now it builds and passes tests (but there aren't enough tests)
HadrienG2 May 27, 2020
4a67a0c
Add another bin comparison point which matches the current RHist::Add…
HadrienG2 May 27, 2020
0b34b20
Migrate RHist::Add to CompareBinning
HadrienG2 May 27, 2020
551b3bc
Remove now-obsolete HasSameBinXXX and CanMap
HadrienG2 May 27, 2020
18f0cd3
Rework LabeledBinningCmpResult to account for bin/label count mess
HadrienG2 May 28, 2020
51ae70a
Make RHist::Add support new labeled axis comparisons
HadrienG2 May 28, 2020
d13ff73
Make tests work, fix some bugs
HadrienG2 May 28, 2020
9f82790
Add explanation for lambda early exit trick
HadrienG2 Jun 2, 2020
607b5b8
Clean up ComparePosToBinBorder
HadrienG2 Jun 3, 2020
f93ad1b
Start adjusting naming convention from comparison to compatibility
HadrienG2 Jun 3, 2020
3c2f1aa
Rephrase API naming convention in terms of compatibility
HadrienG2 Jun 3, 2020
dfbff55
Add missing const qualifier
HadrienG2 Jun 3, 2020
bc2e750
Don't copy that floppy
HadrienG2 Jun 3, 2020
48d59be
Make flags not bools
HadrienG2 Jun 3, 2020
7b66b8f
Resolve label insertion order issue + compilation errors
HadrienG2 Jun 3, 2020
5f0b294
Add display operator for nicer test output, fix assertions
HadrienG2 Jun 3, 2020
e69c4ac
Whoops, took the wrong labels
HadrienG2 Jun 3, 2020
1af927d
Add copy and move support to BinningCompatibility
HadrienG2 Jun 4, 2020
af2bd2f
Deduplicate tricky copy/move code + remove some useless semicolons
HadrienG2 Jun 4, 2020
7c4ab60
Add BinningCompatibility comparison operator + more semicolon pruning
HadrienG2 Jun 4, 2020
05db07b
Make labeled binning compatibility testing more exhaustive
HadrienG2 Jun 4, 2020
22bd70a
Add a test of mapping into an equidistant axis, fix some bugs
HadrienG2 Jun 4, 2020
138d253
I can live with shorter names
HadrienG2 Jun 4, 2020
b44cf46
Let's constify
HadrienG2 Jun 10, 2020
c4906dd
Clarify that smaller/larger bins need more work
HadrienG2 Jun 10, 2020
78612f9
Test non-commensurate binning too
HadrienG2 Jun 10, 2020
be40cbf
Deduplicate some more
HadrienG2 Jun 10, 2020
6043241
Start testing merging into an irregular axis
HadrienG2 Jun 10, 2020
e0ce77b
Avoid unnecessary codegen bloat + test base class
HadrienG2 Jun 10, 2020
432f594
Test Irr<-Eq specific scenarios
HadrienG2 Jun 10, 2020
02c9fce
Add a note on Irr<-Irr scenarios
HadrienG2 Jun 10, 2020
3e6da76
A bit of breathing room
HadrienG2 Jun 10, 2020
3ddde04
Be polite
HadrienG2 Jun 10, 2020
363a5c4
Reduce nesting of labeled axis tests
HadrienG2 Jun 10, 2020
5852915
Test adding/removing irregular axis bin borders
HadrienG2 Jun 10, 2020
5470a63
Start testing Grow<-Something scenarios + clean formatting + fix a bug
HadrienG2 Jun 10, 2020
d34bf87
Deduplicate
HadrienG2 Jun 10, 2020
baec909
Extend axis shifting tests + growable target version of all eq binnin…
HadrienG2 Jun 10, 2020
3790a5c
Un-nesting check_labeled_axis is good, but it should remain an implem…
HadrienG2 Jun 10, 2020
caf89b4
Generalize Eq<-Irr tests to growable axes
HadrienG2 Jun 10, 2020
1bc93c8
Test specifics of the Grow<-Irr scenario
HadrienG2 Jun 10, 2020
9d87e41
Silence a silly warning
HadrienG2 Jun 11, 2020
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
Loading