Merge branch 'master' of github.com:gephi/gephi into fdeb

eduramiba · Aug 25, 2012 · 2ba9903 · 2ba9903
2 parents da4ac3b + 1d5ec08
commit 2ba9903
Show file tree

Hide file tree

Showing 55 changed files with 784 additions and 655 deletions.
diff --git a/Algorithms/manifest.mf b/Algorithms/manifest.mf
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 AutoUpdate-Essential-Module: true
 OpenIDE-Module: org.gephi.algorithms
 OpenIDE-Module-Localizing-Bundle: org/gephi/algorithms/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.8.1.0
+OpenIDE-Module-Specification-Version: 0.8.1.1
diff --git a/Algorithms/src/org/gephi/algorithms/shortestpath/AbstractShortestPathAlgorithm.java b/Algorithms/src/org/gephi/algorithms/shortestpath/AbstractShortestPathAlgorithm.java
@@ -1,78 +1,79 @@
 /*
-Copyright 2008-2010 Gephi
-Authors : Mathieu Bastian <mathieu.bastian@gephi.org>
-Website : http://www.gephi.org
-
-This file is part of Gephi.
-
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 2011 Gephi Consortium. All rights reserved.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 3 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://gephi.org/about/legal/license-notice/
-or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License files at
-/cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 3, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 3] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 3 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 3 code and therefore, elected the GPL
-Version 3 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Gephi Consortium.
+ Copyright 2008-2010 Gephi
+ Authors : Mathieu Bastian <mathieu.bastian@gephi.org>
+ Website : http://www.gephi.org
+
+ This file is part of Gephi.
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2011 Gephi Consortium. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 3 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://gephi.org/about/legal/license-notice/
+ or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.  When distributing the software, include this License Header
+ Notice in each file and include the License files at
+ /cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 3, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 3] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 3 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 3 code and therefore, elected the GPL
+ Version 3 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+ Contributor(s):
+
+ Portions Copyrighted 2011 Gephi Consortium.
  */
 package org.gephi.algorithms.shortestpath;
 
 import java.awt.Color;
 import java.util.HashMap;
 import org.gephi.graph.api.Edge;
 import org.gephi.graph.api.Node;
+import org.gephi.graph.api.NodeData;
 
 /**
  *
  * @author Mathieu Bastian
  */
 public abstract class AbstractShortestPathAlgorithm {
 
-    protected final HashMap<Node, Color> colors;
-    protected final HashMap<Node, Double> distances;
+    protected final HashMap<NodeData, Color> colors;
+    protected final HashMap<NodeData, Double> distances;
     protected final Node sourceNode;
     protected double maxDistance = 0;
 
     public AbstractShortestPathAlgorithm(Node sourceNode) {
         this.sourceNode = sourceNode;
-        colors = new HashMap<Node, Color>();
-        distances = new HashMap<Node, Double>();
+        colors = new HashMap<NodeData, Color>();
+        distances = new HashMap<NodeData, Double>();
     }
 
     protected boolean relax(Edge edge) {
         Node source = edge.getSource();
         Node target = edge.getTarget();
-        double distSource = distances.get(source);
-        double distTarget = distances.get(target);
+        double distSource = distances.get(source.getNodeData());
+        double distTarget = distances.get(target.getNodeData());
         double weight = edgeWeight(edge);
 
         double sourceWeight = distSource + weight;
         if (sourceWeight < distTarget) {
-            distances.put(target, sourceWeight);
+            distances.put(target.getNodeData(), sourceWeight);
             maxDistance = Math.max(maxDistance, sourceWeight);
             return true;
         } else {
@@ -90,7 +91,7 @@ protected double edgeWeight(Edge edge) {
 
     public abstract Edge getPredecessorIncoming(Node node);
 
-    public HashMap<Node, Double> getDistances() {
+    public HashMap<NodeData, Double> getDistances() {
         return distances;
     }
 

diff --git a/Algorithms/src/org/gephi/algorithms/shortestpath/BellmanFordShortestPathAlgorithm.java b/Algorithms/src/org/gephi/algorithms/shortestpath/BellmanFordShortestPathAlgorithm.java
@@ -48,6 +48,7 @@ Development and Distribution License("CDDL") (collectively, the
 import org.gephi.graph.api.DirectedGraph;
 import org.gephi.graph.api.Edge;
 import org.gephi.graph.api.Node;
+import org.gephi.graph.api.NodeData;
 import org.openide.util.Lookup;
 
 /**
@@ -57,13 +58,13 @@ Development and Distribution License("CDDL") (collectively, the
 public class BellmanFordShortestPathAlgorithm extends AbstractShortestPathAlgorithm {
 
     protected final DirectedGraph graph;
-    protected final HashMap<Node, Edge> predecessors;
+    protected final HashMap<NodeData, Edge> predecessors;
     protected TimeInterval timeInterval;
 
     public BellmanFordShortestPathAlgorithm(DirectedGraph graph, Node sourceNode) {
         super(sourceNode);
         this.graph = graph;
-        predecessors = new HashMap<Node, Edge>();
+        predecessors = new HashMap<NodeData, Edge>();
         DynamicController dynamicController = Lookup.getDefault().lookup(DynamicController.class);
         if (dynamicController != null) {
             timeInterval = DynamicUtilities.getVisibleInterval(dynamicController.getModel(graph.getGraphModel().getWorkspace()));
@@ -77,10 +78,10 @@ public void compute() {
         //Initialize
         int nodeCount = 0;
         for (Node node : graph.getNodes()) {
-            distances.put(node, Double.POSITIVE_INFINITY);
+            distances.put(node.getNodeData(), Double.POSITIVE_INFINITY);
             nodeCount++;
         }
-        distances.put(sourceNode, 0d);
+        distances.put(sourceNode.getNodeData(), 0d);
 
 
         //Relax edges repeatedly
@@ -91,7 +92,7 @@ public void compute() {
                 Node target = edge.getTarget();
                 if (relax(edge)) {
                     relaxed = true;
-                    predecessors.put(target, edge);
+                    predecessors.put(target.getNodeData(), edge);
                 }
             }
             if (!relaxed) {
@@ -102,7 +103,7 @@ public void compute() {
         //Check for negative-weight cycles
         for (Edge edge : graph.getEdges()) {
 
-            if (distances.get(edge.getSource()) + edgeWeight(edge) < distances.get(edge.getTarget())) {
+            if (distances.get(edge.getSource().getNodeData()) + edgeWeight(edge) < distances.get(edge.getTarget().getNodeData())) {
                 graph.readUnlock();
                 throw new RuntimeException("The Graph contains a negative-weighted cycle");
             }
@@ -120,9 +121,9 @@ protected double edgeWeight(Edge edge) {
     }
 
     public Node getPredecessor(Node node) {
-        Edge edge = predecessors.get(node);
+        Edge edge = predecessors.get(node.getNodeData());
         if (edge != null) {
-            if (edge.getSource() != node) {
+            if (edge.getSource().getNodeData() != node.getNodeData()) {
                 return edge.getSource();
             } else {
                 return edge.getTarget();
@@ -132,6 +133,6 @@ public Node getPredecessor(Node node) {
     }
 
     public Edge getPredecessorIncoming(Node node) {
-        return predecessors.get(node);
+        return predecessors.get(node.getNodeData());
     }
 }