diff --git a/A2/histogram.py b/A2/histogram.py index 1887bddfd762826a0cf09a81f38e914e7b09e2bc..230623b5471bbab26bcea25ff30092f06af0469f 100644 --- a/A2/histogram.py +++ b/A2/histogram.py @@ -95,6 +95,12 @@ class Histogram(object): plt.xticks(np.arange(min(keys), 256, step=255 / (ticks - 1))) elif option == HISTOGRAMS.h2.value: plt.xticks(np.arange(0, self.b)) + interval_strings = [] + intervals = self.__get_intervals(self.b) + for i in range(self.b): + interval_strings += ['(' + str(intervals[str(i)][0]) + '-' + str(intervals[str(i)][1]) + ')'] + plt.xticks(range(self.b), + interval_strings, rotation=45, fontsize=5) plt.savefig('images/histogram.jpeg', dpi=100) def get_histogram(self, option: String) -> None: @@ -107,7 +113,6 @@ class Histogram(object): """ image = imageio.imread(uri=self.image_path) plt.imshow(image) - plt.show() grey_scale_image = color.rgb2gray(image) # convert greyscale to interval diff --git a/A2/images/chalsea/H1.jpeg b/A2/images/chalsea/H1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..0a2a569281288c76f24682066c75ad38e1e32d96 Binary files /dev/null and b/A2/images/chalsea/H1.jpeg differ diff --git a/A2/images/chalsea/H10.jpeg b/A2/images/chalsea/H10.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..5fe545593bed9be17677a18c938bb6dc56077f2d Binary files /dev/null and b/A2/images/chalsea/H10.jpeg differ diff --git a/A2/images/chalsea/H15.jpeg b/A2/images/chalsea/H15.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..8229001d49d1ce28fbd3e20dab8b96252e3f2484 Binary files /dev/null and b/A2/images/chalsea/H15.jpeg differ diff --git a/A2/images/chalsea/H20.jpeg b/A2/images/chalsea/H20.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..1541807cb412ae7d356f9d47c771aa140b814925 Binary files /dev/null and b/A2/images/chalsea/H20.jpeg differ diff --git a/A2/images/chalsea/H5.jpeg b/A2/images/chalsea/H5.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..3518e586b0a1e667ef9245ff47c11a0e2b5c762b Binary files /dev/null and b/A2/images/chalsea/H5.jpeg differ diff --git a/A2/images/histogram.jpeg b/A2/images/histogram.jpeg index 0a2a569281288c76f24682066c75ad38e1e32d96..1541807cb412ae7d356f9d47c771aa140b814925 100644 Binary files a/A2/images/histogram.jpeg and b/A2/images/histogram.jpeg differ diff --git a/requirements.txt b/requirements.txt index 2a1a3ce85f79e361ffdafb9afd2c1267e06660ab..fd4ab5091018edbcd55791db22d36c298b65020d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,5 @@ imageio==2.5.0 Pillow==6.0.0 scikit-image==0.15.0 numpy == 1.16.2 -scipy == 1.2.1 \ No newline at end of file +scipy == 1.2.1 +scikit-learn==0.21.0 \ No newline at end of file