diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java index 3b2d15b..6cc916b 100644 --- a/src/main/java/seng202/group9/Controller/SceneCode.java +++ b/src/main/java/seng202/group9/Controller/SceneCode.java @@ -7,7 +7,7 @@ public enum SceneCode { INITIAL(""), AIRLINE_SUMMARY("airline_summary.fxml"), AIRLINE_RAW_DATA("airline_raw_data.fxml"), AIRPORT_SUMMARY("airport_summary.fxml"), AIRPORT_RAW_DATA("airport_raw_data.fxml"), ROUTE_SUMMARY("routes_summary.fxml"), ROUTE_RAW_DATA("route_raw_data.fxml"), FLIGHT_SUMMARY("flight_data_summary.fxml"), - FLIGHT_RAW_DATA("flight_raw_data.fxml"); + FLIGHT_RAW_DATA("flight_raw_data.fxml"), ROUTE_ANALYSER("route_analyser.fxml"); private String filePath; diff --git a/src/main/java/seng202/group9/GUI/RouteAnalyser.java b/src/main/java/seng202/group9/GUI/RouteAnalyser.java new file mode 100644 index 0000000..4c8e7be --- /dev/null +++ b/src/main/java/seng202/group9/GUI/RouteAnalyser.java @@ -0,0 +1,81 @@ +package seng202.group9.GUI; + +import javafx.collections.FXCollections; +import javafx.fxml.FXML; +import javafx.scene.chart.BarChart; +import javafx.scene.chart.CategoryAxis; +import javafx.scene.chart.NumberAxis; +import javafx.scene.chart.XYChart; +import javafx.scene.control.Alert; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; +import javafx.scene.control.cell.PropertyValueFactory; +import seng202.group9.Controller.App; +import seng202.group9.Controller.Dataset; +import seng202.group9.Core.Route; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * Created by michael on 16/09/2016. + */ +public class RouteAnalyser extends Controller { + @FXML + private BarChart analyserGraph; + + private ArrayList current_routes; + + private Dataset currentdata = null; + private HashMap useddata = new HashMap(); + + public void build_graph(){ + current_routes = currentdata.getRoutes(); + datasetup(current_routes); + XYChart.Series seriesArivals = new XYChart.Series(); + XYChart.Series seriesDeparts = new XYChart.Series(); + seriesArivals.setName("Arriving routes"); + seriesDeparts.setName("Departs routes"); + System.out.println(useddata.keySet().size()); + for (String airport : useddata.keySet()){ + ArrayList temp = useddata.get(airport); + seriesArivals.getData().add(new XYChart.Data(airport,temp.get(0))); + seriesDeparts.getData().add(new XYChart.Data(airport,temp.get(1))); + } + analyserGraph.getData().addAll(seriesArivals,seriesDeparts); + } + + private void datasetup(ArrayList current_routes){ + for (Route entry : current_routes){ + String departs = entry.getDepartureAirport(); + String arives = entry.getArrivalAirport(); + if (useddata.containsKey(departs)){ + ArrayList temp = useddata.get(departs); + temp.add(1,temp.get(1)+1); + useddata.replace(departs,temp); + }else { + ArrayList temp = new ArrayList(2); + temp.add(0); + temp.add(1); + useddata.put(departs,temp); + } + if (useddata.containsKey(arives)){ + ArrayList temp = useddata.get(arives); + temp.add(0,temp.get(0)+1); + useddata.replace(arives,temp); + }else { + ArrayList temp = new ArrayList(2); + temp.add(1); + temp.add(0); + useddata.put(arives,temp); + } + } + } + + public void load() { + currentdata = getParent().getCurrentDataset(); + build_graph(); + } +} diff --git a/src/main/java/seng202/group9/GUI/RouteRDController.java b/src/main/java/seng202/group9/GUI/RouteRDController.java index f2994b8..abf2581 100644 --- a/src/main/java/seng202/group9/GUI/RouteRDController.java +++ b/src/main/java/seng202/group9/GUI/RouteRDController.java @@ -6,6 +6,7 @@ import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; import seng202.group9.Controller.App; import seng202.group9.Controller.Dataset; +import seng202.group9.Controller.SceneCode; import seng202.group9.Core.Route; /** @@ -91,4 +92,8 @@ public class RouteRDController extends Controller { rCodeshareCBox.getItems().addAll("Y", ""); } + + public void analyse_Button() { + replaceSceneContent(SceneCode.ROUTE_ANALYSER); + } } diff --git a/src/main/resources/airport_pie.fxml b/src/main/resources/airport_pie.fxml new file mode 100644 index 0000000..85a86f8 --- /dev/null +++ b/src/main/resources/airport_pie.fxml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/route_analyser.fxml b/src/main/resources/route_analyser.fxml new file mode 100644 index 0000000..85a86f8 --- /dev/null +++ b/src/main/resources/route_analyser.fxml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/route_raw_data.fxml b/src/main/resources/route_raw_data.fxml index 22b41c0..a1d0de7 100644 --- a/src/main/resources/route_raw_data.fxml +++ b/src/main/resources/route_raw_data.fxml @@ -13,7 +13,7 @@ - + @@ -30,7 +30,7 @@ -