TP3

app/src/main/java/tube/Control.java

 package tube;
 
+import java.util.List;
+
 import javax.swing.JOptionPane;
 
 import tube.gui.TubeView;
@@ -38,25 +40,37 @@ public class Control {
 	 * show an itinerary between two stations.
 	 * -----------------------------------------------------------
 	 */	  
-	  public void showItinerary(int x, int y){
-     	String station=tv.findClosestStation(x,y);
-     	System.out.println("USER ACTION: station selection = "+station);
-     	TermList sel=new TermList();
-     	if (begin==null) {
-     		begin=station;
-     		sel.add(begin);
-     		tv.show(sel);
-     	}
-     	else if (end==null) {
-     		end=station;
-    		TermList selection=null;
-     		if (selection==null) {
-     			JOptionPane.showMessageDialog(tv, "No path has been found.");
-     			sel=null;
-     			begin=null;
-     			end=null;
-     		}
-     		tv.show(selection);
-     	}
-	  }
+  public void showItinerary(int x, int y){
+   	String station=tv.findClosestStation(x,y);
+   	System.out.println("USER ACTION: station selection = "+station);
+   	TermList sel=new TermList();
+   	if (begin==null) {
+   		begin=station;
+   		sel.add(begin);
+   		tv.show(sel);
+   	}
+   	else if (end==null) {
+   		end=station;
+  		TermList selection=new TermList();
+
+			Path path = new Path(net);
+			List<String> fPath = path.getPath(begin, end);
+
+			if(fPath == null)
+				selection = null;
+			else{
+				for(String st : fPath){
+					selection.add(st);
+				}
+			}
+		
+   		if (selection==null) {
+   			JOptionPane.showMessageDialog(tv, "No path has been found.");
+   			sel=null;
+   			begin=null;
+   			end=null;
+   		}
+   		tv.show(selection);
+   	}
+  }
 }

app/src/main/java/tube/Path.java

@@ -21,9 +21,11 @@ public class Path {
     for(Step step : net.steps){
       String nextS = step.getNext(current);
       if(nextS == null) continue;
-      if(!visited.contains(nextS)) continue;
-      double alpha = tbv.angle(nextS, current, goal);
+      if(visited.contains(nextS)) continue;
+      if(nextS.equals(goal)) return nextS;
+      double alpha = tbv.angle(current, nextS, goal);
       if(alpha < angMin){
+        System.out.println(nextS + ":" + alpha);
         angMin = alpha;
         next = nextS;
       }
@@ -40,6 +42,7 @@ public class Path {
       System.out.println(current);
       if(current.equals(end)) return visited;
       String next = getNextStation(current, end, visited);
+      System.out.println(next);
       if(next == null) return null;
       current = next;
     }