Skip to content
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.

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

Violin geometry #487

Merged
merged 78 commits into from
Dec 22, 2021
Merged
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b66c269
Update docstring for geom_point() function.
ASmirnov-HORIS Feb 16, 2021
b760969
Docstring: Update data, map and map_join parameters description.
ASmirnov-HORIS Feb 25, 2021
639b438
Updated core.py docstrings.
EArkhipova-HORIS Feb 26, 2021
7a6ba28
Minor fixes
EArkhipova-HORIS Mar 2, 2021
3003b51
Update examples in coord.py docstrings, update geom_extras.py docstrings
EArkhipova-HORIS Mar 3, 2021
f27c925
Docstrings: replace >>> to :linenos: in geom.py.
ASmirnov-HORIS Mar 12, 2021
19f7c85
Update examples in plot.py, update docstring in label.py.
EArkhipova-HORIS Mar 15, 2021
d33102b
Update docstring for the geocode() function.
ASmirnov-HORIS Mar 17, 2021
33afa10
Update docstrings in geo_data.
ASmirnov-HORIS Mar 19, 2021
b33d331
Add link to documentation page for formatting in tooltips and geom_te…
ASmirnov-HORIS Mar 24, 2021
ab0cb8c
Fix lists in docstrings notes (according to Numpydoc and rst rules).
ASmirnov-HORIS Mar 24, 2021
c8c1ced
Update links in docstrings.
ASmirnov-HORIS Mar 24, 2021
f019ead
Fix errors of the rebase conflicts resolving.
ASmirnov-HORIS Aug 20, 2021
e5b5038
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Aug 26, 2021
48361d9
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Aug 27, 2021
b6ede67
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Sep 2, 2021
9c99338
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Sep 13, 2021
cb78333
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Sep 21, 2021
839fac0
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Sep 24, 2021
6f5efba
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Sep 27, 2021
6af62fb
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Sep 29, 2021
153dfc6
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 12, 2021
14bb83e
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 13, 2021
b0580ea
Add violin geom without any functionality.
ASmirnov-HORIS Oct 15, 2021
600f485
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 15, 2021
bac7d14
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 18, 2021
5fa1b0b
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 19, 2021
91d9c8d
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 20, 2021
c25215b
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 20, 2021
60b9d43
Update docstring for geom_point() function.
ASmirnov-HORIS Feb 16, 2021
7d56a67
Docstring: Update data, map and map_join parameters description.
ASmirnov-HORIS Feb 25, 2021
0b81f55
Minor fixes
EArkhipova-HORIS Mar 2, 2021
43b1e8f
Update examples in coord.py docstrings, update geom_extras.py docstrings
EArkhipova-HORIS Mar 3, 2021
4beaf1e
Update examples in plot.py, update docstring in label.py.
EArkhipova-HORIS Mar 15, 2021
0b54bd5
Add link to documentation page for formatting in tooltips and geom_te…
ASmirnov-HORIS Mar 24, 2021
48e15f6
Fix lists in docstrings notes (according to Numpydoc and rst rules).
ASmirnov-HORIS Mar 24, 2021
e99686a
Update links in docstrings.
ASmirnov-HORIS Mar 24, 2021
c4a0b86
Fix errors of the rebase conflicts resolving.
ASmirnov-HORIS Aug 20, 2021
e7f8980
Merge branch 'master' of github.com:ASmirnov-HORIS/lets-plot
ASmirnov-HORIS Oct 20, 2021
41d6282
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 21, 2021
33aad73
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 25, 2021
2c759f4
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 26, 2021
d29429c
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 28, 2021
ac7254e
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 28, 2021
77f8884
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Oct 29, 2021
fbdac79
Fix in plot-demo-common/.../Violin.
ASmirnov-HORIS Nov 1, 2021
8d833f0
Merge branch 'master' of github.com:JetBrains/lets-plot
ASmirnov-HORIS Nov 1, 2021
cc80168
Fix conflicts after merging with upstream/master.
ASmirnov-HORIS Nov 1, 2021
3966ed8
Trying to show at least vertical line for violin geom.
ASmirnov-HORIS Nov 2, 2021
0819ad1
Fix aesthetics for the violin geom.
ASmirnov-HORIS Nov 18, 2021
0d060b0
Replace statistic for violin geom to its own.
ASmirnov-HORIS Nov 18, 2021
6126177
Upgrade the violin statistic.
ASmirnov-HORIS Nov 19, 2021
e0308a9
Fix an error in the violin stat.
ASmirnov-HORIS Nov 19, 2021
41d12b3
Upgrade the geometry of the violin.
ASmirnov-HORIS Nov 22, 2021
2dd3595
Fix width for the geom violin. Hints also added but stil doesn't work.
ASmirnov-HORIS Nov 23, 2021
432bab9
Fix tooltips for geom violin.
ASmirnov-HORIS Nov 23, 2021
c0fea5e
Use the 'DensityStat' in the 'ViolinStat'.
ASmirnov-HORIS Nov 24, 2021
4b95827
Remove the first version of the ViolinStat realization. Tiny fixes in…
ASmirnov-HORIS Nov 25, 2021
57b5850
Tiny fixes.
ASmirnov-HORIS Nov 26, 2021
ebaf834
Add WEIGHT to the 'noGuideNeeded' aesthetics list.
ASmirnov-HORIS Nov 26, 2021
770793a
Add statistics COUNT and SCALED to the ViolinStat.
ASmirnov-HORIS Nov 26, 2021
7b859e4
Switch to the first version of the ViolinStat (with tiny modifications).
ASmirnov-HORIS Nov 30, 2021
b02d58c
Small refactoring and new parameters in the ViolinStat.
ASmirnov-HORIS Dec 1, 2021
7418aa7
Remove one extra space.
ASmirnov-HORIS Dec 1, 2021
34b6d61
Move the densityFunction() to the DensityStatUtil.
ASmirnov-HORIS Dec 1, 2021
7390463
Add the 'Nullable Test' and fix the corresponding bug.
ASmirnov-HORIS Dec 1, 2021
7e024cb
Add the notebook for demonstrating the new geometry.
ASmirnov-HORIS Dec 1, 2021
2e3d148
Rename the directory: docs/f-01-11/ -> docs/f-21-12/.
ASmirnov-HORIS Dec 2, 2021
d66bdcc
Add 'violinwidth' aesthetic and '..violinwidth..' statistic. Now the …
ASmirnov-HORIS Dec 3, 2021
274089d
Rename ViolinStat to YDensityStat and other small fixes.
ASmirnov-HORIS Dec 16, 2021
69436db
Move calculation of the ..violinwidth.. to the normalize() method.
ASmirnov-HORIS Dec 16, 2021
73d451d
Tiny fix.
ASmirnov-HORIS Dec 16, 2021
64de861
Fixes in ViolinGeom, YDensityStat. Update some names.
ASmirnov-HORIS Dec 17, 2021
34087a1
Update ViolinGeom for better performance.
ASmirnov-HORIS Dec 17, 2021
5810a83
Fix tests.
ASmirnov-HORIS Dec 20, 2021
219e4e4
Small fixes. Mostly in names.
ASmirnov-HORIS Dec 20, 2021
761ccdb
Updates in YDensityStat: more clear normalization.
ASmirnov-HORIS Dec 20, 2021
253d8c2
Fix error for empty dataframe in normalize() for YDensityStat.
ASmirnov-HORIS Dec 21, 2021
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
Prev Previous commit
Next Next commit
Add statistics COUNT and SCALED to the ViolinStat.
  • Loading branch information
ASmirnov-HORIS committed Nov 26, 2021
commit 770793a725ac04715c9d877c3bd3a713984c7faa
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,24 @@ class ViolinStat : BaseStat(DEF_MAPPING) {
val statX = ArrayList<Double>()
val statY = ArrayList<Double>()
val statDensity = ArrayList<Double>()
val statCount = ArrayList<Double>()
val statScaled = ArrayList<Double>()

for ((x, bin) in binnedData) {
val statData = buildBinStat(bin.first, bin.second, messageConsumer)
statX += MutableList(statData.getValue(Stats.Y).size) { x }
statY += statData.getValue(Stats.Y)
statDensity += statData.getValue(Stats.DENSITY)
statCount += statData.getValue(Stats.COUNT)
statScaled += statData.getValue(Stats.SCALED)
}

return mutableMapOf(
Stats.X to statX,
Stats.Y to statY,
Stats.DENSITY to statDensity
Stats.DENSITY to statDensity,
Stats.COUNT to statCount,
Stats.SCALED to statScaled
)
}

Expand All @@ -99,7 +105,9 @@ class ViolinStat : BaseStat(DEF_MAPPING) {

return mutableMapOf(
Stats.Y to statData.getNumeric(Stats.X).requireNoNulls(),
Stats.DENSITY to statData.getNumeric(Stats.DENSITY).requireNoNulls()
Stats.DENSITY to statData.getNumeric(Stats.DENSITY).requireNoNulls(),
Stats.COUNT to statData.getNumeric(Stats.COUNT).requireNoNulls(),
Stats.SCALED to statData.getNumeric(Stats.SCALED).requireNoNulls()
)
}
}
Expand Down