Compare commits
No commits in common. "9512825678cb119a068d94f8af261d356638dbdd" and "534e0b728e13a532d629312ec48c8c6185679721" have entirely different histories.
9512825678
...
534e0b728e
3 changed files with 4 additions and 10 deletions
1
be-graphes-model/.gitignore
vendored
1
be-graphes-model/.gitignore
vendored
|
|
@ -1,2 +1 @@
|
|||
/target/
|
||||
*.class
|
||||
|
|
|
|||
|
|
@ -201,9 +201,10 @@ public class Path {
|
|||
* @deprecated Need to be implemented.
|
||||
*/
|
||||
public boolean isValid() {
|
||||
for (int i=0; i<arcs.size()-1;i++){
|
||||
for (int i=0; i<arcs.size();i++){
|
||||
if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
|
||||
return false;
|
||||
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
|
@ -234,8 +235,6 @@ public class Path {
|
|||
* kilometers-per-hour).
|
||||
*
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
|
|
@ -243,7 +242,6 @@ public class Path {
|
|||
*
|
||||
>>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
|
||||
>>>>>>> 661162456a46270c315c09521ce09f85f0020150
|
||||
>>>>>>> 534e0b728e13a532d629312ec48c8c6185679721
|
||||
*/
|
||||
public double getTravelTime(double speed) {
|
||||
double TotalTime = 0;
|
||||
|
|
@ -262,11 +260,8 @@ public class Path {
|
|||
* @deprecated Need to be implemented.
|
||||
*/
|
||||
public double getMinimumTravelTime() {
|
||||
double minTime = 0;
|
||||
for (Arc a : arcs){
|
||||
minTime += a.getMinimumTravelTime();
|
||||
}
|
||||
return minTime;
|
||||
// TODO:
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in a new issue