diff options
| author | Martin <martin@leo.fri1.uni-lj.si> | 2015-10-09 11:19:53 +0200 |
|---|---|---|
| committer | Martin <martin@leo.fri1.uni-lj.si> | 2015-10-09 11:19:53 +0200 |
| commit | fd31d7d74e58796f3a5a7c84b4b19cb4af59ef4c (patch) | |
| tree | a1bbe33960a7cb59d9f370c9127e02a96f3d2005 /prolog/problems/clp_r | |
| parent | 84f3426c937d1bb9d44ba25a71706416fbb8b85d (diff) | |
| parent | 7e918d834296e206aef922ee02d6991722c4653e (diff) | |
Merge branch 'master' of 192.168.15.97:codeq-problems
Conflicts:
python/problems/while_and_if/checking_account/en.py
python/problems/while_and_if/consumers_anonymous/en.py
Diffstat (limited to 'prolog/problems/clp_r')
| -rw-r--r-- | prolog/problems/clp_r/bounding_box_3/en.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/en.py | 1 | ||||
| -rw-r--r-- | prolog/problems/clp_r/max_sum_2/en.py | 1 | ||||
| -rw-r--r-- | prolog/problems/clp_r/megabytes_2/en.py | 1 | ||||
| -rw-r--r-- | prolog/problems/clp_r/turkey_3/en.py | 1 |
7 files changed, 2 insertions, 6 deletions
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/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/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/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/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/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' |