diff options
author | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2016-03-17 14:19:45 +0100 |
---|---|---|
committer | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2016-03-17 14:19:45 +0100 |
commit | cf4e59c9d6bce337514fc7d77120baced0d6d7bc (patch) | |
tree | 33f7cd7d3ae9595ad548427f3a718f5918935e53 | |
parent | a9416de1d2bde1b2327928717d00d262160912af (diff) |
Prolog: split lists exercises into two groups
-rw-r--r-- | prolog/problems/clp_fd/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/clp_r/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/dcg/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/denotational_semantics/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/license_plates/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/lists/sl.py | 1 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/count_3/common.py (renamed from prolog/problems/lists/count_3/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/count_3/en.py (renamed from prolog/problems/lists/count_3/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/count_3/sl.py (renamed from prolog/problems/lists/count_3/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/en.py | 5 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/common.py (renamed from prolog/problems/lists/evenlen_1_+_oddlen_1/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/en.py (renamed from prolog/problems/lists/evenlen_1_+_oddlen_1/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/sl.py (renamed from prolog/problems/lists/evenlen_1_+_oddlen_1/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/len_2/common.py (renamed from prolog/problems/lists/len_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/len_2/en.py (renamed from prolog/problems/lists/len_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/len_2/sl.py (renamed from prolog/problems/lists/len_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/max_2/common.py (renamed from prolog/problems/lists/max_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/max_2/en.py (renamed from prolog/problems/lists/max_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/max_2/sl.py (renamed from prolog/problems/lists/max_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/min_2/common.py (renamed from prolog/problems/lists/min_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/min_2/en.py (renamed from prolog/problems/lists/min_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/min_2/sl.py (renamed from prolog/problems/lists/min_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/palindrome_1/common.py (renamed from prolog/problems/lists/palindrome_1/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/palindrome_1/en.py (renamed from prolog/problems/lists/palindrome_1/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/palindrome_1/sl.py (renamed from prolog/problems/lists/palindrome_1/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/rev_2/common.py (renamed from prolog/problems/lists/rev_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/rev_2/en.py (renamed from prolog/problems/lists/rev_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/rev_2/sl.py (renamed from prolog/problems/lists/rev_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/shiftleft_2/common.py (renamed from prolog/problems/lists/shiftleft_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/shiftleft_2/en.py (renamed from prolog/problems/lists/shiftleft_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/shiftleft_2/sl.py (renamed from prolog/problems/lists/shiftleft_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/shiftright_2/common.py (renamed from prolog/problems/lists/shiftright_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/shiftright_2/en.py (renamed from prolog/problems/lists/shiftright_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/shiftright_2/sl.py (renamed from prolog/problems/lists/shiftright_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/sl.py | 5 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/sublist_2/common.py (renamed from prolog/problems/lists/sublist_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/sublist_2/en.py (renamed from prolog/problems/lists/sublist_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/sublist_2/sl.py (renamed from prolog/problems/lists/sublist_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/sum_2/common.py (renamed from prolog/problems/lists/sum_2/common.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/sum_2/en.py (renamed from prolog/problems/lists/sum_2/en.py) | 0 | ||||
-rw-r--r-- | prolog/problems/lists_advanced/sum_2/sl.py (renamed from prolog/problems/lists/sum_2/sl.py) | 0 | ||||
-rw-r--r-- | prolog/problems/sets/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/sorting/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/trees/common.py | 2 | ||||
-rw-r--r-- | readme.md | 6 |
46 files changed, 26 insertions, 9 deletions
diff --git a/prolog/problems/clp_fd/common.py b/prolog/problems/clp_fd/common.py index 3b1f9cf..f62433e 100644 --- a/prolog/problems/clp_fd/common.py +++ b/prolog/problems/clp_fd/common.py @@ -1,2 +1,2 @@ id = 8 -number = 7 +number = 8 diff --git a/prolog/problems/clp_r/common.py b/prolog/problems/clp_r/common.py index 2238250..7f45af1 100644 --- a/prolog/problems/clp_r/common.py +++ b/prolog/problems/clp_r/common.py @@ -1,2 +1,2 @@ id = 9 -number = 8 +number = 9 diff --git a/prolog/problems/dcg/common.py b/prolog/problems/dcg/common.py index 4992f2d..a55cdef 100644 --- a/prolog/problems/dcg/common.py +++ b/prolog/problems/dcg/common.py @@ -1,2 +1,2 @@ id = 10 -number = 9 +number = 10 diff --git a/prolog/problems/denotational_semantics/common.py b/prolog/problems/denotational_semantics/common.py index e2c420e..86c7532 100644 --- a/prolog/problems/denotational_semantics/common.py +++ b/prolog/problems/denotational_semantics/common.py @@ -1,2 +1,2 @@ id = 11 -number = 10 +number = 11 diff --git a/prolog/problems/license_plates/common.py b/prolog/problems/license_plates/common.py index 3d15487..e35a349 100644 --- a/prolog/problems/license_plates/common.py +++ b/prolog/problems/license_plates/common.py @@ -1,2 +1,2 @@ id = 7 -number = 6 +number = 7 diff --git a/prolog/problems/lists/sl.py b/prolog/problems/lists/sl.py index 0c8dd67..0440a44 100644 --- a/prolog/problems/lists/sl.py +++ b/prolog/problems/lists/sl.py @@ -1,5 +1,4 @@ name = 'Seznami' -description = 'Delo s seznami, poudarek na rekurziji.' description = '''\ <p> <a target="_blank" href="[%@resource intro_sl.html%]">Seznami</a> diff --git a/prolog/problems/lists_advanced/common.py b/prolog/problems/lists_advanced/common.py new file mode 100644 index 0000000..d4e77fa --- /dev/null +++ b/prolog/problems/lists_advanced/common.py @@ -0,0 +1,2 @@ +id = 1000 +number = 3 diff --git a/prolog/problems/lists/count_3/common.py b/prolog/problems/lists_advanced/count_3/common.py index 2953f06..2953f06 100644 --- a/prolog/problems/lists/count_3/common.py +++ b/prolog/problems/lists_advanced/count_3/common.py diff --git a/prolog/problems/lists/count_3/en.py b/prolog/problems/lists_advanced/count_3/en.py index dd13bc0..dd13bc0 100644 --- a/prolog/problems/lists/count_3/en.py +++ b/prolog/problems/lists_advanced/count_3/en.py diff --git a/prolog/problems/lists/count_3/sl.py b/prolog/problems/lists_advanced/count_3/sl.py index 98cd6f8..98cd6f8 100644 --- a/prolog/problems/lists/count_3/sl.py +++ b/prolog/problems/lists_advanced/count_3/sl.py diff --git a/prolog/problems/lists_advanced/en.py b/prolog/problems/lists_advanced/en.py new file mode 100644 index 0000000..e7ab5b1 --- /dev/null +++ b/prolog/problems/lists_advanced/en.py @@ -0,0 +1,5 @@ +name = 'Lists and arithmetic' +description = '''\ +<p> +Lists and arithmetic. +</p>''' diff --git a/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/common.py index 1236551..1236551 100644 --- a/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py +++ b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/common.py diff --git a/prolog/problems/lists/evenlen_1_+_oddlen_1/en.py b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/en.py index a01a41b..a01a41b 100644 --- a/prolog/problems/lists/evenlen_1_+_oddlen_1/en.py +++ b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/en.py diff --git a/prolog/problems/lists/evenlen_1_+_oddlen_1/sl.py b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/sl.py index 4ca44c2..4ca44c2 100644 --- a/prolog/problems/lists/evenlen_1_+_oddlen_1/sl.py +++ b/prolog/problems/lists_advanced/evenlen_1_+_oddlen_1/sl.py diff --git a/prolog/problems/lists/len_2/common.py b/prolog/problems/lists_advanced/len_2/common.py index 93a1faa..93a1faa 100644 --- a/prolog/problems/lists/len_2/common.py +++ b/prolog/problems/lists_advanced/len_2/common.py diff --git a/prolog/problems/lists/len_2/en.py b/prolog/problems/lists_advanced/len_2/en.py index 3ca963e..3ca963e 100644 --- a/prolog/problems/lists/len_2/en.py +++ b/prolog/problems/lists_advanced/len_2/en.py diff --git a/prolog/problems/lists/len_2/sl.py b/prolog/problems/lists_advanced/len_2/sl.py index 0e98272..0e98272 100644 --- a/prolog/problems/lists/len_2/sl.py +++ b/prolog/problems/lists_advanced/len_2/sl.py diff --git a/prolog/problems/lists/max_2/common.py b/prolog/problems/lists_advanced/max_2/common.py index 92cf793..92cf793 100644 --- a/prolog/problems/lists/max_2/common.py +++ b/prolog/problems/lists_advanced/max_2/common.py diff --git a/prolog/problems/lists/max_2/en.py b/prolog/problems/lists_advanced/max_2/en.py index c4bc7e2..c4bc7e2 100644 --- a/prolog/problems/lists/max_2/en.py +++ b/prolog/problems/lists_advanced/max_2/en.py diff --git a/prolog/problems/lists/max_2/sl.py b/prolog/problems/lists_advanced/max_2/sl.py index 7a0d07a..7a0d07a 100644 --- a/prolog/problems/lists/max_2/sl.py +++ b/prolog/problems/lists_advanced/max_2/sl.py diff --git a/prolog/problems/lists/min_2/common.py b/prolog/problems/lists_advanced/min_2/common.py index 213da5a..213da5a 100644 --- a/prolog/problems/lists/min_2/common.py +++ b/prolog/problems/lists_advanced/min_2/common.py diff --git a/prolog/problems/lists/min_2/en.py b/prolog/problems/lists_advanced/min_2/en.py index 18f45a6..18f45a6 100644 --- a/prolog/problems/lists/min_2/en.py +++ b/prolog/problems/lists_advanced/min_2/en.py diff --git a/prolog/problems/lists/min_2/sl.py b/prolog/problems/lists_advanced/min_2/sl.py index 703a05e..703a05e 100644 --- a/prolog/problems/lists/min_2/sl.py +++ b/prolog/problems/lists_advanced/min_2/sl.py diff --git a/prolog/problems/lists/palindrome_1/common.py b/prolog/problems/lists_advanced/palindrome_1/common.py index e9960c6..e9960c6 100644 --- a/prolog/problems/lists/palindrome_1/common.py +++ b/prolog/problems/lists_advanced/palindrome_1/common.py diff --git a/prolog/problems/lists/palindrome_1/en.py b/prolog/problems/lists_advanced/palindrome_1/en.py index 48ee8ac..48ee8ac 100644 --- a/prolog/problems/lists/palindrome_1/en.py +++ b/prolog/problems/lists_advanced/palindrome_1/en.py diff --git a/prolog/problems/lists/palindrome_1/sl.py b/prolog/problems/lists_advanced/palindrome_1/sl.py index ad67d3f..ad67d3f 100644 --- a/prolog/problems/lists/palindrome_1/sl.py +++ b/prolog/problems/lists_advanced/palindrome_1/sl.py diff --git a/prolog/problems/lists/rev_2/common.py b/prolog/problems/lists_advanced/rev_2/common.py index 408389a..408389a 100644 --- a/prolog/problems/lists/rev_2/common.py +++ b/prolog/problems/lists_advanced/rev_2/common.py diff --git a/prolog/problems/lists/rev_2/en.py b/prolog/problems/lists_advanced/rev_2/en.py index 3ae126e..3ae126e 100644 --- a/prolog/problems/lists/rev_2/en.py +++ b/prolog/problems/lists_advanced/rev_2/en.py diff --git a/prolog/problems/lists/rev_2/sl.py b/prolog/problems/lists_advanced/rev_2/sl.py index ab58a1c..ab58a1c 100644 --- a/prolog/problems/lists/rev_2/sl.py +++ b/prolog/problems/lists_advanced/rev_2/sl.py diff --git a/prolog/problems/lists/shiftleft_2/common.py b/prolog/problems/lists_advanced/shiftleft_2/common.py index 13db28f..13db28f 100644 --- a/prolog/problems/lists/shiftleft_2/common.py +++ b/prolog/problems/lists_advanced/shiftleft_2/common.py diff --git a/prolog/problems/lists/shiftleft_2/en.py b/prolog/problems/lists_advanced/shiftleft_2/en.py index a8dd5f0..a8dd5f0 100644 --- a/prolog/problems/lists/shiftleft_2/en.py +++ b/prolog/problems/lists_advanced/shiftleft_2/en.py diff --git a/prolog/problems/lists/shiftleft_2/sl.py b/prolog/problems/lists_advanced/shiftleft_2/sl.py index ae412a6..ae412a6 100644 --- a/prolog/problems/lists/shiftleft_2/sl.py +++ b/prolog/problems/lists_advanced/shiftleft_2/sl.py diff --git a/prolog/problems/lists/shiftright_2/common.py b/prolog/problems/lists_advanced/shiftright_2/common.py index d8a4c9f..d8a4c9f 100644 --- a/prolog/problems/lists/shiftright_2/common.py +++ b/prolog/problems/lists_advanced/shiftright_2/common.py diff --git a/prolog/problems/lists/shiftright_2/en.py b/prolog/problems/lists_advanced/shiftright_2/en.py index 63e11cf..63e11cf 100644 --- a/prolog/problems/lists/shiftright_2/en.py +++ b/prolog/problems/lists_advanced/shiftright_2/en.py diff --git a/prolog/problems/lists/shiftright_2/sl.py b/prolog/problems/lists_advanced/shiftright_2/sl.py index 62fca8d..62fca8d 100644 --- a/prolog/problems/lists/shiftright_2/sl.py +++ b/prolog/problems/lists_advanced/shiftright_2/sl.py diff --git a/prolog/problems/lists_advanced/sl.py b/prolog/problems/lists_advanced/sl.py new file mode 100644 index 0000000..51b4838 --- /dev/null +++ b/prolog/problems/lists_advanced/sl.py @@ -0,0 +1,5 @@ +name = 'Seznami in aritmetika' +description = '''\ +<p> +Seznami in aritmetika. +</p>''' diff --git a/prolog/problems/lists/sublist_2/common.py b/prolog/problems/lists_advanced/sublist_2/common.py index 6187ebc..6187ebc 100644 --- a/prolog/problems/lists/sublist_2/common.py +++ b/prolog/problems/lists_advanced/sublist_2/common.py diff --git a/prolog/problems/lists/sublist_2/en.py b/prolog/problems/lists_advanced/sublist_2/en.py index 2697d9b..2697d9b 100644 --- a/prolog/problems/lists/sublist_2/en.py +++ b/prolog/problems/lists_advanced/sublist_2/en.py diff --git a/prolog/problems/lists/sublist_2/sl.py b/prolog/problems/lists_advanced/sublist_2/sl.py index cc42219..cc42219 100644 --- a/prolog/problems/lists/sublist_2/sl.py +++ b/prolog/problems/lists_advanced/sublist_2/sl.py diff --git a/prolog/problems/lists/sum_2/common.py b/prolog/problems/lists_advanced/sum_2/common.py index 000b4b0..000b4b0 100644 --- a/prolog/problems/lists/sum_2/common.py +++ b/prolog/problems/lists_advanced/sum_2/common.py diff --git a/prolog/problems/lists/sum_2/en.py b/prolog/problems/lists_advanced/sum_2/en.py index b4dab45..b4dab45 100644 --- a/prolog/problems/lists/sum_2/en.py +++ b/prolog/problems/lists_advanced/sum_2/en.py diff --git a/prolog/problems/lists/sum_2/sl.py b/prolog/problems/lists_advanced/sum_2/sl.py index cc0423b..cc0423b 100644 --- a/prolog/problems/lists/sum_2/sl.py +++ b/prolog/problems/lists_advanced/sum_2/sl.py diff --git a/prolog/problems/sets/common.py b/prolog/problems/sets/common.py index 104aa9d..b3335ec 100644 --- a/prolog/problems/sets/common.py +++ b/prolog/problems/sets/common.py @@ -1,2 +1,2 @@ id = 5 -number = 4 +number = 5 diff --git a/prolog/problems/sorting/common.py b/prolog/problems/sorting/common.py index f006f10..4e5aa88 100644 --- a/prolog/problems/sorting/common.py +++ b/prolog/problems/sorting/common.py @@ -1,2 +1,2 @@ id = 3 -number = 3 +number = 4 diff --git a/prolog/problems/trees/common.py b/prolog/problems/trees/common.py index a519878..9cf57f5 100644 --- a/prolog/problems/trees/common.py +++ b/prolog/problems/trees/common.py @@ -1,2 +1,2 @@ id = 6 -number = 5 +number = 6 @@ -23,6 +23,12 @@ the relevant range below: Python: 20000-29999 Robot: 30000-39999 +Problem group IDs should be chosen from the range: + + Prolog: 1000-1999 + Python: 2000-2999 + Robot: 3000-3999 + Running `scripts/build\_web\_resources.py` in the codeq-server repo will generate JSON files for all problems, and insert new problems, groups and languages in the database. |