Data module id swapping (#170)

Author: tqtg

cornac/data/module.py

@@ -81,12 +81,13 @@ def feature_dim(self):
         return self.features.shape[1]
 
     def _swap_feature(self, id_map):
-        for old_idx, raw_id in enumerate(self._ids):
+        for old_idx, raw_id in enumerate(self._ids.copy()):
             new_idx = id_map.get(raw_id, None)
             if new_idx is None:
                 continue
             assert new_idx < self.features.shape[0]
             self.features[[new_idx, old_idx]] = self.features[[old_idx, new_idx]]
+            self._ids[old_idx], self._ids[new_idx] = self._ids[new_idx], self._ids[old_idx]
 
     def build(self, id_map=None):
         """Build the feature matrix.

cornac/data/text.py

@@ -491,12 +491,13 @@ def __init__(self,
         self.count_matrix = None
 
     def _swap_text(self, id_map: Dict):
-        for old_idx, raw_id in enumerate(self._ids):
+        for old_idx, raw_id in enumerate(self._ids.copy()):
             new_idx = id_map.get(raw_id, None)
             if new_idx is None:
                 continue
             assert new_idx < len(self.corpus)
             self.corpus[old_idx], self.corpus[new_idx] = self.corpus[new_idx], self.corpus[old_idx]
+            self._ids[old_idx], self._ids[new_idx] = self._ids[new_idx], self._ids[old_idx]
 
     def _build_text(self, id_map: Dict):
         """Build the text based on provided global id map

tests/cornac/data/test_module.py

@@ -33,7 +33,7 @@ def test_init(self):
         self.assertIsNone(md.features)
 
         md = FeatureModule(features=np.asarray(list(self.id_feature.values())),
-                           ids=self.id_feature.keys(),
+                           ids=list(self.id_feature.keys()),
                            normalized=True)
 
         global_iid_map = OrderedDict()
@@ -46,7 +46,7 @@ def test_init(self):
 
     def test_batch_feature(self):
         md = FeatureModule(features=np.asarray(list(self.id_feature.values())),
-                           ids=self.id_feature.keys(),
+                           ids=list(self.id_feature.keys()),
                            normalized=True)
 
         global_iid_map = OrderedDict({'a': 0, 'b': 1})