Browse Source

experiment with new hierarchical solver

css_transitions
Alex de Mulder 10 years ago
parent
commit
82fc808d5c
10 changed files with 350 additions and 68 deletions
  1. +1
    -0
      .gitignore
  2. +5
    -0
      HISTORY.md
  3. +172
    -30
      dist/vis.js
  4. +10
    -10
      dist/vis.min.js
  5. +55
    -3
      docs/graph.html
  6. +4
    -0
      docs/index.html
  7. +2
    -2
      src/graph/Graph.js
  8. +87
    -18
      src/graph/graphMixins/physics/HierarchialRepulsion.js
  9. +10
    -1
      src/graph/graphMixins/physics/PhysicsMixin.js
  10. +4
    -4
      src/timeline/component/DataAxis.js

+ 1
- 0
.gitignore View File

@ -6,3 +6,4 @@ node_modules
.settings/org.eclipse.wst.jsdt.ui.superType.container .settings/org.eclipse.wst.jsdt.ui.superType.container
.settings/org.eclipse.wst.jsdt.ui.superType.name .settings/org.eclipse.wst.jsdt.ui.superType.name
npm-debug.log npm-debug.log
examples/graph/24_hierarchical_layout_userdefined2.html

+ 5
- 0
HISTORY.md View File

@ -22,6 +22,11 @@ http://visjs.org
- Fixed graph.storePositions() - Fixed graph.storePositions()
- Extended Selection API with selectNodes and selectEdges, deprecating setSelection. - Extended Selection API with selectNodes and selectEdges, deprecating setSelection.
- Fixed multiline labels. - Fixed multiline labels.
- Changed hierarchical physics solver and updated docs.
### Graph2D
- Added first iteration of the Graph2D.
### Graph3d ### Graph3d

+ 172
- 30
dist/vis.js View File

@ -5,7 +5,7 @@
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.
* *
* @version 2.0.1-SNAPSHOT * @version 2.0.1-SNAPSHOT
* @date 2014-06-27
* @date 2014-07-01
* *
* @license * @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com * Copyright (C) 2011-2014 Almende B.V, http://almende.com
@ -3274,7 +3274,7 @@ function DataAxis (body, options, svg) {
this.dom = {}; this.dom = {};
this.yRange = {start:0, end:0};
this.range = {start:0, end:0};
this.options = util.extend({}, this.defaultOptions); this.options = util.extend({}, this.defaultOptions);
this.conversionFactor = 1; this.conversionFactor = 1;
@ -3437,8 +3437,8 @@ DataAxis.prototype.hide = function() {
* @param end * @param end
*/ */
DataAxis.prototype.setRange = function (start, end) { DataAxis.prototype.setRange = function (start, end) {
this.yRange.start = start;
this.yRange.end = end;
this.range.start = start;
this.range.end = end;
}; };
/** /**
@ -3514,7 +3514,7 @@ DataAxis.prototype._redrawLabels = function () {
// calculate range and step (step such that we have space for 7 characters per label) // calculate range and step (step such that we have space for 7 characters per label)
var minimumStep = this.master ? this.props.majorCharHeight || 10 : this.stepPixelsForced; var minimumStep = this.master ? this.props.majorCharHeight || 10 : this.stepPixelsForced;
var step = new DataStep(this.yRange.start, this.yRange.end, minimumStep, this.dom.frame.offsetHeight);
var step = new DataStep(this.range.start, this.range.end, minimumStep, this.dom.frame.offsetHeight);
this.step = step; this.step = step;
step.first(); step.first();
@ -13132,7 +13132,7 @@ Node.prototype._label = function (ctx, text, x, y, align, baseline) {
var lines = text.split('\n'), var lines = text.split('\n'),
lineCount = lines.length, lineCount = lines.length,
fontSize = (this.fontSize + 4), fontSize = (this.fontSize + 4),
yLine = y + (1 - lineCount) / 2 * fontSize;
yLine = y + (1 - lineCount) / (2 * fontSize);
for (var i = 0; i < lineCount; i++) { for (var i = 0; i < lineCount; i++) {
ctx.fillText(lines[i], x, yLine); ctx.fillText(lines[i], x, yLine);
@ -13274,6 +13274,8 @@ function Edge (properties, graph, constants) {
this.style = constants.edges.style; this.style = constants.edges.style;
this.title = undefined; this.title = undefined;
this.width = constants.edges.width; this.width = constants.edges.width;
this.widthSelectionMultiplier = constants.edges.widthSelectionMultiplier;
this.widthSelected = this.width * this.widthSelectionMultiplier;
this.hoverWidth = constants.edges.hoverWidth; this.hoverWidth = constants.edges.hoverWidth;
this.value = undefined; this.value = undefined;
this.length = constants.physics.springLength; this.length = constants.physics.springLength;
@ -13343,6 +13345,8 @@ Edge.prototype.setProperties = function(properties, constants) {
if (properties.title !== undefined) {this.title = properties.title;} if (properties.title !== undefined) {this.title = properties.title;}
if (properties.width !== undefined) {this.width = properties.width;} if (properties.width !== undefined) {this.width = properties.width;}
if (properties.widthSelectionMultiplier !== undefined)
{this.widthSelectionMultiplier = properties.widthSelectionMultiplier;}
if (properties.hoverWidth !== undefined) {this.hoverWidth = properties.hoverWidth;} if (properties.hoverWidth !== undefined) {this.hoverWidth = properties.hoverWidth;}
if (properties.value !== undefined) {this.value = properties.value;} if (properties.value !== undefined) {this.value = properties.value;}
if (properties.length !== undefined) {this.length = properties.length; if (properties.length !== undefined) {this.length = properties.length;
@ -13377,6 +13381,8 @@ Edge.prototype.setProperties = function(properties, constants) {
this.widthFixed = this.widthFixed || (properties.width !== undefined); this.widthFixed = this.widthFixed || (properties.width !== undefined);
this.lengthFixed = this.lengthFixed || (properties.length !== undefined); this.lengthFixed = this.lengthFixed || (properties.length !== undefined);
this.widthSelected = this.width * this.widthSelectionMultiplier;
// set draw method based on style // set draw method based on style
switch (this.style) { switch (this.style) {
case 'line': this.draw = this._drawLine; break; case 'line': this.draw = this._drawLine; break;
@ -13554,7 +13560,7 @@ Edge.prototype._drawLine = function(ctx) {
*/ */
Edge.prototype._getLineWidth = function() { Edge.prototype._getLineWidth = function() {
if (this.selected == true) { if (this.selected == true) {
return Math.min(this.width * 2, this.widthMax)*this.graphScaleInv;
return Math.min(this.widthSelected, this.widthMax)*this.graphScaleInv;
} }
else { else {
if (this.hover == true) { if (this.hover == true) {
@ -14199,6 +14205,7 @@ Edge.prototype.getControlNodePositions = function(ctx) {
return {from:{x:xFrom,y:yFrom},to:{x:xTo,y:yTo}}; return {from:{x:xFrom,y:yFrom},to:{x:xTo,y:yTo}};
} }
/** /**
* Popup is a class to create a popup window with some text * Popup is a class to create a popup window with some text
* @param {Element} container The container object. * @param {Element} container The container object.
@ -14551,14 +14558,25 @@ var physicsMixin = {
// the forces are reset to zero in this loop by using _setForce instead // the forces are reset to zero in this loop by using _setForce instead
// of _addForce // of _addForce
this._calculateGravitationalForces();
if (this.constants.physics.hierarchicalRepulsion.enabled == true) {
this._calculateHierarchicalGravitationalForces();
}
else {
this._calculateGravitationalForces();
}
this._calculateNodeForces(); this._calculateNodeForces();
if (this.constants.smoothCurves == true) { if (this.constants.smoothCurves == true) {
this._calculateSpringForcesWithSupport(); this._calculateSpringForcesWithSupport();
} }
else { else {
this._calculateSpringForces();
if (this.constants.physics.hierarchicalRepulsion.enabled == true) {
this._calculateHierarchicalSpringForces();
}
else {
this._calculateSpringForces();
}
} }
}, },
@ -14638,6 +14656,8 @@ var physicsMixin = {
}, },
/** /**
* this function calculates the effects of the springs in the case of unsmooth curves. * this function calculates the effects of the springs in the case of unsmooth curves.
* *
@ -14684,6 +14704,8 @@ var physicsMixin = {
}, },
/** /**
* This function calculates the springforces on the nodes, accounting for the support nodes. * This function calculates the springforces on the nodes, accounting for the support nodes.
* *
@ -15181,6 +15203,7 @@ var hierarchalRepulsionMixin = {
// repulsing forces between nodes // repulsing forces between nodes
var nodeDistance = this.constants.physics.hierarchicalRepulsion.nodeDistance; var nodeDistance = this.constants.physics.hierarchicalRepulsion.nodeDistance;
var minimumDistance = nodeDistance; var minimumDistance = nodeDistance;
var a = a_base / minimumDistance;
// we loop from i over all but the last entree in the array // we loop from i over all but the last entree in the array
// j loops from i+1 to the last. This way we do not double count any of the indices, nor i == j // j loops from i+1 to the last. This way we do not double count any of the indices, nor i == j
@ -15189,29 +15212,147 @@ var hierarchalRepulsionMixin = {
node1 = nodes[nodeIndices[i]]; node1 = nodes[nodeIndices[i]];
for (j = i + 1; j < nodeIndices.length; j++) { for (j = i + 1; j < nodeIndices.length; j++) {
node2 = nodes[nodeIndices[j]]; node2 = nodes[nodeIndices[j]];
if (node1.level == node2.level) {
dx = node2.x - node1.x;
dy = node2.y - node1.y;
distance = Math.sqrt(dx * dx + dy * dy);
dx = node2.x - node1.x;
dy = node2.y - node1.y;
distance = Math.sqrt(dx * dx + dy * dy);
var a = a_base / minimumDistance;
if (distance < 2 * minimumDistance) {
repulsingForce = a * distance + b; // linear approx of 1 / (1 + Math.exp((distance / minimumDistance - 1) * steepness))
// normalize force with
if (distance == 0) {
distance = 0.01;
if (distance < 2 * minimumDistance) {
repulsingForce = a * distance + b;
var c = 0.05;
var d = 2 * minimumDistance * 2 * c;
repulsingForce = c * Math.pow(distance,2) - d * distance + d*d/(4*c);
// normalize force with
if (distance == 0) {
distance = 0.01;
}
else {
repulsingForce = repulsingForce / distance;
}
fx = dx * repulsingForce;
fy = dy * repulsingForce;
node1.fx -= fx;
node1.fy -= fy;
node2.fx += fx;
node2.fy += fy;
} }
else {
repulsingForce = repulsingForce / distance;
}
}
}
},
/**
* this function calculates the effects of the springs in the case of unsmooth curves.
*
* @private
*/
_calculateHierarchicalSpringForces: function () {
var edgeLength, edge, edgeId;
var dx, dy, fx, fy, springForce, distance;
var edges = this.edges;
// forces caused by the edges, modelled as springs
for (edgeId in edges) {
if (edges.hasOwnProperty(edgeId)) {
edge = edges[edgeId];
if (edge.connected) {
// only calculate forces if nodes are in the same sector
if (this.nodes.hasOwnProperty(edge.toId) && this.nodes.hasOwnProperty(edge.fromId)) {
edgeLength = edge.customLength ? edge.length : this.constants.physics.springLength;
// this implies that the edges between big clusters are longer
edgeLength += (edge.to.clusterSize + edge.from.clusterSize - 2) * this.constants.clustering.edgeGrowth;
dx = (edge.from.x - edge.to.x);
dy = (edge.from.y - edge.to.y);
distance = Math.sqrt(dx * dx + dy * dy);
if (distance == 0) {
distance = 0.01;
}
distance = Math.max(0.8*edgeLength,Math.min(1.2*edgeLength, distance));
// the 1/distance is so the fx and fy can be calculated without sine or cosine.
springForce = this.constants.physics.springConstant * (edgeLength - distance) / distance;
fx = dx * springForce;
fy = dy * springForce;
edge.to.fx -= fx;
edge.to.fy -= fy;
edge.from.fx += fx;
edge.from.fy += fy;
var factor = 5;
if (distance > edgeLength) {
factor = 25;
}
if (edge.from.level > edge.to.level) {
edge.to.fx -= factor*fx;
edge.to.fy -= factor*fy;
}
else if (edge.from.level < edge.to.level) {
edge.from.fx += factor*fx;
edge.from.fy += factor*fy;
}
} }
fx = dx * repulsingForce;
fy = dy * repulsingForce;
}
}
}
},
node1.fx -= fx;
node1.fy -= fy;
node2.fx += fx;
node2.fy += fy;
/**
* this function applies the central gravity effect to keep groups from floating off
*
* @private
*/
_calculateHierarchicalGravitationalForces: function () {
var dx, dy, distance, node, i, j, edges;
var nodes = this.calculationNodes;
var gravity = this.constants.physics.centralGravity;
var gravityForce = 0;
for (i = 0; i < this.calculationNodeIndices.length; i++) {
node = nodes[this.calculationNodeIndices[i]];
node.damping = this.constants.physics.damping; // possibly add function to alter damping properties of clusters.
node.fx = 0;
node.fy = 0;
}
for (i = 0; i < this.calculationNodeIndices.length; i++) {
node = nodes[this.calculationNodeIndices[i]];
edges = node.edges;
for (j = 0; j < edges.length; j++) {
if (edges[j].from.id != node.id) {
if (edges[j].to.level > edges[j].from.level) {
dx = edges[j].to.x-edges[j].from.x;
dy = edges[j].to.y-edges[j].from.y;
distance = Math.sqrt(dx * dx + dy * dy);
gravityForce = (distance == 0) ? 0 : (gravity / distance);
edges[j].to.fx -= dx * gravityForce;
edges[j].to.fy -= dy * gravityForce;
}
}
else {
if (edges[j].from.level > edges[j].to.level) {
dx = edges[j].to.x-edges[j].from.x;
dy = edges[j].to.y-edges[j].from.y;
distance = Math.sqrt(dx * dx + dy * dy);
gravityForce = (distance == 0) ? 0 : (gravity / distance);
edges[j].to.fx -= dx * gravityForce;
edges[j].to.fy -= dy * gravityForce;
}
} }
} }
} }
@ -19453,6 +19594,7 @@ function Graph (container, data, options) {
widthMin: 1, widthMin: 1,
widthMax: 15, widthMax: 15,
width: 1, width: 1,
widthSelectionMultiplier: 2,
hoverWidth: 1.5, hoverWidth: 1.5,
style: 'line', style: 'line',
color: { color: {
@ -19489,10 +19631,10 @@ function Graph (container, data, options) {
nodeDistance: 100, nodeDistance: 100,
damping: 0.09 damping: 0.09
}, },
hierarchicalRepulsion: {
hierarchicalRepulsion: {
enabled: false, enabled: false,
centralGravity: 0.0,
springLength: 100,
centralGravity: 0.5,
springLength: 150,
springConstant: 0.01, springConstant: 0.01,
nodeDistance: 60, nodeDistance: 60,
damping: 0.09 damping: 0.09
@ -21626,7 +21768,7 @@ Graph.prototype.storePosition = function() {
var node = this.nodes[nodeId]; var node = this.nodes[nodeId];
var allowedToMoveX = !this.nodes.xFixed; var allowedToMoveX = !this.nodes.xFixed;
var allowedToMoveY = !this.nodes.yFixed; var allowedToMoveY = !this.nodes.yFixed;
if (this.nodesData.data[nodeId].x != Math.round(node.x) || this.nodesData.data[nodeId].y != Math.round(node.y)) {
if (this.nodesData._data[nodeId].x != Math.round(node.x) || this.nodesData._data[nodeId].y != Math.round(node.y)) {
dataArray.push({id:nodeId,x:Math.round(node.x),y:Math.round(node.y),allowedToMoveX:allowedToMoveX,allowedToMoveY:allowedToMoveY}); dataArray.push({id:nodeId,x:Math.round(node.x),y:Math.round(node.y),allowedToMoveX:allowedToMoveX,allowedToMoveY:allowedToMoveY});
} }
} }

+ 10
- 10
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 55
- 3
docs/graph.html View File

@ -1384,7 +1384,8 @@ var nodes = [
The original simulation method was based on particel physics with a repulsion field (potential) around each node, The original simulation method was based on particel physics with a repulsion field (potential) around each node,
and the edges were modelled as springs. The new system employed the <a href="http://en.wikipedia.org/wiki/Barnes%E2%80%93Hut_simulation">Barnes-Hut</a> gravitational simulation model. The edges are still modelled as springs. and the edges were modelled as springs. The new system employed the <a href="http://en.wikipedia.org/wiki/Barnes%E2%80%93Hut_simulation">Barnes-Hut</a> gravitational simulation model. The edges are still modelled as springs.
To unify the physics system, the damping, repulsion distance and edge length have been combined in an physics option. To retain good behaviour, both the old repulsion model and the Barnes-Hut model have their own parameters. To unify the physics system, the damping, repulsion distance and edge length have been combined in an physics option. To retain good behaviour, both the old repulsion model and the Barnes-Hut model have their own parameters.
If no options for the physics system are supplied, the Barnes-Hut method will be used with the default parameters. If you want to customize the physics system easily, you can use the configurePhysics option.
If no options for the physics system are supplied, the Barnes-Hut method will be used with the default parameters. If you want to customize the physics system easily, you can use the configurePhysics option. <br/>
When using the hierarchical display option, hierarchicalRepulsion is automatically used as the physics solver. Similarly, if you use the hierarchicalRepulsion physics option, hierarchical display is automatically turned on with default settings.
<p class="important_note">Note: if the behaviour of your graph is not the way you want it, use configurePhysics as described <u><a href="#PhysicsConfiguration">below</a></u> or by <u><a href="../examples/graph/25_physics_configuration.html">example 25</a></u>.</p> <p class="important_note">Note: if the behaviour of your graph is not the way you want it, use configurePhysics as described <u><a href="#PhysicsConfiguration">below</a></u> or by <u><a href="../examples/graph/25_physics_configuration.html">example 25</a></u>.</p>
</p> </p>
@ -1408,6 +1409,13 @@ var options = {
nodeDistance: 100, nodeDistance: 100,
damping: 0.09 damping: 0.09
}, },
hierarchicalRepulsion: {
centralGravity: 0.5,
springLength: 150,
springConstant: 0.01,
nodeDistance: 60,
damping: 0.09
}
} }
</pre> </pre>
<h5>barnesHut:</h5> <h5>barnesHut:</h5>
@ -1471,6 +1479,12 @@ var options = {
<td>0.1</td> <td>0.1</td>
<td>The central gravity is a force that pulls all nodes to the center. This ensures independent groups do not float apart.</td> <td>The central gravity is a force that pulls all nodes to the center. This ensures independent groups do not float apart.</td>
</tr> </tr>
<tr>
<td>nodeDistance</td>
<td>Number</td>
<td>100</td>
<td>This parameter is used to define the distance of influence of the repulsion field of the nodes. Below half this distance, the repulsion is maximal and beyond twice this distance the repulsion is zero.</td>
</tr>
<tr> <tr>
<td>springLength</td> <td>springLength</td>
<td>Number</td> <td>Number</td>
@ -1478,17 +1492,55 @@ var options = {
<td>In the previous versions this was a property of the edges, called length. This is the length of the springs when they are at rest. During the simulation they will be streched by the gravitational fields. <td>In the previous versions this was a property of the edges, called length. This is the length of the springs when they are at rest. During the simulation they will be streched by the gravitational fields.
To greatly reduce the edge length, the gravitationalConstant has to be reduced as well.</td> To greatly reduce the edge length, the gravitationalConstant has to be reduced as well.</td>
</tr> </tr>
<tr>
<td>springConstant</td>
<td>Number</td>
<td>0.05</td>
<td>This is the spring constant used to calculate the spring forces based on Hooke&prime;s Law. More information is available <a href="http://en.wikipedia.org/wiki/Hooke's_law" target="_blank">here</a>.</td>
</tr>
<tr>
<td>damping</td>
<td>Number</td>
<td>0.09</td>
<td>This is the damping constant. It is used to dissipate energy from the system to have it settle in an equilibrium. More information is available <a href="http://en.wikipedia.org/wiki/Damping" target="_blank">here</a>.</td>
</tr>
</table>
<h5>hierarchicalRepulsion:</h5>
<table>
<tr>
<th>Name</th>
<th>Type</th>
<th>Default</th>
<th>Description</th>
</tr>
<tr>
<td>centralGravity</td>
<td>Number</td>
<td>0.5</td>
<td>The central gravity is a force that pulls all nodes to the center. This ensures independent groups do not float apart.</td>
</tr>
<tr> <tr>
<td>nodeDistance</td> <td>nodeDistance</td>
<td>Number</td> <td>Number</td>
<td>100</td>
<td>60</td>
<td>This parameter is used to define the distance of influence of the repulsion field of the nodes. Below half this distance, the repulsion is maximal and beyond twice this distance the repulsion is zero.</td> <td>This parameter is used to define the distance of influence of the repulsion field of the nodes. Below half this distance, the repulsion is maximal and beyond twice this distance the repulsion is zero.</td>
</tr> </tr>
<tr>
<td>springLength</td>
<td>Number</td>
<td>100</td>
<td>In the previous versions this was a property of the edges, called length. This is the length of the springs when they are at rest. During the simulation they will be streched by the gravitational fields.
To greatly reduce the edge length, the gravitationalConstant has to be reduced as well.</td>
</tr>
<tr> <tr>
<td>springConstant</td> <td>springConstant</td>
<td>Number</td> <td>Number</td>
<td>0.05</td>
<td>0.01</td>
<td>This is the spring constant used to calculate the spring forces based on Hooke&prime;s Law. More information is available <a href="http://en.wikipedia.org/wiki/Hooke's_law" target="_blank">here</a>.</td> <td>This is the spring constant used to calculate the spring forces based on Hooke&prime;s Law. More information is available <a href="http://en.wikipedia.org/wiki/Hooke's_law" target="_blank">here</a>.</td>
</tr> </tr>
<tr> <tr>

+ 4
- 0
docs/index.html View File

@ -56,6 +56,10 @@
<a href="graph.html"><b>Graph</b></a>. <a href="graph.html"><b>Graph</b></a>.
Display a graph or network with nodes and edges. Display a graph or network with nodes and edges.
</li> </li>
<li>
<a href="graph2d.html"><b>Graph2d</b></a>.
Plot data on a timeline with lines or barcharts.
</li>
<li> <li>
<a href="graph3d.html"><b>Graph3d</b></a>. <a href="graph3d.html"><b>Graph3d</b></a>.
Display data in a three dimensional graph. Display data in a three dimensional graph.

+ 2
- 2
src/graph/Graph.js View File

@ -111,8 +111,8 @@ function Graph (container, data, options) {
}, },
hierarchicalRepulsion: { hierarchicalRepulsion: {
enabled: false, enabled: false,
centralGravity: 0.0,
springLength: 100,
centralGravity: 0.5,
springLength: 150,
springConstant: 0.01, springConstant: 0.01,
nodeDistance: 60, nodeDistance: 60,
damping: 0.09 damping: 0.09

+ 87
- 18
src/graph/graphMixins/physics/HierarchialRepulsion.js View File

@ -26,6 +26,7 @@ var hierarchalRepulsionMixin = {
// repulsing forces between nodes // repulsing forces between nodes
var nodeDistance = this.constants.physics.hierarchicalRepulsion.nodeDistance; var nodeDistance = this.constants.physics.hierarchicalRepulsion.nodeDistance;
var minimumDistance = nodeDistance; var minimumDistance = nodeDistance;
var a = a_base / minimumDistance;
// we loop from i over all but the last entree in the array // we loop from i over all but the last entree in the array
// j loops from i+1 to the last. This way we do not double count any of the indices, nor i == j // j loops from i+1 to the last. This way we do not double count any of the indices, nor i == j
@ -34,29 +35,97 @@ var hierarchalRepulsionMixin = {
node1 = nodes[nodeIndices[i]]; node1 = nodes[nodeIndices[i]];
for (j = i + 1; j < nodeIndices.length; j++) { for (j = i + 1; j < nodeIndices.length; j++) {
node2 = nodes[nodeIndices[j]]; node2 = nodes[nodeIndices[j]];
if (node1.level == node2.level) {
dx = node2.x - node1.x;
dy = node2.y - node1.y;
distance = Math.sqrt(dx * dx + dy * dy);
dx = node2.x - node1.x;
dy = node2.y - node1.y;
distance = Math.sqrt(dx * dx + dy * dy);
var a = a_base / minimumDistance;
if (distance < 2 * minimumDistance) {
repulsingForce = a * distance + b; // linear approx of 1 / (1 + Math.exp((distance / minimumDistance - 1) * steepness))
// normalize force with
if (distance == 0) {
distance = 0.01;
}
else {
repulsingForce = repulsingForce / distance;
if (distance < 2 * minimumDistance) {
repulsingForce = a * distance + b;
var c = 0.05;
var d = 2 * minimumDistance * 2 * c;
repulsingForce = c * Math.pow(distance,2) - d * distance + d*d/(4*c);
// normalize force with
if (distance == 0) {
distance = 0.01;
}
else {
repulsingForce = repulsingForce / distance;
}
fx = dx * repulsingForce;
fy = dy * repulsingForce;
node1.fx -= fx;
node1.fy -= fy;
node2.fx += fx;
node2.fy += fy;
} }
fx = dx * repulsingForce;
fy = dy * repulsingForce;
}
}
}
},
/**
* this function calculates the effects of the springs in the case of unsmooth curves.
*
* @private
*/
_calculateHierarchicalSpringForces: function () {
var edgeLength, edge, edgeId;
var dx, dy, fx, fy, springForce, distance;
var edges = this.edges;
// forces caused by the edges, modelled as springs
for (edgeId in edges) {
if (edges.hasOwnProperty(edgeId)) {
edge = edges[edgeId];
if (edge.connected) {
// only calculate forces if nodes are in the same sector
if (this.nodes.hasOwnProperty(edge.toId) && this.nodes.hasOwnProperty(edge.fromId)) {
edgeLength = edge.customLength ? edge.length : this.constants.physics.springLength;
// this implies that the edges between big clusters are longer
edgeLength += (edge.to.clusterSize + edge.from.clusterSize - 2) * this.constants.clustering.edgeGrowth;
dx = (edge.from.x - edge.to.x);
dy = (edge.from.y - edge.to.y);
distance = Math.sqrt(dx * dx + dy * dy);
if (distance == 0) {
distance = 0.01;
}
distance = Math.max(0.8*edgeLength,Math.min(1.2*edgeLength, distance));
// the 1/distance is so the fx and fy can be calculated without sine or cosine.
springForce = this.constants.physics.springConstant * (edgeLength - distance) / distance;
node1.fx -= fx;
node1.fy -= fy;
node2.fx += fx;
node2.fy += fy;
fx = dx * springForce;
fy = dy * springForce;
edge.to.fx -= fx;
edge.to.fy -= fy;
edge.from.fx += fx;
edge.from.fy += fy;
var factor = 5;
if (distance > edgeLength) {
factor = 25;
}
if (edge.from.level > edge.to.level) {
edge.to.fx -= factor*fx;
edge.to.fy -= factor*fy;
}
else if (edge.from.level < edge.to.level) {
edge.from.fx += factor*fx;
edge.from.fy += factor*fy;
}
}
} }
} }
} }

+ 10
- 1
src/graph/graphMixins/physics/PhysicsMixin.js View File

@ -101,7 +101,12 @@ var physicsMixin = {
this._calculateSpringForcesWithSupport(); this._calculateSpringForcesWithSupport();
} }
else { else {
this._calculateSpringForces();
if (this.constants.physics.hierarchicalRepulsion.enabled == true) {
this._calculateHierarchicalSpringForces();
}
else {
this._calculateSpringForces();
}
} }
}, },
@ -181,6 +186,8 @@ var physicsMixin = {
}, },
/** /**
* this function calculates the effects of the springs in the case of unsmooth curves. * this function calculates the effects of the springs in the case of unsmooth curves.
* *
@ -227,6 +234,8 @@ var physicsMixin = {
}, },
/** /**
* This function calculates the springforces on the nodes, accounting for the support nodes. * This function calculates the springforces on the nodes, accounting for the support nodes.
* *

+ 4
- 4
src/timeline/component/DataAxis.js View File

@ -33,7 +33,7 @@ function DataAxis (body, options, svg) {
this.dom = {}; this.dom = {};
this.yRange = {start:0, end:0};
this.range = {start:0, end:0};
this.options = util.extend({}, this.defaultOptions); this.options = util.extend({}, this.defaultOptions);
this.conversionFactor = 1; this.conversionFactor = 1;
@ -196,8 +196,8 @@ DataAxis.prototype.hide = function() {
* @param end * @param end
*/ */
DataAxis.prototype.setRange = function (start, end) { DataAxis.prototype.setRange = function (start, end) {
this.yRange.start = start;
this.yRange.end = end;
this.range.start = start;
this.range.end = end;
}; };
/** /**
@ -273,7 +273,7 @@ DataAxis.prototype._redrawLabels = function () {
// calculate range and step (step such that we have space for 7 characters per label) // calculate range and step (step such that we have space for 7 characters per label)
var minimumStep = this.master ? this.props.majorCharHeight || 10 : this.stepPixelsForced; var minimumStep = this.master ? this.props.majorCharHeight || 10 : this.stepPixelsForced;
var step = new DataStep(this.yRange.start, this.yRange.end, minimumStep, this.dom.frame.offsetHeight);
var step = new DataStep(this.range.start, this.range.end, minimumStep, this.dom.frame.offsetHeight);
this.step = step; this.step = step;
step.first(); step.first();

Loading…
Cancel
Save