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

Start updating length (int -> float).

Browse Source
This commit is contained in:
Mikael Capelle
2018-03-09 14:12:21 +01:00
parent 85fb193808
commit 3e6bcb0665
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ public class BinaryGraphReader extends BinaryReader implements GraphReader {
checkByteOrThrow(254);
// Read successors and convert to arcs.
int maxLength = 0;
float maxLength = 0;
final int copyNbTotalSuccesors = nbTotalSuccessors; // Stupid Java...
observers.forEach((observer) -> observer.notifyStartReadingArcs(copyNbTotalSuccesors));
for (int node = 0; node < nbNodes; ++node) {
@@ -225,7 +225,13 @@ public class BinaryGraphReader extends BinaryReader implements GraphReader {
int descrNum = this.read24bits();
// Length of the arc.
int length = dis.readUnsignedShort();
float length;
if (getCurrentVersion() < 8) {
length = dis.readUnsignedShort();
}
else {
length = dis.readInt() / 1000.0f;
}
maxLength = Math.max(length, maxLength);
// Number of segments.