Added Number of Stops Graph to Route

src/main/java/seng202/group9/GUI/RouteGraphController.java

@@ -1,5 +1,6 @@
 package seng202.group9.GUI;
 
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.chart.BarChart;
 import javafx.scene.chart.CategoryAxis;
@@ -15,10 +16,7 @@ import seng202.group9.Core.Airline;
 import seng202.group9.Core.Airport;
 import seng202.group9.Core.Route;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 
 /**
  * Created by fwy13 on 2/10/2016.
@@ -95,6 +93,7 @@ public class RouteGraphController extends Controller{
         loadOutCountryGraph();
         loadEquipGraph();
         loadSimilarGraph();
+        loadStopsGraph();
     }
 
     public void loadAirlineGraph(){
@@ -328,7 +327,6 @@ public class RouteGraphController extends Controller{
         equipGraph.getData().add(series);
     }
 
-
     public void loadSimilarGraph(){
         similarGraph.setTitle("Top 10 Most Similar Routes");
         similarXAxis.setLabel("Routes");
@@ -364,41 +362,23 @@ public class RouteGraphController extends Controller{
         similarGraph.getData().add(series);
     }
 
-    /*public void loadStopsGraph(){
+    public void loadStopsGraph(){
-        stopsGraph.setTitle("Top 10 Equipment used by Routes");
+        stopsGraph.setTitle("Top 10 Most Common Amount of Stops by Routes");
-        XYChart.Series<String,Integer> series = new XYChart.Series<>();
+        ArrayList<PieChart.Data> data = new ArrayList<>();
-        series.setName("Number of Equipment");
+        HashMap<Integer, Integer> stops = new HashMap<>();//equipment, count
-        HashMap<String, Integer> equipmentList = new HashMap<>();//equipment, count
         for (Route route: routesFiltered){
-            String equipment[] = route.getEquipment().split(" ");
+            if (stops.containsKey(route.getStops())){
-            for (String equip : equipment){
+                stops.put(route.getStops(), stops.get(route.getStops()) + 1);
-                if (equipmentList.containsKey(equip)){
+            }else{
-                    equipmentList.put(equip, equipmentList.get(equip) + 1);
+                stops.put(route.getStops(), 1);
-                }else{
-                    equipmentList.put(equip, 1);
-                }
             }
         }
 
-        int length = 10;
+        for (int stop: stops.keySet()){
-        if (equipmentList.size() < 10){
+            stopsGraph.getData().add(new PieChart.Data(String.valueOf(stop), stops.get(stop)));
-            length = equipmentList.size();
-        }
-        for (int i = 0 ; i < length; i ++) {
-            int max = 0;
-            String maxEquip = "";
-            for (String equip: equipmentList.keySet()){
-                if (equipmentList.get(equip) > max){
-                    max = equipmentList.get(equip);
-                    maxEquip = equip;
-                }
-            }
-            series.getData().add(new XYChart.Data<String, Integer>(maxEquip, max));
-            equipmentList.remove(maxEquip);
         }
 
-        equipGraph.getData().add(series);
+    }
-    }*/
 
     public void goToRawData(){
         replaceSceneContent(SceneCode.ROUTE_RAW_DATA);