adds iterator

iterator/.gitignore

@@ -1,2 +1,2 @@
-.idea
+.idea/
 out

iterator/src/MainGrafo2.java

@@ -5,6 +5,7 @@
 import grafo.dirigido.Aresta;
 import grafo.dirigido.Grafo;
 import grafo.dirigido.Vertice;
+import iterator.IteratorInterface;
 import model.Aluno;
 
 public class MainGrafo2 {
@@ -76,17 +77,19 @@ public static void main(String args[]){
 			 g.addAresta("4", "3", 1);
 			 g.addAresta("5", "2", 1);
 			 g.addAresta("5", "1", 1);
-			 g.addAresta("1", "2", 1); 
-
-			 g.BFS("6");
-			 g.BFSDistance("5");
-
-			 System.out.println();
-			 g.DFS("6");
-
-
-			 g.clear();
-			 System.out.println("Grafo foi esvaziado: " + g);
+			 g.addAresta("1", "2", 1);
+
+			 IteratorInterface it = g.getBFSIterator("6");
+			 System.out.println("BFS:");
+			 while (it.hasNext()) {Van
+				 System.out.println(it.next());
+			 }
+
+			 it = g.getDFSIterator("6");
+			 System.out.println("DFS:");
+			 while (it.hasNext()) {
+				 System.out.println(it.next());
+			 }
 
 		 } 
 

iterator/src/grafo/dirigido/Grafo.java

@@ -1,6 +1,10 @@
 package grafo.dirigido;
 
 
+import iterator.BFSIterator;
+import iterator.DFSIterator;
+import iterator.IteratorInterface;
+
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -510,5 +514,12 @@ public Grafo<T> getSubGrafo(T carga){
 		return grafo;
 	}
 
+	public IteratorInterface<T> getBFSIterator(T carga) {
+		return new BFSIterator<T>(this.vertices, this.arestas, carga);
+	}
+
+	public IteratorInterface<T> getDFSIterator(T carga) {
+		return new DFSIterator<T>(this.vertices, this.arestas, carga);
+	}
 
 }

iterator/src/iterator/BFSIterator.java

@@ -0,0 +1,67 @@
+package iterator;
+
+import grafo.dirigido.Aresta;
+import grafo.dirigido.Vertice;
+
+import java.util.*;
+
+public class BFSIterator<T> implements IteratorInterface{
+
+    private final List<Vertice<T>> vertices;
+    private final List<Aresta<T>> edges;
+    private final Queue<Vertice<T>> queue = new LinkedList<>();
+    private final Set<Vertice<T>> visited = new HashSet<>();
+
+    public BFSIterator(List<Vertice<T>> vertices, List<Aresta<T>> arestas, T id) {
+        this.edges = arestas;
+        this.vertices = vertices;
+        Vertice<T> v = getVertice(id);
+
+        if(v != null){
+            this.queue.add(v);
+            this.visited.add(v);
+        } else {
+            throw new NoSuchElementException();
+        }
+
+    }
+    @Override
+    public boolean hasNext() {
+        return !queue.isEmpty();
+    }
+
+    @Override
+    public Vertice<T> next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+        Vertice<T> next = queue.remove();
+        for (Vertice<T> adjacent : this.getAdjacent(next)){
+            if(!this.visited.contains(adjacent)){
+                this.queue.add(adjacent);
+                this.visited.add(adjacent);
+            }
+        }
+        return next;
+    }
+
+    private Vertice<T> getVertice(T data){
+
+        for (Vertice<T> u : vertices) {
+            if ( u.getCarga().equals( data ))
+                return u;
+        }
+        return null;
+    }
+
+    private List<Vertice<T>> getAdjacent( Vertice<T> vertice ){
+        List<Vertice<T>> vertex = new ArrayList<>();
+
+        for(Aresta<T> arco: edges){
+            if( arco.getOrigem().equals(vertice))
+                vertex.add((Vertice<T>) arco.getDestino());
+        }
+
+        return vertex;
+    }
+}

iterator/src/iterator/DFSIterator.java

@@ -0,0 +1,69 @@
+package iterator;
+
+import grafo.dirigido.Aresta;
+import grafo.dirigido.Vertice;
+
+import java.util.*;
+
+public class DFSIterator<T> implements IteratorInterface{
+
+        private final List<Vertice<T>> vertices;
+        private final List<Aresta<T>> edges;
+        private final Stack<Vertice<T>> stack = new Stack<>();
+        private final Set<Vertice<T>> visited = new HashSet<>();
+
+        public DFSIterator(List<Vertice<T>> vertices, List<Aresta<T>> edges, T data) {
+            this.edges = edges;
+            this.vertices = vertices;
+            Vertice<T> v = getVertice(data);
+
+            if(v != null){
+                this.stack.add(v);
+                this.visited.add(v);
+            } else {
+                throw new NoSuchElementException();
+            }
+
+        }
+        @Override
+        public boolean hasNext() {
+            return !stack.isEmpty();
+        }
+
+        @Override
+        public Vertice<T> next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+            Vertice<T> next = stack.pop();
+
+            for (Vertice<T> adjacent : this.getAdjacent(next)){
+                if(!this.visited.contains(adjacent)){
+                    this.stack.add(adjacent);
+                    this.visited.add(adjacent);
+                }
+            }
+
+            return next;
+        }
+
+        private Vertice<T> getVertice(T carga){
+
+            for (Vertice<T> u : vertices) {
+                if ( u.getCarga().equals( carga ))
+                    return u;
+            }
+            return null;
+        }
+
+        private List<Vertice<T>> getAdjacent(Vertice<T> vertice ){
+            List<Vertice<T>> vertex = new ArrayList<>();
+
+            for(Aresta<T> arco: edges){
+                if( arco.getOrigem().equals(vertice))
+                    vertex.add(arco.getDestino());
+            }
+
+            return vertex;
+        }
+}

iterator/src/iterator/IteratorInterface.java

@@ -0,0 +1,6 @@
+package iterator;
+
+public interface IteratorInterface<E> {
+    boolean hasNext();
+    E next();
+}