Commit 24edde83 authored by gsavin's avatar gsavin
Browse files

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

parents 7c4987d5 388fbba4
......@@ -39,7 +39,6 @@ import java.util.Random;
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;
......
......@@ -257,7 +257,7 @@ public class Kruskal extends AbstractSpanningTree {
* 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);
......
......@@ -191,7 +191,7 @@ public class Prim extends AbstractSpanningTree {
* 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);
......
......@@ -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.
......
......@@ -37,12 +37,10 @@ import java.util.Iterator;
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 class Eades84Layout extends PipeBase implements Layout {
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment