Author: scooter
Date: 2011-04-01 14:16:21 -0700 (Fri, 01 Apr 2011)
New Revision: 24646
Modified:
cytoscape/trunk/coreplugins/AutomaticLayout/src/main/java/csplugins/layout/algorithms/force/ForceDirectedLayout.java
Log:
Oops -- need to change Tunables, too.
Modified:
cytoscape/trunk/coreplugins/AutomaticLayout/src/main/java/csplugins/layout/algorithms/force/ForceDirectedLayout.java
===================================================================
---
cytoscape/trunk/coreplugins/AutomaticLayout/src/main/java/csplugins/layout/algorithms/force/ForceDirectedLayout.java
2011-04-01 21:12:51 UTC (rev 24645)
+++
cytoscape/trunk/coreplugins/AutomaticLayout/src/main/java/csplugins/layout/algorithms/force/ForceDirectedLayout.java
2011-04-01 21:16:21 UTC (rev 24646)
@@ -73,7 +73,7 @@
double defaultSpringCoefficient = 1e-4f;
double defaultSpringLength = 50;
double defaultNodeMass = 3.0;
- boolean discrete = false;
+ boolean deterministic = false;
/**
* Value to set for doing unweighted layouts
@@ -139,7 +139,7 @@
List<LayoutNode> nodeList = part.getNodeList();
List<LayoutEdge> edgeList = part.getEdgeList();
- if (discrete) {
+ if (deterministic) {
Collections.sort(nodeList);
Collections.sort(edgeList);
}
@@ -299,7 +299,7 @@
layoutProperties.add(new Tunable("numIterations", "Number of
Iterations",
Tunable.INTEGER, new
Integer(numIterations)));
- layoutProperties.add(new Tunable("discrete", "Force
deterministic layouts (slower)",
+ layoutProperties.add(new Tunable("deterministic", "Force
deterministic layouts (slower)",
Tunable.BOOLEAN, new
Boolean(false)));
// layoutProperties.add(new Tunable("integrator", "Integration
algorithm to use",
@@ -365,9 +365,9 @@
}
- t = layoutProperties.get("discrete");
+ t = layoutProperties.get("deterministic");
if ((t != null) && (t.valueChanged() || force)) {
- discrete = ((Boolean) t.getValue()).booleanValue();
+ deterministic = ((Boolean) t.getValue()).booleanValue();
if (t.valueChanged())
layoutProperties.setProperty(t.getName(),
t.getValue().toString());
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
