Paris7/Pathfinder
Archived
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix methods in ScheduleFormat and NetworkFormat

Browse source
This commit is contained in:
MAMBILA TETE jean philipp 2024-03-18 16:59:27 +01:00
parent 1c291b3142
commit a70ac82141
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/fr/u_paris/gla/project/io/NetworkFormat.java
View file

@ -33,10 +33,10 @@ public final class NetworkFormat {
private static final DateTimeFormatter DURATION_FORMATTER = DateTimeFormatter private static final DateTimeFormatter DURATION_FORMATTER = DateTimeFormatter
.ofPattern("HH:mm:ss"); .ofPattern("HH:mm:ss");
private static final NumberFormat DURATION_SECONDS_FORMATTER = NumberFormat private static final NumberFormat DURATION_INDIVIDUAL_FORMATTER = NumberFormat
.getIntegerInstance(Locale.ENGLISH); .getIntegerInstance(Locale.ENGLISH);
static { static {
DURATION_SECONDS_FORMATTER.setMinimumIntegerDigits(2); DURATION_INDIVIDUAL_FORMATTER.setMinimumIntegerDigits(2);
} }
private static final Temporal ZERO = LocalTime.parse("00:00:00"); private static final Temporal ZERO = LocalTime.parse("00:00:00");
@ -51,8 +51,8 @@ public final class NetworkFormat {
} }
public static String formatDuration(Duration duration) { public static String formatDuration(Duration duration) {
return Long.toString(duration.toMinutes()) + ":" return DURATION_INDIVIDUAL_FORMATTER.format(duration.toMinutes()) + ":"
+ DURATION_SECONDS_FORMATTER.format(duration.toSecondsPart()); + DURATION_INDIVIDUAL_FORMATTER.format(duration.toSecondsPart());
} }
/** Get a formatter for the numbers in a GPS coordinate pair /** Get a formatter for the numbers in a GPS coordinate pair

10
src/main/java/fr/u_paris/gla/project/io/ScheduleFormat.java
View file

@ -5,6 +5,7 @@ package fr.u_paris.gla.project.io;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.ResolverStyle; import java.time.format.ResolverStyle;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -32,10 +33,13 @@ public final class ScheduleFormat {
* @return the sequence of branching * @return the sequence of branching
*/ */
public static List<Integer> getTripSequence(String representation) { public static List<Integer> getTripSequence(String representation) {
// TODO Read a trip sequence from a string
throw new RuntimeException("Not implemented yet"); List<Integer> l = new ArrayList<>();
} for(String s : representation.split(","))
l.add(Integer.parseInt(s));
return l;
}
public static DateTimeFormatter getTimeFormatter() { public static DateTimeFormatter getTimeFormatter() {
return DateTimeFormatter.ofPattern("HH:mm").withResolverStyle(ResolverStyle.LENIENT); return DateTimeFormatter.ofPattern("HH:mm").withResolverStyle(ResolverStyle.LENIENT);

4
src/test/java/fr/u_paris/gla/project/io/ScheduleFormatTest.java
View file

@ -13,8 +13,8 @@ import static org.junit.jupiter.api.Assertions.*;
class ScheduleFormatTest { class ScheduleFormatTest {
@Test @Test
void getTripSequence() { public void getTripSequence() {
String rpz = "4, 5, 19, 21"; String rpz = "4,5,19,21";
List<Integer> test = Arrays.asList(4, 5, 19, 21); List<Integer> test = Arrays.asList(4, 5, 19, 21);
assertEquals(test, ScheduleFormat.getTripSequence(rpz)); assertEquals(test, ScheduleFormat.getTripSequence(rpz));