Prolog: reorder lists_advanced exercises

11 files changed, 14 insertions, 14 deletions

diff --git a/prolog/problems/lists_advanced/count_3/common.py b/prolog/problems/lists_advanced/count_3/common.py
index 2785d78..7d66d6b 100644
--- a/prolog/problems/lists_advanced/count_3/common.py
+++ b/prolog/problems/lists_advanced/count_3/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 120
-number = 27
+number = 110
 visible = False
 facts = None
 
diff --git a/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/common.py b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/common.py
index 3b997dd..3329080 100644
--- a/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/common.py
+++ b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 116
-number = 23
+number = 50
 visible = True
 facts = None
 
diff --git a/prolog/problems/lists_advanced/len_2/common.py b/prolog/problems/lists_advanced/len_2/common.py
index 6caea98..fe3e364 100644
--- a/prolog/problems/lists_advanced/len_2/common.py
+++ b/prolog/problems/lists_advanced/len_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 119
-number = 26
+number = 60
 visible = True
 facts = None
 
diff --git a/prolog/problems/lists_advanced/max_2/common.py b/prolog/problems/lists_advanced/max_2/common.py
index 35fe299..4985d09 100644
--- a/prolog/problems/lists_advanced/max_2/common.py
+++ b/prolog/problems/lists_advanced/max_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 109
-number = 16
+number = 90
 visible = True
 facts = None
 
diff --git a/prolog/problems/lists_advanced/min_2/common.py b/prolog/problems/lists_advanced/min_2/common.py
index c9a697c..23952cd 100644
--- a/prolog/problems/lists_advanced/min_2/common.py
+++ b/prolog/problems/lists_advanced/min_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 108
-number = 15
+number = 80
 visible = True
 facts = None
 
diff --git a/prolog/problems/lists_advanced/palindrome_1/common.py b/prolog/problems/lists_advanced/palindrome_1/common.py
index f1baf4e..bbd28fb 100644
--- a/prolog/problems/lists_advanced/palindrome_1/common.py
+++ b/prolog/problems/lists_advanced/palindrome_1/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 112
-number = 19
+number = 40
 visible = True
 facts = None
 
@@ -94,7 +94,7 @@ def hint(code, aux_code):
         if prolog.engine.ask_truthTO(engine_id, 'palindrome(kokos(1))'):
             return [{'id': 'arbitrary_base_case'}]
 
-        if any(t.val == 'last' for t in tokens):
+        if any(t.val in ('last', 'last_elem') for t in tokens):
             return [{'id': 'last_used'}]
 
         # target predicate seems to always be false
diff --git a/prolog/problems/lists_advanced/rev_2/common.py b/prolog/problems/lists_advanced/rev_2/common.py
index ee8c9ac..b673660 100644
--- a/prolog/problems/lists_advanced/rev_2/common.py
+++ b/prolog/problems/lists_advanced/rev_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 111
-number = 18
+number = 30
 visible = True
 facts = None
 
@@ -91,7 +91,7 @@ def hint(code, aux_code):
                 retract(rev([brix, cob], [[cob, brix] | yowza]))'''):
             return [{'id': 'forcing_result_onto_recursion'}]
 
-        if any(t.val in ('last', 'shiftleft', 'shiftright') for t in tokens):
+        if any(t.val in ('last', 'last_elem', 'shiftleft', 'shiftright') for t in tokens):
             return [{'id': 'using_other_solutions'}]
 
         if prolog.engine.ask_truthTO(engine_id, 'rev([qa, qb, qc, qd], [qa, qb, qc, qd])'):
diff --git a/prolog/problems/lists_advanced/shiftleft_2/common.py b/prolog/problems/lists_advanced/shiftleft_2/common.py
index 2225bdd..c3ad3b3 100644
--- a/prolog/problems/lists_advanced/shiftleft_2/common.py
+++ b/prolog/problems/lists_advanced/shiftleft_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 113
-number = 20
+number = 10
 visible = True
 facts = None
 
diff --git a/prolog/problems/lists_advanced/shiftright_2/common.py b/prolog/problems/lists_advanced/shiftright_2/common.py
index b945440..fbe1b1c 100644
--- a/prolog/problems/lists_advanced/shiftright_2/common.py
+++ b/prolog/problems/lists_advanced/shiftright_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 114
-number = 21
+number = 20
 visible = True
 facts = None
 
@@ -94,7 +94,7 @@ def hint(code, aux_code):
             return [{'id': 'shiftleftish_solution'}]
 
         # last/2 used
-        if any(t.val == 'last' for t in tokens):
+        if any(t.val in ('last', 'last_elem') for t in tokens):
             return [{'id': 'last_used'}]
 
         # target predicate seems to always be false
diff --git a/prolog/problems/lists_advanced/sublist_2/common.py b/prolog/problems/lists_advanced/sublist_2/common.py
index 78a4ceb..664445a 100644
--- a/prolog/problems/lists_advanced/sublist_2/common.py
+++ b/prolog/problems/lists_advanced/sublist_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 117
-number = 24
+number = 100
 visible = True
 facts = None
 
diff --git a/prolog/problems/lists_advanced/sum_2/common.py b/prolog/problems/lists_advanced/sum_2/common.py
index a56709a..5b98963 100644
--- a/prolog/problems/lists_advanced/sum_2/common.py
+++ b/prolog/problems/lists_advanced/sum_2/common.py
@@ -6,7 +6,7 @@ import prolog.util
 from server.hints import Hint, HintPopup
 
 id = 118
-number = 25
+number = 70
 visible = True
 facts = None