fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Number of Stops Graph to Route

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-10-03 03:41:12 +13:00
parent 1034ee6731
commit 3c8e4aaa1d
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/GUI/RouteGraphController.java
+14 -34
View File
@@ -1,5 +1,6 @@
package seng202.group9.GUI; package seng202.group9.GUI;
import javafx.collections.FXCollections;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.chart.BarChart; import javafx.scene.chart.BarChart;
import javafx.scene.chart.CategoryAxis; import javafx.scene.chart.CategoryAxis;
@@ -15,10 +16,7 @@ import seng202.group9.Core.Airline;
import seng202.group9.Core.Airport; import seng202.group9.Core.Airport;
import seng202.group9.Core.Route; 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. * Created by fwy13 on 2/10/2016.
@@ -95,6 +93,7 @@ public class RouteGraphController extends Controller{
loadOutCountryGraph(); loadOutCountryGraph();
loadEquipGraph(); loadEquipGraph();
loadSimilarGraph(); loadSimilarGraph();
loadStopsGraph();
} }
public void loadAirlineGraph(){ public void loadAirlineGraph(){
@@ -328,7 +327,6 @@ public class RouteGraphController extends Controller{
equipGraph.getData().add(series); equipGraph.getData().add(series);
} }
public void loadSimilarGraph(){ public void loadSimilarGraph(){
similarGraph.setTitle("Top 10 Most Similar Routes"); similarGraph.setTitle("Top 10 Most Similar Routes");
similarXAxis.setLabel("Routes"); similarXAxis.setLabel("Routes");
@@ -364,41 +362,23 @@ public class RouteGraphController extends Controller{
similarGraph.getData().add(series); 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){ 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(){ public void goToRawData(){
replaceSceneContent(SceneCode.ROUTE_RAW_DATA); replaceSceneContent(SceneCode.ROUTE_RAW_DATA);