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/sets | |
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/sets')
-rw-r--r-- | prolog/problems/sets/common.py | 2 | ||||
-rw-r--r-- | prolog/problems/sets/diff_3/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/sets/intersect_3/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/sets/is_subset_2/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/sets/is_superset_2/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/sets/powerset_2/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/sets/subset_2/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/sets/union_3/en.py | 1 |
8 files changed, 2 insertions, 7 deletions
diff --git a/prolog/problems/sets/common.py b/prolog/problems/sets/common.py new file mode 100644 index 0000000..104aa9d --- /dev/null +++ b/prolog/problems/sets/common.py @@ -0,0 +1,2 @@ +id = 5 +number = 4 diff --git a/prolog/problems/sets/diff_3/en.py b/prolog/problems/sets/diff_3/en.py index 7ce6944..47def00 100644 --- a/prolog/problems/sets/diff_3/en.py +++ b/prolog/problems/sets/diff_3/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 130 name = 'diff/3' slug = 'find the difference of two sets' diff --git a/prolog/problems/sets/intersect_3/en.py b/prolog/problems/sets/intersect_3/en.py index def0ab5..fed5e34 100644 --- a/prolog/problems/sets/intersect_3/en.py +++ b/prolog/problems/sets/intersect_3/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 129 name = 'intersect/3' slug = 'find the intersection of two sets' diff --git a/prolog/problems/sets/is_subset_2/en.py b/prolog/problems/sets/is_subset_2/en.py index b851d82..ad4804c 100644 --- a/prolog/problems/sets/is_subset_2/en.py +++ b/prolog/problems/sets/is_subset_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 132 name = 'is_subset/2' slug = 'check if one set is a subset of another' diff --git a/prolog/problems/sets/is_superset_2/en.py b/prolog/problems/sets/is_superset_2/en.py index 16b3db0..464762c 100644 --- a/prolog/problems/sets/is_superset_2/en.py +++ b/prolog/problems/sets/is_superset_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 131 name = 'is_superset/2' slug = 'check if one set is a superset of the other' diff --git a/prolog/problems/sets/powerset_2/en.py b/prolog/problems/sets/powerset_2/en.py index dcaee19..ad2fe87 100644 --- a/prolog/problems/sets/powerset_2/en.py +++ b/prolog/problems/sets/powerset_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 134 name = 'powerset/2' slug = 'find all subsets of a set' diff --git a/prolog/problems/sets/subset_2/en.py b/prolog/problems/sets/subset_2/en.py index 78c1362..eb96ac0 100644 --- a/prolog/problems/sets/subset_2/en.py +++ b/prolog/problems/sets/subset_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 133 name = 'subset/2' slug = 'generate all subsets of a set' diff --git a/prolog/problems/sets/union_3/en.py b/prolog/problems/sets/union_3/en.py index 1c9379e..db6bbd9 100644 --- a/prolog/problems/sets/union_3/en.py +++ b/prolog/problems/sets/union_3/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 128 name = 'union/3' slug = 'find the union of two sets' |