|
@@ -1,62 +1,56 @@
|
1
|
1
|
# Graph & Algorithm project — INSA Toulouse
|
|
2
|
+ **[ LEJEUNE Aurelia & R.LACROIX ]**
|
2
|
3
|
|
3
|
|
-## How to start?
|
|
4
|
+## Part 2
|
4
|
5
|
|
5
|
|
-You will not be able to use this repository to save your work, you need to copy / import / fork it to
|
6
|
|
-your favorite Git platform.
|
|
6
|
+- [X] [First UML diagram](answers.md)
|
7
|
7
|
|
8
|
|
-### Importing to [Github](https://github.com), [Bitbucket](https://bitbucket.org) or [Gitlab](https://gitlab.com):
|
|
8
|
+- [X] Path class implementation
|
|
9
|
+ - [X] createFastestPathFromNodes
|
|
10
|
+ - [X] createShortestPathFromNodes
|
|
11
|
+ - [X] isValid
|
|
12
|
+ - [X] getLength
|
|
13
|
+ - [X] getTravelTime
|
|
14
|
+ - [X] getMinimumTravelTime
|
9
|
15
|
|
10
|
|
-You first need to register and then log in to the platform you want. The steps to import the project are detailed below:
|
|
16
|
+## Part 3
|
11
|
17
|
|
12
|
|
-#### Github
|
|
18
|
+- [X] [Second UML diagram](answers.md)
|
13
|
19
|
|
14
|
|
-1. In the upper-right corner of any page, click the **"+"** icon, then click **Import repository**, or go to [https://github.com/new/import](https://github.com/new/import).
|
15
|
|
-2. Paste the following URL in the first input:
|
16
|
|
- [https://gitea.typename.fr/INSA/be-graphes.git](https://gitea.typename.fr/INSA/be-graphes.git)
|
17
|
|
-3. Choose the name you want for the repository.
|
18
|
|
-4. Click *Begin import*.
|
19
|
|
-5. Wait for completion... Done!
|
20
|
|
-
|
21
|
|
-#### Bitbucket
|
22
|
|
-
|
23
|
|
-1. On the left panel of any page, click the **"+"** icon, then **Repository**, and then **Import**, or directly go to [https://bitbucket.org/repo/import](https://bitbucket.org/repo/import).
|
24
|
|
-2. Paste the following URL in the first input (select Git as source if not already selected):
|
25
|
|
- [https://gitea.typename.fr/INSA/be-graphes.git](https://gitea.typename.fr/INSA/be-graphes.git)
|
26
|
|
-3. Choose the name you want for repository, and select Git as the *Version control system*.
|
27
|
|
-4. Click *Import repository*.
|
28
|
|
-5. Wait for completion... Done!
|
29
|
|
-
|
30
|
|
-#### Gitlab
|
31
|
|
-
|
32
|
|
-1. In the upper-right corner of any page, click the **"+"** icon, then **New project**, or directly go to [https://gitlab.com/projects/new](https://gitlab.com/projects/new).
|
33
|
|
-2. Select the **Import project** tab, and then click **Repo by URL** (right-most option).
|
34
|
|
-3. Paste the following URL in the first input:
|
35
|
|
- [https://gitea.typename.fr/INSA/be-graphes.git](https://gitea.typename.fr/INSA/be-graphes.git)
|
36
|
|
-4. Choose the name you want for the repository.
|
37
|
|
-5. Click *Create project*.
|
38
|
|
-6. Wait for completion... Done!
|
39
|
|
-
|
40
|
|
-### Importing to another repository provider *[not recommended]*:
|
41
|
|
-
|
42
|
|
-1. Create a new **empty** repository (no README, no LICENSE) on your provider. Let's assume the URL of your repository is `$URL_REPOSITORY`.
|
43
|
|
-2. Clone this repository somewhere:
|
44
|
|
-
|
45
|
|
- ```bash
|
46
|
|
- git clone https://gitea.typename.fr/INSA/be-graphes.git
|
47
|
|
- ```
|
|
20
|
+- [X] BinaryHeap implementation
|
|
21
|
+ - [X] implemented the remove() method
|
|
22
|
+ - [X] improved the method by using a hashmap
|
48
|
23
|
|
49
|
|
-3. Go inside the newly cloned repository and update the **remote**:
|
50
|
|
-
|
51
|
|
- ```bash
|
52
|
|
- cd be-graphes
|
53
|
|
- git remote set-url origin $URL_REPOSITORY
|
54
|
|
- ```
|
|
24
|
+- [X] Created Label
|
|
25
|
+ - [X] Attributes
|
|
26
|
+ - [X] currNode
|
|
27
|
+ - [X] marked
|
|
28
|
+ - [X] cost
|
|
29
|
+ - [X] father
|
|
30
|
+ - [X] Methods
|
|
31
|
+ - [X] getCost
|
|
32
|
+ - [X] compareTo
|
|
33
|
+
|
|
34
|
+- [X] implemented Dijkstra
|
|
35
|
+ - [X] handling special types of paths (pedestrians, car roads etc)
|
|
36
|
+ - [X] added notifyNodeReached to show reached nodes on map
|
|
37
|
+ - [X] Testings (lots of)
|
|
38
|
+
|
|
39
|
+## Part 4
|
|
40
|
+
|
|
41
|
+- [X] Modified Label
|
|
42
|
+ - [X] included getTotalCost
|
|
43
|
+
|
|
44
|
+- [X] Created LabelStar (inherits from Label)
|
|
45
|
+ - [X] (new) Attributes
|
|
46
|
+ - [X] crowCost
|
|
47
|
+ - [X] Methods
|
|
48
|
+ - [X] getTotalCost
|
|
49
|
+
|
|
50
|
+- [X] Modified Dijkstra (modularity)
|
|
51
|
+
|
|
52
|
+- [X] implemented A-Star
|
|
53
|
+ - [X] built upon Dijkstra with another Label type
|
55
|
54
|
|
56
|
|
-4. Push to your repository:
|
57
|
55
|
|
58
|
|
- ```bash
|
59
|
|
- push -u origin master
|
60
|
|
- ```
|
61
|
|
-
|
62
|
|
-Another way is to do a bare clone and then mirror it to your repository: [https://help.github.com/articles/importing-a-git-repository-using-the-command-line/](https://help.github.com/articles/importing-a-git-repository-using-the-command-line/)
|
|
56
|
+- [X] More and More testing (see the video).
|