root
/
public
mirror of https://github.com/01-edu/public.git
14
27
Fork 0
Code Releases Wiki Activity
Browse Source

Fix list & tree exercises

pull/625/head
⁣ 4 years ago
parent
2ee1dfaf1d
commit
1d747c504a
28 changed files with 85 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      go/tests/func/btreeapplybylevel_test/main.go
  2. 2
      go/tests/func/btreeapplyinorder_test/main.go
  3. 2
      go/tests/func/btreeapplypostorder_test/main.go
  4. 2
      go/tests/func/btreeapplypreorder_test/main.go
  5. 5
      go/tests/func/btreedeletenode_test/main.go
  6. 5
      go/tests/func/btreeinsertdata_test/main.go
  7. 5
      go/tests/func/btreeisbinary_test/main.go
  8. 5
      go/tests/func/btreelevelcount_test/main.go
  9. 5
      go/tests/func/btreemax_test/main.go
  10. 5
      go/tests/func/btreemin_test/main.go
  11. 5
      go/tests/func/btreesearchitem_test/main.go
  12. 5
      go/tests/func/btreetransplant_test/main.go
  13. 24
      go/tests/func/correct/challenge.go
  14. 5
      go/tests/func/listat_test/main.go
  15. 5
      go/tests/func/listclear_test/main.go
  16. 5
      go/tests/func/listfind_test/main.go
  17. 5
      go/tests/func/listforeach_test/main.go
  18. 5
      go/tests/func/listforeachif_test/main.go
  19. 5
      go/tests/func/listlast_test/main.go
  20. 5
      go/tests/func/listmerge_test/main.go
  21. 5
      go/tests/func/listpushback_test/main.go
  22. 5
      go/tests/func/listpushfront_test/main.go
  23. 5
      go/tests/func/listremoveif_test/main.go
  24. 5
      go/tests/func/listreverse_test/main.go
  25. 5
      go/tests/func/listsize_test/main.go
  26. 5
      go/tests/func/listsort_test/main.go
  27. 5
      go/tests/func/sortedlistmerge_test/main.go
  28. 5
      go/tests/func/sortlistinsert_test/main.go

2
go/tests/func/btreeapplybylevel_test/main.go
unescape_control_characters View File

@ -5,7 +5,7 @@ import (
student "student" student "student"
"./correct" "func/correct"
) )
func main() { func main() {

2
go/tests/func/btreeapplyinorder_test/main.go
unescape_control_characters View File

@ -5,7 +5,7 @@ import (
student "student" student "student"
"./correct" "func/correct"
) )
func main() { func main() {

2
go/tests/func/btreeapplypostorder_test/main.go
unescape_control_characters View File

@ -5,7 +5,7 @@ import (
student "student" student "student"
"./correct" "func/correct"
) )
func main() { func main() {

2
go/tests/func/btreeapplypreorder_test/main.go
unescape_control_characters View File

@ -5,7 +5,7 @@ import (
student "student" student "student"
"./correct" "func/correct"
) )
func main() { func main() {

5
go/tests/func/btreedeletenode_test/main.go
unescape_control_characters View File

@ -3,8 +3,9 @@ package main
import ( import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func parentListDelete(root *student.TreeNode) string { func parentListDelete(root *student.TreeNode) string {

5
go/tests/func/btreeinsertdata_test/main.go
unescape_control_characters View File

@ -3,8 +3,9 @@ package main
import ( import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func parentListInsert(root *student.TreeNode) string { func parentListInsert(root *student.TreeNode) string {

5
go/tests/func/btreeisbinary_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func BTreeMinStu(root *student.TreeNode) *student.TreeNode { func BTreeMinStu(root *student.TreeNode) *student.TreeNode {

5
go/tests/func/btreelevelcount_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func errorMessage_level(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode) { func errorMessage_level(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode) {

5
go/tests/func/btreemax_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func errorMessage_max(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode) { func errorMessage_max(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode) {

5
go/tests/func/btreemin_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func errorMessage_min(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode) { func errorMessage_min(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode) {

5
go/tests/func/btreesearchitem_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func errorMessage_search(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode, func errorMessage_search(fn interface{}, root, a *correct.TreeNode, b *student.TreeNode,

5
go/tests/func/btreetransplant_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
func parentListTransp(root *student.TreeNode) string { func parentListTransp(root *student.TreeNode) string {

24
go/tests/func/correct/challenge.go
unescape_control_characters View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/01-edu/z01" "lib"
) )
func FormatTree(root *TreeNode) string { func FormatTree(root *TreeNode) string {
@ -96,15 +96,15 @@ func ChallengeTree(
args2 = append(args2, v) args2 = append(args2, v)
} }
} }
st1 := z01.Monitor(fn1, args1) st1 := lib.Monitor(fn1, args1)
st2 := z01.Monitor(fn2, args2) st2 := lib.Monitor(fn2, args2)
if st1.Stdout != st2.Stdout { if st1.Stdout != st2.Stdout {
z01.Fatalf("%s(\n%s)\n prints %s instead of %s\n", lib.Fatalf("%s(\n%s)\n prints %s instead of %s\n",
name, name,
FormatTree(arg1), FormatTree(arg1),
z01.Format(st2.Stdout), lib.Format(st2.Stdout),
z01.Format(st1.Stdout), lib.Format(st1.Stdout),
) )
} }
} }
@ -137,10 +137,10 @@ func ListToString(n *NodeL) string {
} }
func ConvertIntToInterface(t []int) []interface{} { func ConvertIntToInterface(t []int) []interface{} {
RandLen := z01.RandIntBetween(0, len(t)) RandLen := lib.RandIntBetween(0, len(t))
s := make([]interface{}, RandLen) s := make([]interface{}, RandLen)
for j := 0; j < RandLen; j++ { for j := 0; j < RandLen; j++ {
for i := 0; i < z01.RandIntBetween(1, len(t)); i++ { for i := 0; i < lib.RandIntBetween(1, len(t)); i++ {
s[j] = t[i] s[j] = t[i]
} }
} }
@ -148,10 +148,10 @@ func ConvertIntToInterface(t []int) []interface{} {
} }
func ConvertIntToStringface(t []string) []interface{} { func ConvertIntToStringface(t []string) []interface{} {
RandLen := z01.RandIntBetween(0, len(t)) RandLen := lib.RandIntBetween(0, len(t))
s := make([]interface{}, RandLen) s := make([]interface{}, RandLen)
for j := 0; j < RandLen; j++ { for j := 0; j < RandLen; j++ {
for i := 0; i < z01.RandIntBetween(1, len(t)); i++ { for i := 0; i < lib.RandIntBetween(1, len(t)); i++ {
s[j] = t[i] s[j] = t[i]
} }
} }
@ -170,13 +170,13 @@ func ElementsToTest(table []NodeTest) []NodeTest {
) )
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
val := NodeTest{ val := NodeTest{
Data: ConvertIntToInterface(z01.MultRandInt()), Data: ConvertIntToInterface(lib.MultRandInt()),
} }
table = append(table, val) table = append(table, val)
} }
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
val := NodeTest{ val := NodeTest{
Data: ConvertIntToStringface(z01.MultRandWords()), Data: ConvertIntToStringface(lib.MultRandWords()),
} }
table = append(table, val) table = append(table, val)
} }

5
go/tests/func/listat_test/main.go
unescape_control_characters View File

@ -3,8 +3,9 @@ package main
import ( import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node5 = student.NodeL type Node5 = student.NodeL

5
go/tests/func/listclear_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node4 = student.NodeL type Node4 = student.NodeL

5
go/tests/func/listfind_test/main.go
unescape_control_characters View File

@ -3,8 +3,9 @@ package main
import ( import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node9 = student.NodeL type Node9 = student.NodeL

5
go/tests/func/listforeach_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node7 = student.NodeL type Node7 = student.NodeL

5
go/tests/func/listforeachif_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node8 = student.NodeL type Node8 = student.NodeL

5
go/tests/func/listlast_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node3 = student.NodeL type Node3 = student.NodeL

5
go/tests/func/listmerge_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node11 = student.NodeL type Node11 = student.NodeL

5
go/tests/func/listpushback_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type ListS = correct.List type ListS = correct.List

5
go/tests/func/listpushfront_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type ListSa = correct.List type ListSa = correct.List

5
go/tests/func/listremoveif_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node10 = student.NodeL type Node10 = student.NodeL

5
go/tests/func/listreverse_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node6 = student.NodeL type Node6 = student.NodeL

5
go/tests/func/listsize_test/main.go
unescape_control_characters View File

@ -3,8 +3,9 @@ package main
import ( import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type Node2 = student.NodeL type Node2 = student.NodeL

5
go/tests/func/listsort_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type NodeI12 = student.NodeI type NodeI12 = student.NodeI

5
go/tests/func/sortedlistmerge_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type NodeI13 = student.NodeI type NodeI13 = student.NodeI

5
go/tests/func/sortlistinsert_test/main.go
unescape_control_characters View File

@ -5,8 +5,9 @@ import (
student "student" student "student"
"./correct" "func/correct"
"github.com/01-edu/public/go/lib"
"lib"
) )
type NodeI14 = student.NodeI type NodeI14 = student.NodeI

Write Preview
Loading…
Cancel
Save