Merge pull request #3 from KDD-OpenSource/delete_slicesimilarity

KDD-OpenSource · Mar 19, 2017 · db85ec8 · db85ec8
2 parents 34e5e6e + 47ef545
commit db85ec8
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 474 deletions.
diff --git a/examples/bivariate_testrun.ipynb b/examples/bivariate_testrun.ipynb
diff --git a/examples/bivariate_correlation.py → hics/bivariate_correlation.py b/examples/bivariate_correlation.py → hics/bivariate_correlation.py
@@ -4,8 +4,8 @@
 import json
 from random import randint
 from hics.contrast_meassure import HiCS
-from slice_similarity.slice_similarity import continuous_similarity_matrix, categorical_similarity_matrix
-from slice_similarity.slice_selection import select_by_similarity
+from hics.slice_similarity import continuous_similarity_matrix, categorical_similarity_matrix
+from hics.slice_selection import select_by_similarity
 from math import pow
 
 

diff --git a/slice_similarity/slice_selection.py → hics/slice_selection.py b/slice_similarity/slice_selection.py → hics/slice_selection.py
diff --git a/slice_similarity/slice_similarity.py → hics/slice_similarity.py b/slice_similarity/slice_similarity.py → hics/slice_similarity.py
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,6 @@
+numpy
+pandas
+scipy
+sklearn
+scikit-learn
+matplotlib
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 setup(
 	name='hics', 
 	version='0.1',                  
-	author='Markus Pappik',
+	author='Marcus Pappik',
 	install_requires=[
 		'pandas',
 		'numpy'

diff --git a/slice_similarity/__init__.py b/slice_similarity/__init__.py
diff --git a/tests/test_scored_slices.py b/tests/test_scored_slices.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from bivariate_correlation import ScoredSlices
+from hics.bivariate_correlation import ScoredSlices
 import numpy as np
 import pandas as pd
 

diff --git a/tests/test_slice_similarity.py b/tests/test_slice_similarity.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from slice_similarity.slice_similarity import continuous_similarity_matrix, categorical_similarity_matrix
+from hics.slice_similarity import continuous_similarity_matrix, categorical_similarity_matrix
 import numpy as np
 import pandas as pd