Merge pull request #18 from KDD-OpenSource/fix/inf-redundancy

Fix/inf redundancy
KDD-OpenSource · May 2, 2017 · 0ce5200 · 0ce5200
2 parents 0010ae0 + b6917de
commit 0ce5200
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/hics/incremental_correlation.py b/hics/incremental_correlation.py
@@ -40,6 +40,9 @@ def _update_relevancy_table(self, new_relevancies):
     def _update_redundancy_table(self, new_weights, new_redundancies):
         current_redundancies, current_weights = self.result_storage.get_redundancies()
 
+        current_weights = current_weights.loc[new_weights.index, new_weights.columns]
+        current_redundancies = current_redundancies.loc[new_redundancies.index, new_redundancies.columns]
+
         current_redundancies[current_weights < 1] = np.inf
 
         current_redundancies = np.minimum(new_redundancies, current_redundancies)

diff --git a/setup.py b/setup.py
@@ -2,12 +2,12 @@
 
 
 setup(
-	name='hics', 
-	version='0.18',                  
-	author='Marcus Pappik',
-	install_requires=[
-		'pandas',
-		'numpy'
-	],
-	packages=['hics']
+    name='hics',
+    version='0.19',
+    author='Marcus Pappik',
+    install_requires=[
+        'pandas',
+        'numpy'
+    ],
+    packages=['hics']
 )