From 92c5cf9c8b43dcb2860b9489e6ff671c4e3a96e4 Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Fri, 16 Sep 2016 13:28:52 +1200
Subject: [PATCH 1/2] First graph displays it's data as desired.

---
 .../seng202/group9/GUI/RouteAnalyser.java     | 80 +++++++++++++++++++
 .../seng202/group9/GUI/RouteRDController.java | 11 +++
 src/main/resources/route_analyser.fxml        | 45 +++++++++++
 src/main/resources/route_raw_data.fxml        |  4 +-
 4 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/seng202/group9/GUI/RouteAnalyser.java
 create mode 100644 src/main/resources/route_analyser.fxml

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..6debc39
--- /dev/null
+++ b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
@@ -0,0 +1,80 @@
+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 MenuController {
+    @FXML
+    private BarChart analyserGraph;
+
+    App parent;
+    private ArrayList<Route> current_routes;
+
+    public void setApp(App parent){
+        this.parent = parent;
+    }
+
+    private Dataset Data = null;
+    private HashMap<String, ArrayList> useddata = new HashMap<String, ArrayList>();
+
+    public void build_graph(Dataset current_data){
+        current_routes = current_data.getRoutes();
+        datasetup(current_routes);
+        XYChart.Series seriesArivals = new XYChart.Series();
+        XYChart.Series seriesDeparts = new XYChart.Series();
+        seriesArivals.setName("Arriving routes");
+        seriesDeparts.setName("Departs routes");
+        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);
+            }
+        }
+    }
+}
diff --git a/src/main/java/seng202/group9/GUI/RouteRDController.java b/src/main/java/seng202/group9/GUI/RouteRDController.java
index 7984304..9c6fbca 100644
--- a/src/main/java/seng202/group9/GUI/RouteRDController.java
+++ b/src/main/java/seng202/group9/GUI/RouteRDController.java
@@ -105,4 +105,15 @@ public class RouteRDController extends MenuController {
             alert.showAndWait();
         }
     }
+    public void analyse_Button() {
+        try {
+            RouteAnalyser graphController = (RouteAnalyser)
+                    parent.replaceSceneContent("route_analyser.fxml");
+            graphController.setApp(parent);
+            graphController.build_graph(theDataSet);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.chart.BarChart?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteAnalyser">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <Pane prefHeight="510.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
+         <children>
+            <Label layoutX="14.0" layoutY="14.0" text="Route Analyser">
+               <font>
+                  <Font size="29.0" />
+               </font>
+            </Label>
+            <Pane layoutX="16.0" layoutY="53.0" prefHeight="403.0" prefWidth="765.0">
+               <children>
+                  <BarChart fx:id="analyserGraph" prefHeight="403.0" prefWidth="740.0" title="Routes Arriving at or Departing from each Airport">
+                    <xAxis>
+                      <CategoryAxis label="Airports" side="BOTTOM" />
+                    </xAxis>
+                    <yAxis>
+                      <NumberAxis label="Number" side="LEFT" />
+                    </yAxis>
+                  </BarChart>
+               </children>
+            </Pane>
+         </children>
+      </Pane>
+   </children>
+</GridPane>
diff --git a/src/main/resources/route_raw_data.fxml b/src/main/resources/route_raw_data.fxml
index 870dddb..3774b05 100644
--- a/src/main/resources/route_raw_data.fxml
+++ b/src/main/resources/route_raw_data.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteRDController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteRDController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -29,7 +29,7 @@
                   <Font size="29.0" />
                </font>
             </Label>
-            <Button layoutX="14.0" layoutY="524.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button layoutX="14.0" layoutY="524.0" mnemonicParsing="false" onAction="#analyse_Button" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
             <Button layoutX="656.0" layoutY="524.0" mnemonicParsing="false" onAction="#addRouteSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
             <Pane layoutX="16.0" layoutY="53.0" prefHeight="403.0" prefWidth="765.0">
                <children>

From f0fbc7cf240e6ce364b1b0f4cc9be6683cba16dc Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Sat, 17 Sep 2016 14:02:11 +1200
Subject: [PATCH 2/2] Small check added.

---
 src/main/java/seng202/group9/GUI/RouteAnalyser.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/seng202/group9/GUI/RouteAnalyser.java b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
index 6debc39..f1e7234 100644
--- a/src/main/java/seng202/group9/GUI/RouteAnalyser.java
+++ b/src/main/java/seng202/group9/GUI/RouteAnalyser.java
@@ -43,6 +43,7 @@ public class RouteAnalyser extends MenuController {
         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)));