readme sortedlistmerge from quest 11

subjects/sortedlistmerge.en.md

@@ -2,7 +2,7 @@
 
 ### Instructions
 
-Write a function `SortedListMerge` that mereges two lists, `l1` and `l2`, but it as to join them in ascending order.
+Write a function `SortedListMerge` that mereges two lists, `n1` and `n2`, but it as to join them in ascending order.
 
 - Tip each list as to be already sorted.
 
@@ -11,12 +11,7 @@ Write a function `SortedListMerge` that mereges two lists, `l1` and `l2`, but it
 ### Expected function and structure
 
 ```go
-type node struct {
+func SortedListMerge(n1 *Nodee, n2 *Nodee) *Nodee {
-	data interface{}
-	next *node
-}
-
-func SortedListMerge(l1 *node, l2 *node) *node {
 
 }
 ```
@@ -30,35 +25,51 @@ package main
 
 import (
 	"fmt"
+
 	piscine ".."
 )
 
-func PrintList(l *list) {
+type node = piscine.Nodee
-	m := l.head
+type nodes = piscine.Nodee
+
+func PrintList(l *piscine.Nodee) {
+	m := l
 	for m != nil {
-		fmt.Print(m.data, " -> ")
+		fmt.Print(m.Data, " -> ")
-		m = m.next
+		m = m.Next
 	}
-
 	fmt.Print(nil)
 	fmt.Println()
 }
 
+func listPushBack(l *piscine.Nodee, data int) *piscine.Nodee {
+	n := &piscine.Nodee{Data: data}
+
+	if l == nil {
+		return n
+	}
+	iterator := l
+	for iterator.Next != nil {
+		iterator = iterator.Next
+	}
+	iterator.Next = n
+	return l
+}
+
 func main() {
-	link := &list{}
+	var link *node
-	link2 := &list{}
+	var link2 *nodes
 
-	piscine.ListPushBack(link, "5")
+	link = listPushBack(link, 5)
-	piscine.ListPushBack(link, "3")
+	link = listPushBack(link, 3)
-	piscine.ListPushBack(link, "7")
+	link = listPushBack(link, 7)
 
-	piscine.ListPushBack(link2, "1")
+	link2 = listPushBack(link2, -2)
-	piscine.ListPushBack(link2, "-2")
+	link2 = listPushBack(link2, 4)
-	piscine.ListPushBack(link2, "4")
-	piscine.ListPushBack(link2, "6")
 
-	PrintList(SortedListMerge(link, link2))
+	PrintList(piscine.SortedListMerge(link2, link))
 }
+
 ```
 
 And its output :
@@ -66,6 +77,6 @@ And its output :
 ```console
 student@ubuntu:~/piscine/test$ go build
 student@ubuntu:~/piscine/test$ ./test
--2 -> 0 -> 0 -> 1 -> 3 -> 4 -> 5 -> 6 -> 7 -> <nil>
+-2 -> 3 -> 4 -> 5 -> 7 -> <nil>
 student@ubuntu:~/piscine/test$
 ```

subjects/sortedlistmerge.fr.md

@@ -1,44 +1,82 @@
-## countif
+## listpushback
 
 ### Instructions
 
-Écrire une fonction `CountIf` qui retournes le nombre d'éléments d'un tableau de `string` pour lesquels la fonction `f` retourne `true`.
+Write a function `SortedListMerge` that mereges two lists, `n1` and `n2`, but it as to join them in ascending order.
 
-### Fonction attendue
+- Tip each list as to be already sorted.
+
+- Use pointers when ever you can.
+
+### Expected function and structure
 
 ```go
-func CountIf(f func(string) bool, tab []string) int {
+func SortedListMerge(n1 *Nodee, n2 *Nodee) *Nodee {
+
 }
 ```
 
-### Utilisation
+### Usage
 
-Voici un éventuel [programme](TODO-LINK) pour tester votre fonction :
+Here is a possible [program](TODO-LINK) to test your function :
 
 ```go
 package main
 
 import (
 	"fmt"
+
 	piscine ".."
 )
 
+type node = piscine.Nodee
+type nodes = piscine.Nodee
+
+func PrintList(l *piscine.Nodee) {
+	m := l
+	for m != nil {
+		fmt.Print(m.Data, " -> ")
+		m = m.Next
+	}
+	fmt.Print(nil)
+	fmt.Println()
+}
+
+func listPushBack(l *piscine.Nodee, data int) *piscine.Nodee {
+	n := &piscine.Nodee{Data: data}
+
+	if l == nil {
+		return n
+	}
+	iterator := l
+	for iterator.Next != nil {
+		iterator = iterator.Next
+	}
+	iterator.Next = n
+	return l
+}
+
 func main() {
-	tab1 := []string{"Hello", "how", "are", "you"}
+	var link *node
-	tab2 := []string{"This","1", "is", "4", "you"}
+	var link2 *nodes
-	answer1 := piscine.CountIf(piscine.IsNumeric, tab1)
+
-	answer2 := piscine.CountIf(piscine.IsNumeric, tab2)
+	link = listPushBack(link, 5)
-	fmt.Println(answer1)
+	link = listPushBack(link, 3)
-	fmt.Println(answer2)
+	link = listPushBack(link, 7)
+
+	link2 = listPushBack(link2, -2)
+	link2 = listPushBack(link2, 4)
+
+	PrintList(piscine.SortedListMerge(link2, link))
 }
+
 ```
 
-Et son résultat :
+And its output :
 
 ```console
 student@ubuntu:~/piscine/test$ go build
 student@ubuntu:~/piscine/test$ ./test
-0
+-2 -> 3 -> 4 -> 5 -> 7 -> <nil>
-2
 student@ubuntu:~/piscine/test$
 ```