From 426d118f86858b29488c7ab1efa3fdc2c7255458 Mon Sep 17 00:00:00 2001 From: lee Date: Tue, 18 Jun 2019 16:14:54 +0100 Subject: [PATCH 1/9] fix rot14 hackaton --- subjects/rot14.en.md | 5 +++-- subjects/rot14.fr.md | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/subjects/rot14.en.md b/subjects/rot14.en.md index ca3fe12b4..377ca09bf 100644 --- a/subjects/rot14.en.md +++ b/subjects/rot14.en.md @@ -9,7 +9,7 @@ Write a function `rot14` that returns the string within the parameter but transf ### Expected function ```go -func rot14(str string) string { +func Rot14(str string) string { } ``` @@ -22,11 +22,12 @@ Here is a possible [program](TODO-LINK) to test your function : package main import ( + piscine ".." "github.com/01-edu/z01" ) func main() { - result := rot14("Hello How are You") + result := piscine.Rot14("Hello How are You") arrayRune := []rune(result) for _, s := range arrayRune { diff --git a/subjects/rot14.fr.md b/subjects/rot14.fr.md index ca3fe12b4..377ca09bf 100644 --- a/subjects/rot14.fr.md +++ b/subjects/rot14.fr.md @@ -9,7 +9,7 @@ Write a function `rot14` that returns the string within the parameter but transf ### Expected function ```go -func rot14(str string) string { +func Rot14(str string) string { } ``` @@ -22,11 +22,12 @@ Here is a possible [program](TODO-LINK) to test your function : package main import ( + piscine ".." "github.com/01-edu/z01" ) func main() { - result := rot14("Hello How are You") + result := piscine.Rot14("Hello How are You") arrayRune := []rune(result) for _, s := range arrayRune { From 88b93511e337f0a8f544e826d96b6adbd5c10bb5 Mon Sep 17 00:00:00 2001 From: lee Date: Tue, 18 Jun 2019 16:25:58 +0100 Subject: [PATCH 2/9] fixed abort en and fr --- subjects/abort.en.md | 10 +++++----- subjects/abort.fr.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/subjects/abort.en.md b/subjects/abort.en.md index 5bda1b5cd..fd384f9f0 100644 --- a/subjects/abort.en.md +++ b/subjects/abort.en.md @@ -23,11 +23,11 @@ package main import ( "fmt" - student ".." + piscine ".." ) func main() { - middle := student.Abort(2, 3, 8, 5, 7) + middle := piscine.Abort(2, 3, 8, 5, 7) fmt.Println(middle) } ``` @@ -35,8 +35,8 @@ func main() { And its output : ```console -student@ubuntu:~/student/abort$ go build -student@ubuntu:~/student/abort$ ./abort +student@ubuntu:~/piscine/test$ go build +student@ubuntu:~/piscine/test$ ./abort 5 -student@ubuntu:~/student/abort$ +student@ubuntu:~/piscine/test$ ``` diff --git a/subjects/abort.fr.md b/subjects/abort.fr.md index 5bda1b5cd..fd384f9f0 100644 --- a/subjects/abort.fr.md +++ b/subjects/abort.fr.md @@ -23,11 +23,11 @@ package main import ( "fmt" - student ".." + piscine ".." ) func main() { - middle := student.Abort(2, 3, 8, 5, 7) + middle := piscine.Abort(2, 3, 8, 5, 7) fmt.Println(middle) } ``` @@ -35,8 +35,8 @@ func main() { And its output : ```console -student@ubuntu:~/student/abort$ go build -student@ubuntu:~/student/abort$ ./abort +student@ubuntu:~/piscine/test$ go build +student@ubuntu:~/piscine/test$ ./abort 5 -student@ubuntu:~/student/abort$ +student@ubuntu:~/piscine/test$ ``` From 166dbe3c341c84046e11fcc6bacdf15590fffc70 Mon Sep 17 00:00:00 2001 From: lee Date: Tue, 18 Jun 2019 16:28:31 +0100 Subject: [PATCH 3/9] repeted words --- subjects/abort.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subjects/abort.en.md b/subjects/abort.en.md index fd384f9f0..27907cca2 100644 --- a/subjects/abort.en.md +++ b/subjects/abort.en.md @@ -2,7 +2,7 @@ ### Instructions -Write a function that returns the the value in the middle of 5 five arguments. +Write a function that returns the value in the middle of 5 five arguments. This function must have the following signature. From 3fe258c999f5918c6b750a6cbe511a7874883d25 Mon Sep 17 00:00:00 2001 From: lee Date: Tue, 18 Jun 2019 16:49:37 +0100 Subject: [PATCH 4/9] fixing collatzcountdown en and fr --- subjects/collatzcountdown.en.md | 10 +++++----- subjects/collatzcountdown.fr.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/subjects/collatzcountdown.en.md b/subjects/collatzcountdown.en.md index f717ca360..130553a38 100644 --- a/subjects/collatzcountdown.en.md +++ b/subjects/collatzcountdown.en.md @@ -23,11 +23,11 @@ package main import ( "fmt" - student ".." + piscine ".." ) func main() { - steps := student.CollatzCountdown(12) + steps := piscine.CollatzCountdown(12) fmt.Println(steps) } ``` @@ -35,8 +35,8 @@ func main() { And its output : ```console -student@ubuntu:~/student/collatzcountdown$ go build -student@ubuntu:~/student/collatzcountdown$ ./collatzcountdown +student@ubuntu:~/piscine/test$ go build +student@ubuntu:~/piscine/test$ ./test 10 -student@ubuntu:~/student/collatzcountdown$ +student@ubuntu:~/piscine/test$ ``` diff --git a/subjects/collatzcountdown.fr.md b/subjects/collatzcountdown.fr.md index f717ca360..130553a38 100644 --- a/subjects/collatzcountdown.fr.md +++ b/subjects/collatzcountdown.fr.md @@ -23,11 +23,11 @@ package main import ( "fmt" - student ".." + piscine ".." ) func main() { - steps := student.CollatzCountdown(12) + steps := piscine.CollatzCountdown(12) fmt.Println(steps) } ``` @@ -35,8 +35,8 @@ func main() { And its output : ```console -student@ubuntu:~/student/collatzcountdown$ go build -student@ubuntu:~/student/collatzcountdown$ ./collatzcountdown +student@ubuntu:~/piscine/test$ go build +student@ubuntu:~/piscine/test$ ./test 10 -student@ubuntu:~/student/collatzcountdown$ +student@ubuntu:~/piscine/test$ ``` From 0d476149bae0ee5d63b13669adb68bd0fa1954dc Mon Sep 17 00:00:00 2001 From: Christopher Fremond Date: Tue, 18 Jun 2019 17:10:48 +0100 Subject: [PATCH 5/9] fixes --- subjects/collatzcountdown.en.md | 8 +++----- subjects/collatzcountdown.fr.md | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/subjects/collatzcountdown.en.md b/subjects/collatzcountdown.en.md index f717ca360..7d31f541c 100644 --- a/subjects/collatzcountdown.en.md +++ b/subjects/collatzcountdown.en.md @@ -4,8 +4,6 @@ Write a function, CollatzCountdown, that returns the number of steps to reach 1 using the collatz countdown. -The function must have the following signature. - ### Expected function ```go @@ -35,8 +33,8 @@ func main() { And its output : ```console -student@ubuntu:~/student/collatzcountdown$ go build -student@ubuntu:~/student/collatzcountdown$ ./collatzcountdown +student@ubuntu:~/student/test$ go build +student@ubuntu:~/student/test$ ./test 10 -student@ubuntu:~/student/collatzcountdown$ +student@ubuntu:~/student/test$ ``` diff --git a/subjects/collatzcountdown.fr.md b/subjects/collatzcountdown.fr.md index f717ca360..7d31f541c 100644 --- a/subjects/collatzcountdown.fr.md +++ b/subjects/collatzcountdown.fr.md @@ -4,8 +4,6 @@ Write a function, CollatzCountdown, that returns the number of steps to reach 1 using the collatz countdown. -The function must have the following signature. - ### Expected function ```go @@ -35,8 +33,8 @@ func main() { And its output : ```console -student@ubuntu:~/student/collatzcountdown$ go build -student@ubuntu:~/student/collatzcountdown$ ./collatzcountdown +student@ubuntu:~/student/test$ go build +student@ubuntu:~/student/test$ ./test 10 -student@ubuntu:~/student/collatzcountdown$ +student@ubuntu:~/student/test$ ``` From 6161469fb1e20408994738dbbdcbb6dc2a993ca1 Mon Sep 17 00:00:00 2001 From: Christopher Fremond Date: Tue, 18 Jun 2019 17:11:08 +0100 Subject: [PATCH 6/9] fixes --- subjects/abort.en.md | 2 +- subjects/abort.fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subjects/abort.en.md b/subjects/abort.en.md index 27907cca2..2dd283a09 100644 --- a/subjects/abort.en.md +++ b/subjects/abort.en.md @@ -36,7 +36,7 @@ And its output : ```console student@ubuntu:~/piscine/test$ go build -student@ubuntu:~/piscine/test$ ./abort +student@ubuntu:~/piscine/test$ ./test 5 student@ubuntu:~/piscine/test$ ``` diff --git a/subjects/abort.fr.md b/subjects/abort.fr.md index fd384f9f0..d3b9326f1 100644 --- a/subjects/abort.fr.md +++ b/subjects/abort.fr.md @@ -36,7 +36,7 @@ And its output : ```console student@ubuntu:~/piscine/test$ go build -student@ubuntu:~/piscine/test$ ./abort +student@ubuntu:~/piscine/test$ ./test 5 student@ubuntu:~/piscine/test$ ``` From 2f157a26706a9ddc801786656ebd2d9b3b2e2425 Mon Sep 17 00:00:00 2001 From: Christopher Fremond Date: Tue, 18 Jun 2019 17:13:58 +0100 Subject: [PATCH 7/9] fix3 --- subjects/rot14.en.md | 2 +- subjects/rot14.fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subjects/rot14.en.md b/subjects/rot14.en.md index 377ca09bf..680de92bd 100644 --- a/subjects/rot14.en.md +++ b/subjects/rot14.en.md @@ -1,4 +1,4 @@ -## ROT 14 +## rot14 ### Instructions diff --git a/subjects/rot14.fr.md b/subjects/rot14.fr.md index 377ca09bf..680de92bd 100644 --- a/subjects/rot14.fr.md +++ b/subjects/rot14.fr.md @@ -1,4 +1,4 @@ -## ROT 14 +## rot14 ### Instructions From 7c7c1454302b4ad7fdb3004b6f30801ff9f02425 Mon Sep 17 00:00:00 2001 From: Christopher Fremond <34804391+Frenchris@users.noreply.github.com> Date: Tue, 18 Jun 2019 17:15:55 +0100 Subject: [PATCH 8/9] Update collatzcountdown.en.md --- subjects/collatzcountdown.en.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/subjects/collatzcountdown.en.md b/subjects/collatzcountdown.en.md index de9612108..7f92e3034 100644 --- a/subjects/collatzcountdown.en.md +++ b/subjects/collatzcountdown.en.md @@ -33,15 +33,8 @@ func main() { And its output : ```console -<<<<<<< HEAD -student@ubuntu:~/student/test$ go build -student@ubuntu:~/student/test$ ./test -10 -student@ubuntu:~/student/test$ -======= student@ubuntu:~/piscine/test$ go build student@ubuntu:~/piscine/test$ ./test 10 student@ubuntu:~/piscine/test$ ->>>>>>> 3fe258c999f5918c6b750a6cbe511a7874883d25 ``` From bc98b14f7d4c7f9c64bc67d13eafd5bd0c5d1e73 Mon Sep 17 00:00:00 2001 From: Christopher Fremond Date: Fri, 21 Jun 2019 16:23:02 +0100 Subject: [PATCH 9/9] fixes and translations --- subjects/abort.en.md | 4 +--- subjects/abort.fr.md | 12 +++++------- subjects/collatzcountdown.en.md | 2 +- subjects/collatzcountdown.fr.md | 10 +++++----- subjects/rot14.en.md | 4 ++-- subjects/rot14.fr.md | 12 ++++++------ 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/subjects/abort.en.md b/subjects/abort.en.md index 2dd283a09..c9cfb12f4 100644 --- a/subjects/abort.en.md +++ b/subjects/abort.en.md @@ -2,9 +2,7 @@ ### Instructions -Write a function that returns the value in the middle of 5 five arguments. - -This function must have the following signature. +Write a function that returns the median of 5 five arguments. ### Expected function diff --git a/subjects/abort.fr.md b/subjects/abort.fr.md index d3b9326f1..16951323e 100644 --- a/subjects/abort.fr.md +++ b/subjects/abort.fr.md @@ -2,11 +2,9 @@ ### Instructions -Write a function that returns the the value in the middle of 5 five arguments. +Écrire une fonction qui retournes la médiane de 5 arguments. -This function must have the following signature. - -### Expected function +### Fonction attendue ```go func Abort(a, b, c, d, e int) int { @@ -14,9 +12,9 @@ func Abort(a, b, c, d, e int) int { } ``` -### Usage +### Utilisation -Here is a possible [program](TODO-LINK) to test your function : +Voici un éventuel [programme](TODO-LINK) pour tester votre fonction : ```go package main @@ -32,7 +30,7 @@ func main() { } ``` -And its output : +Et son résultat : ```console student@ubuntu:~/piscine/test$ go build diff --git a/subjects/collatzcountdown.en.md b/subjects/collatzcountdown.en.md index 7f92e3034..02607c56e 100644 --- a/subjects/collatzcountdown.en.md +++ b/subjects/collatzcountdown.en.md @@ -2,7 +2,7 @@ ### Instructions -Write a function, CollatzCountdown, that returns the number of steps to reach 1 using the collatz countdown. +Write a function, `CollatzCountdown`, that returns the number of steps necessary to reach 1 using the collatz countdown. ### Expected function diff --git a/subjects/collatzcountdown.fr.md b/subjects/collatzcountdown.fr.md index 76d4f9af4..9d150d82d 100644 --- a/subjects/collatzcountdown.fr.md +++ b/subjects/collatzcountdown.fr.md @@ -2,9 +2,9 @@ ### Instructions -Write a function, CollatzCountdown, that returns the number of steps to reach 1 using the collatz countdown. +Écrire une fonction, `CollatzCountdown`, qui retournes le nombre d'étapes nécéssaires pour atteindre 1 en utilisant le comptage de collatz. -### Expected function +### FOnction attendue ```go func CollatzCountdown(start int) int { @@ -12,9 +12,9 @@ func CollatzCountdown(start int) int { } ``` -### Usage +### Utilisation -Here is a possible [program](TODO-LINK) to test your function : +Voici un éventuel [programme](TODO-LINK) pour tester votre fonction : ```go package main @@ -30,7 +30,7 @@ func main() { } ``` -And its output : +Et son résultat : ```console student@ubuntu:~/student/test$ go build diff --git a/subjects/rot14.en.md b/subjects/rot14.en.md index 680de92bd..1a185d661 100644 --- a/subjects/rot14.en.md +++ b/subjects/rot14.en.md @@ -2,9 +2,9 @@ ### Instructions -Write a function `rot14` that returns the string within the parameter but transformed into a rot14 string. +Write a function `rot14` that returns the `string` within the parameter transformed into a `rot14 string`. -- If you not certain what we are talking about, there is a rot13 already. +- For more information look what `rot13` stands for. ### Expected function diff --git a/subjects/rot14.fr.md b/subjects/rot14.fr.md index 680de92bd..44f5698e7 100644 --- a/subjects/rot14.fr.md +++ b/subjects/rot14.fr.md @@ -2,11 +2,11 @@ ### Instructions -Write a function `rot14` that returns the string within the parameter but transformed into a rot14 string. +Écrire une fonction `rot14` qui retournes la `string` en paramètre transformée en `string rot14`. -- If you not certain what we are talking about, there is a rot13 already. +- Pour plus d'informations chercher ce que `rot13` signifie. -### Expected function +### Fonction attendue ```go func Rot14(str string) string { @@ -14,9 +14,9 @@ func Rot14(str string) string { } ``` -### Usage +### Utilisation -Here is a possible [program](TODO-LINK) to test your function : +Voici un éventuel [programme](TODO-LINK) pour tester votre fonction : ```go package main @@ -37,7 +37,7 @@ func main() { } ``` -And its output : +Et son résultat : ```console student@ubuntu:~/piscine/test$ go build