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.

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

Jump to bottom

Gh 28 force sim tuning #35

Merged
merged 80 commits into from
Feb 16, 2023
Merged

Gh 28 force sim tuning #35

merged 80 commits into from
Feb 16, 2023

Conversation

dfreeman06
Copy link
Collaborator

@dfreeman06 dfreeman06 commented Feb 6, 2023 •
edited
Loading

References

Code changes

  • add GraphForcesBehavior
    • Adding d3 forces into forcegraph simulation.
      • center
      • collision
      • link
      • manybody
      • radial
      • x
      • y
      • z
      • clustering
    • add top-level simulation parameters
      • alpha_min
      • alpha_decay
      • velocity_decay
      • cooldown_ticks
      • warmup_ticks
  • fix extra rerenders
    • rename update to redraw to avoid Widget default convenience behavior
    • only trigger post-render with behavior changes
  • fix iframe CSS for widget dragging behavior
  • do much less work, per graph tick, when behaviors are not defined
  • update tests
  • update demos
    • add dataset picker with 10x-larger blocks example
    • forces
    • simplify index

User-facing changes

  • see Force.ipynb for examples.

Backwards-incompatible changes

  • no python-level regressions
  • typescript behaviors changed a fair amount (see redraw vs update)

@dfreeman06 dfreeman06 changed the title Gh 28 force sim tuning WIP Gh 28 force sim tuning Feb 6, 2023
nrbgt and others added 20 commits February 6, 2023 16:37
@nrbgt
linting, add forces to tests
f47c16a
gh-28 more python docstrings for forces.
1e38ce7
gh-28 more evented forces
081ebd4
@nrbgt
linting
9613d2b
@nrbgt
ignore teardown warnings in windows
603d6ee
gh-28 connecting radial force
6c959aa
Merge branch 'gh-28-force-sim-tuning' of github.com:jupyrdf/ipyforceg…
c0cff3d 
…raph into gh-28-force-sim-tuning
gh-28 adding wait_for_change utility function
885a8c1
gh-28 radial example sliders
cc38a3e
@nrbgt
linting
4094b58
@nrbgt
tidy up comment
3192fc4
@nrbgt
add more simulation params, iframe css
a8423ac
@nrbgt
fix copyight year
4d34bb6
@nrbgt
typing
a023acc
@nrbgt
rename update to render, reducing redraws
95a80a9
@nrbgt
invert order of installing behaviors and data
2fa30dc
@nrbgt
strip some cell metadata that breaks tests
b39e6dd
@nrbgt
explicit handling of more default colors
bbc4384
@nrbgt
increase verbosity/screenshots of failing api tests
704548d
@nrbgt
add ticks demo ui
39729e0
@nrbgt nrbgt mentioned this pull request Feb 8, 2023
Closed
Dane Freeman and others added 18 commits February 14, 2023 09:15
gh-28 attempt to reset node positions after going NaN
894291c
@nrbgt
linting
99b575f
@nrbgt
try autodoc-traits
4be9fd9
@nrbgt
add forces to docs, gh-42
03cb3ca
@nrbgt
tighten up spelling
86d9e9d
@nrbgt
speed up notebook linting, simplify base example
0de23c1
@nrbgt
don't look for black
506196d
@nrbgt
add now to template env
7acbac5
@nrbgt
add dataset picker
f4d6d23
@nrbgt
ensure behaviors initialize with given template and column
eff26e0
gh-28 some position resetting if positions go NaN which is possible d…
684f42e 
…uring the force sim
Merge branch 'gh-28-force-sim-tuning' of github.com:jupyrdf/ipyforceg…
1818f3c 
…raph into gh-28-force-sim-tuning
linting
5e1448d
@nrbgt
add widget source
255b589
@nrbgt
Merge remote-tracking branch 'UPSTREAM/gh-28-force-sim-tuning' into g…
83ae5a7 
…h-28-force-sim-tuning
@nrbgt
spelling
81b3384
@nrbgt
force nan to none on the wire
086511b
gh-28 creating toggle-able force with ui and event handling
5a4dd22
@dfreeman06 dfreeman06 changed the title WIP Gh 28 force sim tuning Gh 28 force sim tuning Feb 16, 2023
nrbgt
nrbgt approved these changes Feb 16, 2023
View reviewed changes
Copy link
Contributor

@nrbgt nrbgt left a comment

Choose a reason for hiding this comment

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

:shipit:

@nrbgt nrbgt mentioned this pull request Feb 16, 2023
Closed
sanbales
sanbales approved these changes Feb 16, 2023
View reviewed changes
Copy link
Contributor

@sanbales sanbales left a comment

Choose a reason for hiding this comment

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

Just a pedantic code review, didn't find anything major, feel free to disregard.

src/ipyforcegraph/forces.py Outdated Show resolved Hide resolved
src/ipyforcegraph/forces.py Outdated
@W.register
class CenterForce(BaseD3Force):
"""The centering force translates nodes uniformly so that the mean position
of all nodes (center of mass if all nodes have equal weight) is at the given
Copy link
Contributor

Choose a reason for hiding this comment

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

How does the force know which parameter is the node weight?

If it's configurable, should we have a TODO to add that as a trait of the behavior?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the centering doesn't actually have mass/weight for the points as far as i know. the doc string is more of an aside to help understand what the force does.

src/ipyforcegraph/forces.py Outdated Show resolved Hide resolved
src/ipyforcegraph/sources/widget.py Outdated Show resolved Hide resolved
src/ipyforcegraph/forces.py Outdated Show resolved Hide resolved
@nrbgt nrbgt marked this pull request as ready for review February 16, 2023 18:12
@nrbgt
Copy link
Contributor

nrbgt commented Feb 16, 2023

@dfreeman06 have a look at the changes in 8cfa0c1... if that looks fine, let's :shipit:

sanbales
sanbales approved these changes Feb 16, 2023
View reviewed changes
Copy link
Contributor

@sanbales sanbales left a comment

Choose a reason for hiding this comment

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

Probably not worth doing another commit, just some minor inconsistencies and missing DOCSTRINGs.

src/ipyforcegraph/behaviors/_base.py Outdated Show resolved Hide resolved
src/ipyforcegraph/behaviors/forces.py Show resolved Hide resolved
src/ipyforcegraph/_base.py Outdated Show resolved Hide resolved
src/ipyforcegraph/graphs.py Show resolved Hide resolved
@dfreeman06 dfreeman06 merged commit e1419c8 into main Feb 16, 2023
@dfreeman06 dfreeman06 deleted the gh-28-force-sim-tuning branch February 24, 2023 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nrbgt nrbgt nrbgt approved these changes

@sanbales sanbales sanbales approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

When NodeSelection.multiple is False, Deselecting a node is not possible Tunable d3 forceLayout
3 participants
@dfreeman06 @nrbgt @sanbales