fixed hw6 tests

Spr24/HW/Homework6/q1_1.expected

@@ -2,6 +2,10 @@ true.
 
 true.
 
+true.
+
+false.
+
 
 false.
 

Spr24/HW/Homework6/q1_1.in

@@ -3,4 +3,6 @@ set_prolog_flag(answer_write_options, [quoted(true), portray(true), max_depth(0)
 print("===TEST START===").
 
 once(bt(5, [bt(7, [])])).
-once(bt(7, [bt(5, [])])).
+once(bt(5, [bt(6, [bt(7, [])]), bt(8, [])])).
+once(bt(7, [bt(5, [])])).
+once(bt(5, [bt(8, []), bt(6, [bt(7, [])])])).

Spr24/HW/Homework6/q1_3.expected

@@ -1,10 +1,10 @@
 true.
 
-L = [[[empty, bt(4, [bt(5, [])])]]].
+L = [[[4, 5]]].
 
-L = [[[empty, empty, bt(3, [bt(4, [bt(5, [])]), bt(2, [])])]]].
+L = [[[2, 3, 4, 5]]].
 
 
-L = [[[bt(1, []), empty, bt(3, [bt(4, [bt(5, [])]), bt(2, [])])]]].
+L = [[[1, 2, 3, 4, 5]]].
 
 

Spr24/HW/Homework6/q1_3.in

@@ -1,29 +1,64 @@
 use_module(library(yall)).
 set_prolog_flag(answer_write_options, [quoted(true), portray(true), max_depth(0), spacing(next_argument)]).
+
+assert(is_heap([]) :- !).
+assert((is_heap(X) :- is_heap_aux(X, 0), length(X, L), \+ nth1(L, X, empty))).
+assert(is_heap_aux([], _) :- !).
+assert((is_heap_aux([empty | Xs], I) :-
+    !, NI is I + 1,
+    is_heap_aux(Xs, NI))).
+assert((is_heap_aux([bt(V, L) | Xs], I) :-
+    bt(V, L),
+    length(L, I),
+    NI is I + 1,
+    is_heap_aux(Xs, NI))).
+
+assert(values([], [])).
+assert(values([empty | Xs], Ys) :-
+    values(Xs, Ys)).
+assert((values([bt(V, L) | Xs], Ys) :-
+    values(L, LV),
+    values(Xs, XsV),
+    append([V | LV], XsV, Ys))).
 print("===TEST START===").
 
 {L}/(
     findall(
-        [X],
-        add_bt(bt(5, []), [bt(4, [])], X),
+        [Z],
+        (
+            add_bt(bt(5, []), [bt(4, [])], X),
+            is_heap(X),
+            values(X, Y),
+            msort(Y, Z)
+        ),
         L1
     ),
     msort(L1, L)
 ).
 
 {L}/(
     findall(
-        [X],
-        add_bt(bt(3, [bt(2, [])]), [empty, bt(4, [bt(5, [])])], X),
+        [Z],
+        (
+            add_bt(bt(2, [bt(3, [])]), [empty, bt(4, [bt(5, [])])], X),
+            is_heap(X),
+            values(X, Y),
+            msort(Y, Z)
+        ),
         L1
     ),
     msort(L1, L)
 ).
 
 {L}/(
     findall(
-        [X],
-        add_bt(bt(1, []), [empty, empty, bt(3,[bt(4,[bt(5,[])]), bt(2,[])])], X),
+        [Z],
+        (
+            add_bt(bt(1, []), [empty, empty, bt(2,[bt(4,[bt(5,[])]), bt(3,[])])], X),
+            is_heap(X),
+            values(X, Y),
+            msort(Y, Z)
+        ),
         L1
     ),
     msort(L1, L)

Spr24/HW/Homework6/q1_4.expected

@@ -1,8 +1,8 @@
 true.
 
-L = [[[empty, bt(3, [bt(4, [])])]]].
+L = [[[3, 4]]].
 
 
-L = [[[bt(10, []), bt(3, [bt(4, [])])]]].
+L = [[[3, 4, 10]]].
 
 

Spr24/HW/Homework6/q1_4.in

@@ -1,20 +1,50 @@
 use_module(library(yall)).
 set_prolog_flag(answer_write_options, [quoted(true), portray(true), max_depth(0), spacing(next_argument)]).
+
+assert(is_heap([]) :- !).
+assert((is_heap(X) :- is_heap_aux(X, 0), length(X, L), \+ nth1(L, X, empty))).
+assert(is_heap_aux([], _) :- !).
+assert((is_heap_aux([empty | Xs], I) :-
+    !, NI is I + 1,
+    is_heap_aux(Xs, NI))).
+assert((is_heap_aux([bt(V, L) | Xs], I) :-
+    bt(V, L),
+    length(L, I),
+    NI is I + 1,
+    is_heap_aux(Xs, NI))).
+
+assert(values([], [])).
+assert(values([empty | Xs], Ys) :-
+    values(Xs, Ys)).
+assert((values([bt(V, L) | Xs], Ys) :-
+    values(L, LV),
+    values(Xs, XsV),
+    append([V | LV], XsV, Ys))).
 print("===TEST START===").
 
 {L}/(
     findall(
-        [X],
-        add(3, [bt(4, [])], X),
+        [Z],
+        (
+            add(3, [bt(4, [])], X),
+            is_heap(X),
+            values(X, Y),
+            msort(Y, Z)
+        ),
         L1
     ),
     msort(L1, L)
 ).
 
 {L}/(
     findall(
-        [X],
-        add(10, [empty, bt(3, [bt(4, [])])], X),
+        [Z],
+        (
+            add(10, [empty, bt(3, [bt(4, [])])], X),
+            is_heap(X),
+            values(X, Y),
+            msort(Y, Z)
+        ),
         L1
     ),
     msort(L1, L)

Spr24/HW/Homework6/q1_5.expected

@@ -1,6 +1,6 @@
 true.
 
-L = [[3, [bt(4, [])]]].
+L = [[3, [4]]].
 
 
 L = [[4, []]].

Spr24/HW/Homework6/q1_5.in

@@ -1,20 +1,50 @@
 use_module(library(yall)).
 set_prolog_flag(answer_write_options, [quoted(true), portray(true), max_depth(0), spacing(next_argument)]).
+
+assert(is_heap([]) :- !).
+assert((is_heap(X) :- is_heap_aux(X, 0), length(X, L), \+ nth1(L, X, empty))).
+assert(is_heap_aux([], _) :- !).
+assert((is_heap_aux([empty | Xs], I) :-
+    !, NI is I + 1,
+    is_heap_aux(Xs, NI))).
+assert((is_heap_aux([bt(V, L) | Xs], I) :-
+    bt(V, L),
+    length(L, I),
+    NI is I + 1,
+    is_heap_aux(Xs, NI))).
+
+assert(values([], [])).
+assert(values([empty | Xs], Ys) :-
+    values(Xs, Ys)).
+assert((values([bt(V, L) | Xs], Ys) :-
+    values(L, LV),
+    values(Xs, XsV),
+    append([V | LV], XsV, Ys))).
 print("===TEST START===").
 
 {L}/(
     findall(
-        [X, Y],
-        fetch_min(X, [empty, bt(3, [bt(4, [])])], Y),
+        [X, Z],
+        (
+            fetch_min(X, [empty, bt(3, [bt(4, [])])], Y),
+            is_heap(Y),
+            values(Y, YY),
+            msort(YY, Z)
+        ),
         L1
     ),
     msort(L1, L)
 ).
 
 {L}/(
     findall(
-        [X, Y],
-        fetch_min(X, [bt(4, [])], Y),
+        [X, Z],
+        (
+            fetch_min(X, [bt(4, [])], Y),
+            is_heap(Y),
+            values(Y, YY),
+            msort(YY, Z)
+        ),
         L1
     ),
     msort(L1, L)