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

Length -> Float. Fix issue with duplicated backward arcs.

Browse Source
This commit is contained in:
Holt59 2018-03-12 20:43:32 +01:00
parent ec7d18b1b2
commit 95b68f3e31
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/org/insa/graph/Arc.java
View File

@ -31,7 +31,7 @@ public abstract class Arc {
/** /**
* @return Length of this arc, in meters. * @return Length of this arc, in meters.
*/ */
public abstract double getLength(); public abstract float getLength();
/** /**
* Compute the time required to travel this arc if moving at the given speed. * Compute the time required to travel this arc if moving at the given speed.

7
src/main/org/insa/graph/ArcBackward.java
View File

@ -13,7 +13,7 @@ import java.util.List;
class ArcBackward extends Arc { class ArcBackward extends Arc {
// Original arc // Original arc
private final ArcForward originalArc; private final Arc originalArc;
/** /**
* Create a new backward arc which corresponds to the reverse arc of the given * Create a new backward arc which corresponds to the reverse arc of the given
@ -21,9 +21,8 @@ class ArcBackward extends Arc {
* *
* @param originalArc Original forwarc arc corresponding to this backward arc. * @param originalArc Original forwarc arc corresponding to this backward arc.
*/ */
protected ArcBackward(ArcForward originalArc) { protected ArcBackward(Arc originalArc) {
this.originalArc = originalArc; this.originalArc = originalArc;
this.originalArc.getDestination().addSuccessor(this);
} }
@Override @Override
@ -37,7 +36,7 @@ class ArcBackward extends Arc {
} }
@Override @Override
public double getLength() { public float getLength() {
return this.originalArc.getLength(); return this.originalArc.getLength();
} }

7
src/main/org/insa/graph/ArcForward.java
View File

@ -1,6 +1,5 @@
package org.insa.graph; package org.insa.graph;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -21,7 +20,7 @@ class ArcForward extends Arc {
private final RoadInformation info; private final RoadInformation info;
// Segments. // Segments.
private final ArrayList<Point> points; private final List<Point> points;
/** /**
* Create a new ArcForward with the given attributes. * Create a new ArcForward with the given attributes.
@ -33,7 +32,7 @@ class ArcForward extends Arc {
* @param points Points representing this arc. * @param points Points representing this arc.
*/ */
protected ArcForward(Node origin, Node dest, float length, RoadInformation roadInformation, protected ArcForward(Node origin, Node dest, float length, RoadInformation roadInformation,
ArrayList<Point> points) { List<Point> points) {
this.origin = origin; this.origin = origin;
this.destination = dest; this.destination = dest;
this.length = length; this.length = length;
@ -52,7 +51,7 @@ class ArcForward extends Arc {
} }
@Override @Override
public double getLength() { public float getLength() {
return length; return length;
} }