diff --git a/.project b/.project new file mode 100644 index 0000000..454ecbb --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + Be_Graphe + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/be-graphes-algos/.classpath b/be-graphes-algos/.classpath new file mode 100644 index 0000000..5e8a55f --- /dev/null +++ b/be-graphes-algos/.classpath @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/be-graphes-algos/.gitignore b/be-graphes-algos/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/be-graphes-algos/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/be-graphes-algos/.project b/be-graphes-algos/.project new file mode 100644 index 0000000..b6a40d2 --- /dev/null +++ b/be-graphes-algos/.project @@ -0,0 +1,23 @@ + + + be-graphes-algos + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/be-graphes-algos/.settings/org.eclipse.core.resources.prefs b/be-graphes-algos/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f9fe345 --- /dev/null +++ b/be-graphes-algos/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/be-graphes-algos/.settings/org.eclipse.jdt.core.prefs b/be-graphes-algos/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..2f5cc74 --- /dev/null +++ b/be-graphes-algos/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/be-graphes-gui/.classpath b/be-graphes-gui/.classpath new file mode 100644 index 0000000..a5d9509 --- /dev/null +++ b/be-graphes-gui/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/be-graphes-gui/.gitignore b/be-graphes-gui/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/be-graphes-gui/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/be-graphes-gui/.project b/be-graphes-gui/.project new file mode 100644 index 0000000..d58021d --- /dev/null +++ b/be-graphes-gui/.project @@ -0,0 +1,23 @@ + + + be-graphes-gui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/be-graphes-gui/.settings/org.eclipse.core.resources.prefs b/be-graphes-gui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..abdea9a --- /dev/null +++ b/be-graphes-gui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/be-graphes-gui/.settings/org.eclipse.jdt.core.prefs b/be-graphes-gui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..2f5cc74 --- /dev/null +++ b/be-graphes-gui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/be-graphes-model/.classpath b/be-graphes-model/.classpath new file mode 100644 index 0000000..5e8a55f --- /dev/null +++ b/be-graphes-model/.classpath @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/be-graphes-model/.gitignore b/be-graphes-model/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/be-graphes-model/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/be-graphes-model/.project b/be-graphes-model/.project new file mode 100644 index 0000000..eb2ad91 --- /dev/null +++ b/be-graphes-model/.project @@ -0,0 +1,23 @@ + + + be-graphes-model + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/be-graphes-model/.settings/org.eclipse.core.resources.prefs b/be-graphes-model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f9fe345 --- /dev/null +++ b/be-graphes-model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/be-graphes-model/.settings/org.eclipse.jdt.core.prefs b/be-graphes-model/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..2f5cc74 --- /dev/null +++ b/be-graphes-model/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java index 6ebdb73..c78b194 100644 --- a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java +++ b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java @@ -225,11 +225,10 @@ 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) { - // TODO: - return 0; + return speed*3600/(getLength()*1000); } /** diff --git a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class index cf7d34c..93cc4d7 100644 Binary files a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class and b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class differ