Commit graph

117 commits

Author SHA1 Message Date
110e81eb8c
fix test 2024-04-29 17:51:02 +02:00
1a169f9368
[chore] contributing informations about conventions 2024-04-29 17:51:01 +02:00
27a34f390e
[format] use google codestyle 2024-04-29 17:51:01 +02:00
MAMBILA TETE jean philipp
db471f41d1 Merge branch 'gui-fix-itinerary' into 'dev'
[feat] Fix GUI

See merge request gla-groupe-3/projet!17
2024-04-29 17:48:50 +02:00
MAMBILA TETE jean philipp
70ad25019b [feat] itinerary works and table display, no more jform 2024-04-29 17:44:07 +02:00
MAMBILA TETE jean philipp
ce69a218e3 [feat] itinerary works and table display, no more jform 2024-04-29 17:39:55 +02:00
HU helene
541d5a2542 remove main from IDFMNetworkExtractor 2024-04-29 17:35:37 +02:00
HU helene
8b6c78ca75 remove main from parse 2024-04-29 17:31:17 +02:00
AngeHerman
2dd7abcc0c Vitesse des transports adaptée 2024-04-29 17:13:17 +02:00
Lucas
f77c105ff9 Fix test error, delete files after creation 2024-04-28 17:13:08 +02:00
4173380834 Merge branch 'fix/jacoco' into 'dev'
fix: jacoco

See merge request gla-groupe-3/projet!14
2024-04-28 15:41:18 +02:00
RODRIGUEZ lucas
0a95f54fb0 Merge branch 'gui' into 'dev'
branche GUI (Stops)

See merge request gla-groupe-3/projet!15
2024-04-28 15:37:10 +02:00
RODRIGUEZ lucas
9b9cb38d35 Merge branch 'dev' into 'gui'
# Conflicts:
#   src/main/java/fr/u_paris/gla/project/itinerary/Connection.java
#   src/main/java/fr/u_paris/gla/project/itinerary/Finder.java
#   src/main/java/fr/u_paris/gla/project/itinerary/ItineraryCalculator.java
#   src/main/java/fr/u_paris/gla/project/itinerary/Stop.java
#   src/main/java/fr/u_paris/gla/project/utils/CSVTools.java
2024-04-28 15:36:43 +02:00
AngeHerman
ac06353b9d CSV files added 2024-04-28 14:07:18 +02:00
Francois
5fbc584fab Renvoie de Path pour le finder. 2024-04-28 13:55:50 +02:00
MAMBILA TETE jean philipp
c308356549 [feat] jtable display fix and listener 2024-04-25 23:51:55 +02:00
MAMBILA TETE jean philipp
49bc9a038c [chore] jtable not displayed correctly 2024-04-23 21:13:30 +02:00
HU helene
a8357ef564 javadoc 2024-04-23 21:06:27 +02:00
cb491fbe1d
fix: jacoco 2024-04-23 20:57:27 +02:00
RODRIGUEZ lucas
bfa2f14c0b Merge branch 'idf-mobilite-net' into 'dev'
[feat] Merge project

See merge request gla-groupe-3/projet!13
2024-04-23 20:43:27 +02:00
RODRIGUEZ lucas
734885524b Merge branch 'dev' into 'idf-mobilite-net'
# Conflicts:
#   README.md
#   pom.xml
2024-04-23 20:38:40 +02:00
119912a487
builFiles images 2024-04-23 20:35:07 +02:00
fc9c67f235
fix: compilation issues 2024-04-23 20:15:51 +02:00
22bb3a2515
Merge branch 'astar' into idf-mobilite-net 2024-04-23 01:47:35 +02:00
919df017fa
Merge branch 'javadoc-idfm' into idf-mobilite-net 2024-04-23 01:40:16 +02:00
RODRIGUEZ lucas
d6648f6ca9 Merge branch 'testsClasses' into 'astar'
Merge tests for IDFM package

See merge request gla-groupe-3/projet!10
2024-04-22 17:07:05 +02:00
MAMBILA TETE jean philipp
c073af652f [chore] add missing dependencies 2024-04-22 16:27:26 +02:00
Lucas
9514d5d254 [feat] Result table for stops list WIP 2024-04-22 14:37:57 +02:00
Francois
39c879bca1 Gestion des horaires dans l'algorithme A* 2024-04-17 14:54:28 +02:00
Abdoulbasti
48598bb896 Unit test bug fixed and add some units tests 2024-04-17 11:23:48 +02:00
Francois
37ced08d10 Schedule parser 2024-04-15 17:11:35 +02:00
RODRIGUEZ lucas
5d2214ac23 Merge branch 'openstreetmap-gps' into 'idf-mobilite-net'
[feat] Implement OpenStreetMap API calls

See merge request gla-groupe-3/projet!9
2024-04-15 14:28:42 +02:00
RODRIGUEZ lucas
79c5d18187 Merge branch 'idfm-image' into 'idf-mobilite-net'
[feat] generation of a csv file with line/url couple

See merge request gla-groupe-3/projet!8
2024-04-15 14:28:12 +02:00
Lucas
10b3de6068 Implement OpenStreetMap API call to retrieve the GPS location of any adress 2024-04-15 14:15:58 +02:00
HU helene
318a915b84 #16 Update priority queue 2024-04-15 13:47:53 +02:00
AngeHerman
38f2974bd9 Build csv added 2024-04-12 11:49:51 +02:00
194559041a
private field 2024-04-12 01:18:21 +02:00
ef61b8daff
[feat] generation of a csv file with line/url 2024-04-11 23:03:07 +02:00
HU helene
092ff65355 Merge remote-tracking branch 'origin/idf-mobilite-net' into astar 2024-04-11 14:10:55 +02:00
HU helene
13324d0f74 Merge remote-tracking branch 'origin/idf-mobilite-net' into astar
# Conflicts:
#	src/test/java/fr/u_paris/gla/project/idfm/StopEntryTest.java
2024-04-11 14:07:10 +02:00
Lucas
f528d9f0c0 comment error on test 2024-04-08 14:27:52 +02:00
Lucas
92382857d2 JavaDoc for the graph creation 2024-04-08 14:19:49 +02:00
Lucas
5bac5787df Fix error on IDFM test not compiling 2024-04-08 14:19:49 +02:00
AngeHerman
06d80926e0 Bugs resolved 2024-04-08 14:18:18 +02:00
AngeHerman
ce8a801322 Comments added for java doc 2024-04-08 13:54:28 +02:00
62fd2e8bcd Merge branch 'horraires' into 'idf-mobilite-net'
Schedule data implementation

See merge request gla-groupe-3/projet!7
2024-04-06 10:46:08 +02:00
AngeHerman
5528c359d6 Cleaning 2024-04-06 10:42:39 +02:00
RODRIGUEZ lucas
c81504b8ec Merge branch 'tests-idfm' into 'idf-mobilite-net'
Implemented tests for GPS and CSVTools classes

See merge request gla-groupe-3/projet!2
2024-04-06 10:36:36 +02:00
RODRIGUEZ lucas
fdfefa90d4 Merge branch 'idf-mobilite-net' into 'tests-idfm'
# Conflicts:
#   src/main/java/fr/u_paris/gla/project/utils/CSVTools.java
2024-04-06 10:36:19 +02:00
HU helene
6c678bfa21 Merge branch 'idf-mobilite-net-graph' into 'idf-mobilite-net'
Implementation of the pathfinding algorithm

See merge request gla-groupe-3/projet!6
2024-04-06 10:33:23 +02:00