Merge branch 'master' of github.com:graphstream/gs-algo

FlexiGit · Nov 10, 2011 · 24edde8 · 24edde8
2 parents 7c4987d + 388fbba
commit 24edde8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/org/graphstream/algorithm/DStar.java b/src/org/graphstream/algorithm/DStar.java
@@ -39,7 +39,6 @@
 
 import org.graphstream.algorithm.generator.DorogovtsevMendesGenerator;
 import org.graphstream.algorithm.generator.Generator;
-import org.graphstream.algorithm.generator.GridGenerator;
 import org.graphstream.graph.Edge;
 import org.graphstream.graph.Graph;
 import org.graphstream.graph.Node;

diff --git a/src/org/graphstream/algorithm/Kruskal.java b/src/org/graphstream/algorithm/Kruskal.java
@@ -257,7 +257,7 @@ protected void resetFlags() {
 	 *            an edge
 	 * @return weight of <i>e</i>
 	 */
-	@SuppressWarnings({ "rawtypes" })
+	@SuppressWarnings("unchecked")
 	protected Comparable getWeight(Edge e) {
 		if (!e.hasAttribute(weightAttribute))
 			return Double.valueOf(1);

diff --git a/src/org/graphstream/algorithm/Prim.java b/src/org/graphstream/algorithm/Prim.java
@@ -191,7 +191,7 @@ public void setWeightAttribute(String newWeightAttribute) {
 	 *            an edge
 	 * @return weight of <i>n</i>
 	 */
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("unchecked")
 	protected Comparable getWeight(Edge e) {
 		if (!e.hasAttribute(weightAttribute))
 			return Double.valueOf(1);

diff --git a/src/org/graphstream/algorithm/coloring/WelshPowell.java b/src/org/graphstream/algorithm/coloring/WelshPowell.java
@@ -31,11 +31,14 @@
  */
 package org.graphstream.algorithm.coloring;
 
-import java.util.*;
-import java.awt.*;
-
-import org.graphstream.algorithm.*;
-import org.graphstream.graph.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.PriorityQueue;
+
+import org.graphstream.algorithm.Algorithm;
+import org.graphstream.graph.Graph;
+import org.graphstream.graph.Node;
 
 /**
  * Welsh Powell static graph coloring algorithm.

diff --git a/src/org/graphstream/ui/layout/Eades84Layout.java b/src/org/graphstream/ui/layout/Eades84Layout.java
@@ -37,12 +37,10 @@
 import java.util.LinkedList;
 import java.util.Random;
 
-import org.graphstream.algorithm.generator.PreferentialAttachmentGenerator;
+import org.graphstream.algorithm.generator.BarabasiAlbertGenerator;
 import org.graphstream.graph.implementations.DefaultGraph;
 import org.graphstream.stream.PipeBase;
 import org.graphstream.ui.geom.Point3;
-import org.graphstream.ui.layout.Layout;
-import org.graphstream.ui.layout.LayoutListener;
 import org.miv.pherd.geom.Vector3;
 
 public class Eades84Layout extends PipeBase implements Layout {
@@ -421,7 +419,7 @@ public Point3 getPosition() {
 
 	public static void main(String... args) {
 		DefaultGraph g = new DefaultGraph("g");
-		PreferentialAttachmentGenerator gen = new PreferentialAttachmentGenerator();
+		BarabasiAlbertGenerator gen = new BarabasiAlbertGenerator();
 		Eades84Layout layout = new Eades84Layout();
 
 		int size = 30;