summaryrefslogtreecommitdiff
path: root/python/problems/functions
diff options
context:
space:
mode:
authorMartin <martin@leo.fri1.uni-lj.si>2015-10-12 13:07:22 +0200
committerMartin <martin@leo.fri1.uni-lj.si>2015-10-12 13:07:22 +0200
commit26eaa78c27d408e41807fe9cde9e371728e60ff9 (patch)
treee9ab6053f03cb88cf5175559b8cb620622e0a5dd /python/problems/functions
parentfbe617ad061df25775c3e3ade00993a9090c9ef2 (diff)
parent6e281624b9a0ae29f1f1862f9d581b219ba3b95a (diff)
Merge branch 'master' of 192.168.15.97:codeq-problems
Diffstat (limited to 'python/problems/functions')
-rw-r--r--python/problems/functions/assign_numbers/common.py1
-rw-r--r--python/problems/functions/body_mass_index/common.py1
-rw-r--r--python/problems/functions/body_mass_index_2/common.py3
-rw-r--r--python/problems/functions/body_mass_index_2/en.py1
-rw-r--r--python/problems/functions/body_mass_index_2/sl.py3
-rw-r--r--python/problems/functions/divisors/common.py1
-rw-r--r--python/problems/functions/divisors_sum/common.py1
-rw-r--r--python/problems/functions/friendly_numbers/common.py1
-rw-r--r--python/problems/functions/greatest/common.py1
-rw-r--r--python/problems/functions/greatest_absolutist/common.py1
-rw-r--r--python/problems/functions/greatest_negative/common.py1
-rw-r--r--python/problems/functions/palindrome/common.py1
-rw-r--r--python/problems/functions/palindromic_numbers/common.py1
-rw-r--r--python/problems/functions/perfect_numbers/common.py1
-rw-r--r--python/problems/functions/prime_numbers/common.py1
15 files changed, 1 insertions, 18 deletions
diff --git a/python/problems/functions/assign_numbers/common.py b/python/problems/functions/assign_numbers/common.py
index c9e87bf..effd061 100644
--- a/python/problems/functions/assign_numbers/common.py
+++ b/python/problems/functions/assign_numbers/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 225
-group = 'lists_and_for'
number = 4
visible = True
diff --git a/python/problems/functions/body_mass_index/common.py b/python/problems/functions/body_mass_index/common.py
index 22defeb..8e774be 100644
--- a/python/problems/functions/body_mass_index/common.py
+++ b/python/problems/functions/body_mass_index/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 226
-group = 'functions'
number = 5
visible = True
diff --git a/python/problems/functions/body_mass_index_2/common.py b/python/problems/functions/body_mass_index_2/common.py
index c94b7d1..c6cf2b3 100644
--- a/python/problems/functions/body_mass_index_2/common.py
+++ b/python/problems/functions/body_mass_index_2/common.py
@@ -5,8 +5,7 @@ from python.util import has_token_sequence, string_almost_equal, \
string_contains_number, get_tokens, get_numbers, get_exception_desc
from server.hints import Hint
-id = 226
-group = 'functions'
+id = 227
number = 6
visible = True
diff --git a/python/problems/functions/body_mass_index_2/en.py b/python/problems/functions/body_mass_index_2/en.py
index 8ce2533..b34718b 100644
--- a/python/problems/functions/body_mass_index_2/en.py
+++ b/python/problems/functions/body_mass_index_2/en.py
@@ -1,6 +1,5 @@
# coding=utf-8
-id = 226
name = 'Body mass index 2'
slug = 'Body mass index 2'
diff --git a/python/problems/functions/body_mass_index_2/sl.py b/python/problems/functions/body_mass_index_2/sl.py
index 21e7fa0..8cd56c7 100644
--- a/python/problems/functions/body_mass_index_2/sl.py
+++ b/python/problems/functions/body_mass_index_2/sl.py
@@ -2,12 +2,9 @@
import server
mod = server.problems.load_language('python', 'sl')
-
-id = 226
name = 'Indeks telesne teže 2'
slug = 'Indeks telesne teže 2'
-
description = '''\
<p>
Naloga je podobna prejšnji, le da imamo tokrat podatke v drugačni obliki:
diff --git a/python/problems/functions/divisors/common.py b/python/problems/functions/divisors/common.py
index 0b6ba0d..afff7c5 100644
--- a/python/problems/functions/divisors/common.py
+++ b/python/problems/functions/divisors/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 230
-group = 'functions'
number = 9
visible = True
diff --git a/python/problems/functions/divisors_sum/common.py b/python/problems/functions/divisors_sum/common.py
index 256fdc3..142a448 100644
--- a/python/problems/functions/divisors_sum/common.py
+++ b/python/problems/functions/divisors_sum/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 231
-group = 'functions'
number = 10
visible = True
diff --git a/python/problems/functions/friendly_numbers/common.py b/python/problems/functions/friendly_numbers/common.py
index 6588242..fe121dc 100644
--- a/python/problems/functions/friendly_numbers/common.py
+++ b/python/problems/functions/friendly_numbers/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 233
-group = 'functions'
number = 12
visible = True
diff --git a/python/problems/functions/greatest/common.py b/python/problems/functions/greatest/common.py
index e6b7139..726fa88 100644
--- a/python/problems/functions/greatest/common.py
+++ b/python/problems/functions/greatest/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 195
-group = 'functions'
number = 1
visible = True
diff --git a/python/problems/functions/greatest_absolutist/common.py b/python/problems/functions/greatest_absolutist/common.py
index 564d0c8..3226b87 100644
--- a/python/problems/functions/greatest_absolutist/common.py
+++ b/python/problems/functions/greatest_absolutist/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 196
-group = 'functions'
number = 2
visible = True
diff --git a/python/problems/functions/greatest_negative/common.py b/python/problems/functions/greatest_negative/common.py
index 7ab3aca..72754e2 100644
--- a/python/problems/functions/greatest_negative/common.py
+++ b/python/problems/functions/greatest_negative/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 197
-group = 'functions'
number = 3
visible = True
diff --git a/python/problems/functions/palindrome/common.py b/python/problems/functions/palindrome/common.py
index 9bd82f4..eec8211 100644
--- a/python/problems/functions/palindrome/common.py
+++ b/python/problems/functions/palindrome/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 228
-group = 'functions'
number = 7
visible = True
diff --git a/python/problems/functions/palindromic_numbers/common.py b/python/problems/functions/palindromic_numbers/common.py
index b649719..6f49896 100644
--- a/python/problems/functions/palindromic_numbers/common.py
+++ b/python/problems/functions/palindromic_numbers/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 229
-group = 'functions'
number = 8
visible = True
diff --git a/python/problems/functions/perfect_numbers/common.py b/python/problems/functions/perfect_numbers/common.py
index 64acb23..72267e6 100644
--- a/python/problems/functions/perfect_numbers/common.py
+++ b/python/problems/functions/perfect_numbers/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 232
-group = 'functions'
number = 11
visible = True
diff --git a/python/problems/functions/prime_numbers/common.py b/python/problems/functions/prime_numbers/common.py
index 6806a08..33eb134 100644
--- a/python/problems/functions/prime_numbers/common.py
+++ b/python/problems/functions/prime_numbers/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 234
-group = 'functions'
number = 13
visible = True