Compare commits

..

No commits in common. "52df139bd81e14b9803c93c91ef6d8e86ff27ac8" and "3bba01976383c95bc4b0f54082a5e03c54b58436" have entirely different histories.

2 changed files with 14 additions and 27 deletions

View file

@ -201,29 +201,20 @@ public class Path {
* @deprecated Need to be implemented.
*/
public boolean isValid() {
boolean valid = isEmpty() || (this.arcs.size() == 0 && this.origin != null);
if (!valid) {
valid = this.arcs.get(0).getOrigin().equals(this.origin);
for (int i = 1; i < 3; i++) {
if (this.arcs.size() > i)
valid = valid && (this.arcs.get(i).getOrigin().equals(this.arcs.get(i-1).getDestination()));
}
}
return valid;
// TODO:
return false;
}
/**
* Compute the length of this path (in meters).
*
* @return Total length of the path (in meters).
*
*
* @deprecated Need to be implemented.
*/
public float getLength() {
float length = 0;
for (Arc a : this.arcs) {
length += a.getLength();
}
return length;
// TODO:
return 0;
}
/**
@ -233,14 +224,12 @@ public class Path {
*
* @return Time (in seconds) required to travel this path at the given speed (in
* kilometers-per-hour).
*
*
* @deprecated Need to be implemented.
*/
public double getTravelTime(double speed) {
float time = 0;
for (Arc a : this.arcs) {
time += a.getTravelTime(speed);
}
return time;
// TODO:
return 0;
}
/**
@ -248,14 +237,12 @@ public class Path {
* on every arc.
*
* @return Minimum travel time to travel this path (in seconds).
*
*
* @deprecated Need to be implemented.
*/
public double getMinimumTravelTime() {
float time = 0;
for (Arc a : this.arcs) {
time += a.getMinimumTravelTime();
}
return time;
// TODO:
return 0;
}
}

BIN
uml.dia Normal file

Binary file not shown.