Author: mes
Date: 2012-01-12 15:38:31 -0800 (Thu, 12 Jan 2012)
New Revision: 28007

Modified:
   
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
Log:
first pass at integrating support of edge weighted layout support

Modified: 
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
===================================================================
--- 
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
  2012-01-12 23:37:34 UTC (rev 28006)
+++ 
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayout.java
  2012-01-12 23:38:31 UTC (rev 28007)
@@ -3,7 +3,7 @@
 
 import java.io.IOException;
 
-import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
+import org.cytoscape.view.layout.AbstractEdgeWeightedLayoutAlgorithm;
 import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
 import org.cytoscape.work.TaskIterator;
 import org.cytoscape.work.Tunable;
@@ -18,7 +18,7 @@
 import org.cytoscape.work.util.ListSingleSelection;
 
 
-public class ForceDirectedLayout extends AbstractLayoutAlgorithm implements 
TunableValidator {
+public class ForceDirectedLayout extends AbstractEdgeWeightedLayoutAlgorithm 
implements TunableValidator {
        @Tunable(description="Number of Iterations")
        public int numIterations = 100;
        @Tunable(description="Default Spring Coefficient")
@@ -30,9 +30,7 @@
        @Tunable(description="Don't partition graph before layout", 
groups="Standard settings")
        public boolean singlePartition;
 
-       //@Tunable(description="Integration algorithm to use", 
groups="Algorithm settings")
-       public Integrators integrator = Integrators.RUNGEKUTTA;
-       //public ListSingleSelection<String> integratorChoice = "Runge-Kutta";
+       private Integrators integrator = Integrators.RUNGEKUTTA;
        
        public enum Integrators {
                RUNGEKUTTA ("Runge-Kutta"),

-- 
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.

Reply via email to