fiplox/dancing_droids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77 Commits 1 Branch 0 Tags 175 KiB
1061282246
Commit Graph

77 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin HART
1061282246 Merge branch 'fix-main' into 'master' 
open_file takes value of arg

See merge request mhart/DancingDroids!17
 2020-10-20 13:08:11 +02:00
Volodymyr Patuta
be2e955f36 open_file takes value of arg 2020-10-20 13:06:08 +02:00
Martin HART
37f8df35ea Merge branch 'flag-handling' into 'master' 
Flag handling

See merge request mhart/DancingDroids!16
 2020-10-20 12:51:20 +02:00
Martin HART
857bd2c091 Add the lib Clap 2.33.3 to dependencies 2020-10-20 12:50:05 +02:00
Martin HART
861001a2e1 Add flags 2020-10-20 12:48:28 +02:00
Martin HART
1bd216c50b Merge branch 'volodymyr-dev' into 'master' 
implement orientation change and instructions to the robot

See merge request mhart/DancingDroids!15
 2020-10-20 12:15:59 +02:00
Volodymyr Patuta
e58313d76c implement orientation change and instructions to the robot 2020-10-20 11:53:53 +02:00
Martin HART
659c79ae04 Merge branch 'fix-main' into 'master' 
error handling in main

See merge request mhart/DancingDroids!14
 2020-10-19 12:52:31 +02:00
Volodymyr Patuta
015a8a33ae error handling in main 2020-10-19 12:50:48 +02:00
Martin HART
ec01c0c1d4 Merge branch 'add-world' into 'master' 
Add world struct

See merge request mhart/DancingDroids!13
 2020-10-19 12:33:08 +02:00
Volodymyr Patuta
22cf314f4d add map 2020-10-19 12:32:14 +02:00
Volodymyr Patuta
b2b00d0d62 added struct World 2020-10-19 12:23:38 +02:00
Martin HART
c95797d4cf Merge branch 'martin-dev' into 'master' 
Add documentation to main.rs

See merge request mhart/DancingDroids!12
 2020-10-18 15:00:53 +02:00
mhart
a55a4935ac Rename conf to raw_conf, conf will be the parsed configuration String 2020-10-17 21:17:36 +02:00
mhart
bd89bfa744 Add Vec<Robot> to store all the robots 2020-10-17 21:05:06 +02:00
mhart
8508c53bef Add documentation to main.rs 2020-10-17 18:16:40 +02:00
Martin HART
5ea2024e31 Merge branch 'robot-struct' into 'master' 
position and robot structs

See merge request mhart/DancingDroids!11
 2020-10-16 13:00:45 +02:00
Volodymyr Patuta
a688c11d4b Changed position to u32 and added ID. 2020-10-16 12:59:40 +02:00
Volodymyr Patuta
918334a3cb position and robot structs 2020-10-16 09:11:28 +02:00
mhart
cff39f9dad Merge branch 'master' of https://framagit.org/paris8-rust/DancingDroids into master 
Sync teacher change
 2020-10-14 22:09:21 +02:00
Angelique Delevingne
888e8904eb Fix d'une erreur dans l'execution donné en exemple. 2020-10-14 22:07:45 +02:00
Viala axel
b470fb6c0d Dual licencing like Rust Apache/mit 2020-10-14 00:06:11 +02:00
mhart
3c1a7f6fe4 Merge branch 'master' of https://framagit.org/paris8-rust/DancingDroids into master 
Sync teacher changes
 2020-10-13 22:18:36 +02:00
Viala axel
0561d43f0e Merge branch 'fix-typo' into 'master' 
Correction d'un typo dans le paragraphe sur les collisions.

See merge request paris8-rust/DancingDroids!9
 2020-10-13 22:13:30 +02:00
Viala axel
19c0465c0f Add licence apache 2020-10-13 22:03:05 +02:00
mhart
4e224acefb Merge branch 'master' of https://framagit.org/paris8-rust/DancingDroids into master 
Sync teacher changes
 2020-10-13 20:34:15 +02:00
Claire
48f6677a98 Correction d'un typo dans le paragraphe sur les collisions. 2020-10-13 18:18:44 +02:00
Axel Viala
0faee29855 Simplification et formatage sur les Instructions. 2020-10-13 17:49:58 +02:00
Viala axel
ba8770d490 Merge branch 'fix-sujet-collisions' into 'master' 
Precision à propos des collisions.

See merge request paris8-rust/DancingDroids!8
 2020-10-13 17:47:17 +02:00
Axel Viala
921eaa6d3f Precision à propos des collisions. 2020-10-13 17:44:56 +02:00
Viala axel
79ae2b6767 Merge branch 'fix-project-name' into 'master' 
Fix name of the project.

See merge request paris8-rust/DancingDroids!6
 2020-10-13 16:19:31 +02:00
Axel Viala
c05b1e355a Fix name of the project. 2020-10-13 16:11:11 +02:00
Martin HART
07fd3cb238 Merge branch 'martin-dev' into 'master' 
Add test to parse_orientation() and parse_instruction()

See merge request mhart/DancingDroids!10
 2020-10-13 12:31:26 +02:00
Volodymyr Patuta
972850310e No need to test file without permission. 2020-10-13 12:27:41 +02:00
Volodymyr Patuta
8c04fe7b9d Added test_open_file() 2020-10-13 12:15:04 +02:00
mhart
1ee584801a Add test to 
parse_orientation()
parse_instruction()
 2020-10-13 12:08:26 +02:00
Martin HART
e3c846eee5 Merge branch 'volodymyr-dev' into 'master' 
func to get file content as Result<String>

See merge request mhart/DancingDroids!9
 2020-10-13 10:49:44 +02:00
Volodymyr Patuta
3106882ddb Update main.rs 2020-10-13 10:31:50 +02:00
Volodymyr Patuta
630e5e05b1 func to get file content as Result<String> 2020-10-13 10:19:34 +02:00
Martin HART
236f9c7ecf Merge branch 'martin-dev' into 'master' 
Merge martin-dev to master

See merge request mhart/DancingDroids!8
 2020-10-12 11:34:00 +02:00
mhart
8c16773fe9 Revert "Change (c : char) in" 
This reverts commit edf29050c6.

Bad optimization...
 2020-10-11 21:45:56 +02:00
mhart
edf29050c6 Change (c : char) in 
parse_orientation()
parse_instruction()
to (c: &char)
 2020-10-11 20:24:35 +02:00
mhart
6e1589ff7d Change Option<> in 
parse_orientation()
parse_instruction()
for Result<Instruction, &'static str>
 2020-10-11 20:10:17 +02:00
mhart
c2d6e3422d Add parse_instruction() 
Same as the parse_orientation() function but for the instruction model
 2020-10-11 18:31:56 +02:00
mhart
c1143ee396 Add parse_orientation() 
This function parse a char and return the matching direction or None
 2020-10-11 18:27:39 +02:00
mhart
dcbc5aa74c correct typo 2020-10-11 18:25:42 +02:00
mhart
699933fcfd Load the 'simple' intruction file into a string. 
Need to incorporate flags OR/AND stdin parsing in a later stage.
 2020-10-11 15:14:20 +02:00
Martin HART
601f195c78 Merge branch 'elias-dev' into 'master' 
Add elias to the authors.

See merge request mhart/DancingDroids!6
 2020-10-11 14:43:46 +02:00
EliasCubz
ed77c3feab pull elias-dev branch before MR 2020-10-11 14:27:47 +02:00
EliasCubz
33f08795c4 pull master before MR 2020-10-11 14:26:59 +02:00