Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202

Conflicts:
	res/session.ser

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<Route> current_routes;
+
+    private Dataset currentdata = null;
+    private HashMap<String, ArrayList> useddata = new HashMap<String, ArrayList>();
+
+    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<Integer> 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<Route> current_routes){
+        for (Route entry : current_routes){
+            String departs = entry.getDepartureAirport();
+            String arives = entry.getArrivalAirport();
+            if (useddata.containsKey(departs)){
+                ArrayList<Integer> temp = useddata.get(departs);
+                temp.add(1,temp.get(1)+1);
+                useddata.replace(departs,temp);
+            }else {
+                ArrayList<Integer> temp = new ArrayList<Integer>(2);
+                temp.add(0);
+                temp.add(1);
+                useddata.put(departs,temp);
+            }
+            if (useddata.containsKey(arives)){
+                ArrayList<Integer> temp = useddata.get(arives);
+                temp.add(0,temp.get(0)+1);
+                useddata.replace(arives,temp);
+            }else {
+                ArrayList<Integer> temp = new ArrayList<Integer>(2);
+                temp.add(1);
+                temp.add(0);
+                useddata.put(arives,temp);
+            }
+        }
+    }
+
+    public void load() {
+        currentdata = getParent().getCurrentDataset();
+        build_graph();
+    }
+}

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);
+    }
 }