INSA/be-graphes
3
0
Fork 0
Code Issues 4 Releases Wiki Activity

add information regarding number of arcs in graph.

Browse Source
This commit is contained in:
Holt59
2018-03-11 20:34:16 +01:00
parent 23b46fd4bc
commit 97775a9714
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/org/insa/graph/io/BinaryGraphReader.java
View File

@@ -228,6 +228,7 @@ public class BinaryGraphReader extends BinaryReader implements GraphReader {
// Read successors and convert to arcs.
float maxLength = 0;
final int copyNbTotalSuccesors = nbTotalSuccessors; // Stupid Java...
int nbOneWayRoad = 0;
observers.forEach((observer) -> observer.notifyStartReadingArcs(copyNbTotalSuccesors));
for (int node = 0; node < nbNodes; ++node) {
for (int succ = 0; succ < nbSuccessors[node]; ++succ) {
@@ -273,6 +274,9 @@ public class BinaryGraphReader extends BinaryReader implements GraphReader {
// Add successor to initial arc.
Arc arc = Node.linkNodes(orig, dest, length, info, points);
if (info.isOneWay()) {
nbOneWayRoad++;
}
observers.forEach((observer) -> observer.notifyNewArcRead(arc));
}
}
@@ -285,8 +289,10 @@ public class BinaryGraphReader extends BinaryReader implements GraphReader {
this.dis.close();
return new Graph(mapId, mapName, nodes,
new GraphStatistics(new BoundingBox(new Point(minLongitude, maxLatitude),
new Point(maxLongitude, minLatitude)), maxSpeed, maxLength));
new GraphStatistics(
new BoundingBox(new Point(minLongitude, maxLatitude),
new Point(maxLongitude, minLatitude)),
nbOneWayRoad, nbTotalSuccessors - nbOneWayRoad, maxSpeed, maxLength));
}
/**