diff options
author | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
---|---|---|
committer | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
commit | 0a88716110994f789f764704a96791fdfb5fa288 (patch) | |
tree | 788c16ab578cf76eda358abc1d0587503d413a87 /prolog/problems/clp_r | |
parent | 1a7678b37a25a76aeaef7ebb225f85406b19f928 (diff) | |
parent | 5a01c2bb184152c6ccc3c536e9b857d247bc55ad (diff) |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-problems
Conflicts:
robot/problems/introduction/forward/en.py
robot/problems/introduction/forward/sl.py
Diffstat (limited to 'prolog/problems/clp_r')
-rw-r--r-- | prolog/problems/clp_r/bounding_box_3/common.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/bounding_box_3/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/center_3/common.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/center_3/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/clp_r/linear_opt_3/common.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/linear_opt_3/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/max_sum_2/common.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/max_sum_2/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/megabytes_2/common.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/megabytes_2/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/turkey_3/common.py | 1 | ||||
-rw-r--r-- | prolog/problems/clp_r/turkey_3/en.py | 1 |
13 files changed, 2 insertions, 12 deletions
diff --git a/prolog/problems/clp_r/bounding_box_3/common.py b/prolog/problems/clp_r/bounding_box_3/common.py index dc6b047..94be5ee 100644 --- a/prolog/problems/clp_r/bounding_box_3/common.py +++ b/prolog/problems/clp_r/bounding_box_3/common.py @@ -1,7 +1,6 @@ # coding=utf-8 id = 157 -group = 'clp_r' number = 67 visible = True facts = None diff --git a/prolog/problems/clp_r/bounding_box_3/en.py b/prolog/problems/clp_r/bounding_box_3/en.py index 714f8a4..8c6a9f7 100644 --- a/prolog/problems/clp_r/bounding_box_3/en.py +++ b/prolog/problems/clp_r/bounding_box_3/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 157 name = 'bounding_box/3' slug = 'find the smallest bounding box' diff --git a/prolog/problems/clp_r/center_3/common.py b/prolog/problems/clp_r/center_3/common.py index 340cd7f..5391180 100644 --- a/prolog/problems/clp_r/center_3/common.py +++ b/prolog/problems/clp_r/center_3/common.py @@ -1,7 +1,6 @@ # coding=utf-8 id = 158 -group = 'clp_r' number = 68 visible = True facts = None diff --git a/prolog/problems/clp_r/center_3/en.py b/prolog/problems/clp_r/center_3/en.py index 2c1f882..ae5aeb8 100644 --- a/prolog/problems/clp_r/center_3/en.py +++ b/prolog/problems/clp_r/center_3/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 158 name = 'center/3' slug = 'find central points' diff --git a/prolog/problems/clp_r/common.py b/prolog/problems/clp_r/common.py new file mode 100644 index 0000000..2238250 --- /dev/null +++ b/prolog/problems/clp_r/common.py @@ -0,0 +1,2 @@ +id = 9 +number = 8 diff --git a/prolog/problems/clp_r/linear_opt_3/common.py b/prolog/problems/clp_r/linear_opt_3/common.py index 35f582d..f6e8840 100644 --- a/prolog/problems/clp_r/linear_opt_3/common.py +++ b/prolog/problems/clp_r/linear_opt_3/common.py @@ -1,7 +1,6 @@ # coding=utf-8 id = 159 -group = 'clp_r' number = 63 visible = True facts = None diff --git a/prolog/problems/clp_r/linear_opt_3/en.py b/prolog/problems/clp_r/linear_opt_3/en.py index 58530a9..848a30d 100644 --- a/prolog/problems/clp_r/linear_opt_3/en.py +++ b/prolog/problems/clp_r/linear_opt_3/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 159 name = 'linear_opt/3' slug = 'linear optimization' diff --git a/prolog/problems/clp_r/max_sum_2/common.py b/prolog/problems/clp_r/max_sum_2/common.py index 71c3005..d025090 100644 --- a/prolog/problems/clp_r/max_sum_2/common.py +++ b/prolog/problems/clp_r/max_sum_2/common.py @@ -1,7 +1,6 @@ # coding=utf-8 id = 156 -group = 'clp_r' number = 66 visible = True facts = None diff --git a/prolog/problems/clp_r/max_sum_2/en.py b/prolog/problems/clp_r/max_sum_2/en.py index 6d0c1d2..eeff4cd 100644 --- a/prolog/problems/clp_r/max_sum_2/en.py +++ b/prolog/problems/clp_r/max_sum_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 156 name = 'max_sum/2' slug = 'find maximal adjacent elements' diff --git a/prolog/problems/clp_r/megabytes_2/common.py b/prolog/problems/clp_r/megabytes_2/common.py index aefab2d..1f5bdd5 100644 --- a/prolog/problems/clp_r/megabytes_2/common.py +++ b/prolog/problems/clp_r/megabytes_2/common.py @@ -1,7 +1,6 @@ # coding=utf-8 id = 160 -group = 'clp_r' number = 65 visible = True facts = None diff --git a/prolog/problems/clp_r/megabytes_2/en.py b/prolog/problems/clp_r/megabytes_2/en.py index cb355f1..01fdfff 100644 --- a/prolog/problems/clp_r/megabytes_2/en.py +++ b/prolog/problems/clp_r/megabytes_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 160 name = 'megabytes/2' slug = 'convert mebibytes to megabytes' diff --git a/prolog/problems/clp_r/turkey_3/common.py b/prolog/problems/clp_r/turkey_3/common.py index 42f4119..b7bc7f4 100644 --- a/prolog/problems/clp_r/turkey_3/common.py +++ b/prolog/problems/clp_r/turkey_3/common.py @@ -1,7 +1,6 @@ # coding=utf-8 id = 161 -group = 'clp_r' number = 64 visible = True facts = None diff --git a/prolog/problems/clp_r/turkey_3/en.py b/prolog/problems/clp_r/turkey_3/en.py index b6e1d55..979033d 100644 --- a/prolog/problems/clp_r/turkey_3/en.py +++ b/prolog/problems/clp_r/turkey_3/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 161 name = 'turkey/3' slug = 'turkey feed' |