Merge pull request #340 from simphony/enum-strings

Fix #339

bench/data_container_bench.py

@@ -6,9 +6,9 @@
 from simphony.core.data_container import DataContainer
 from simphony.core.cuba import CUBA
 
-dict_data = {key: key + 3 for key in CUBA}
+dict_data = {key: 3 for key in CUBA}
 data_container = DataContainer(dict_data)
-indices = [int(key) for key in CUBA]
+indices = [key for key in CUBA]
 random.shuffle(indices)
 
 
@@ -27,7 +27,7 @@ def getitem_access(data, indices):
 
 def setitem_with_CUBA_keys(data):
     for item in CUBA:
-        data[item] = int(item)
+        data[item] = str(item)
     return data
 
 

bench/data_container_table_bench.py

@@ -23,8 +23,10 @@
 
 dict_data = create_data_container()
 dict_data_half = create_data_container()
-for i in range(min(CUBA), max(CUBA), 2):
-    del dict_data_half[CUBA(i)]
+for i, cuba in enumerate(CUBA):
+    if i % 2:
+        continue
+    del dict_data_half[cuba]
 
 data_container = DataContainer(dict_data)
 data_container_half = DataContainer(dict_data_half)

bench/indexed_data_container_table_bench.py

@@ -22,8 +22,10 @@
 
 dict_data = create_data_container()
 dict_data_half = create_data_container()
-for i in range(min(CUBA), max(CUBA), 2):
-    del dict_data_half[CUBA(i)]
+for i, cuba in enumerate(CUBA):
+    if i % 2:
+        continue
+    del dict_data_half[cuba]
 
 data_container = DataContainer(dict_data)
 data_container_half = DataContainer(dict_data_half)

scripts/generate.py

@@ -8,7 +8,7 @@
 
 from collections import OrderedDict, MutableSequence
 from contextlib import contextmanager
-from itertools import chain, count
+from itertools import chain
 
 import click
 import yaml
@@ -991,22 +991,20 @@ def cuba_enum(cuba_input, cuds_input, output):
         '# code auto-generated by the\n',
         '# simphony-metadata/scripts/generate.py script.\n',
         '# cuba.yml VERSION: {}\n'.format(keywords['VERSION']),
-        'from enum import IntEnum, unique\n',
+        'from enum import Enum, unique\n',
         '\n',
         '\n',
         '@unique\n',
-        'class CUBA(IntEnum):\n',
+        'class CUBA(Enum):\n',
         '\n']
-    template = "    {} = {}\n"
-
-    counter = count(1)
+    template = '    {} = "{}"\n'
 
     all_keys = set(keywords['CUBA_KEYS']) | set(metadata['CUDS_KEYS'])
 
     for keyword in all_keys:
         if keyword in CUBA_DATA_CONTAINER_EXCLUDE:
             continue
-        lines.append(template.format(keyword, counter.next()))
+        lines.append(template.format(keyword, keyword))
 
     output.writelines(lines)