BUG Fix name of function chist

luispedro · luispedro · commit db795e08dc72 · 2016-03-08T14:57:28.000+01:00
The function for computing color histograms is chist. Use it throughout. closes luispedro#15
diff --git a/ch10/neighbors.py b/ch10/neighbors.py
@@ -6,7 +6,7 @@
 import numpy as np
 import mahotas as mh
 from glob import glob
-from features import texture, color_histogram
+from features import texture, chist
 from matplotlib import pyplot as plt
 from sklearn.preprocessing import StandardScaler
 from scipy.spatial import distance
@@ -29,7 +29,7 @@
 imc = mh.imread(fname)
 imc = imc[200:-200,200:-200]
 haralicks.append(texture(mh.colors.rgb2grey(imc)))
- chists.append(color_histogram(imc))
+ chists.append(chist(imc))
 
 haralicks = np.array(haralicks)
 chists = np.array(chists)
diff --git a/ch10/simple_classification.py b/ch10/simple_classification.py
@@ -9,7 +9,7 @@
 import numpy as np
 from glob import glob
 
-from features import texture, color_histogram
+from features import texture, chist
 from sklearn.linear_model import LogisticRegression
 from sklearn.pipeline import Pipeline
 from sklearn.preprocessing import StandardScaler
@@ -32,7 +32,7 @@
 for fname in sorted(images):
 imc = mh.imread(fname)
 haralicks.append(texture(mh.colors.rgb2grey(imc)))
- chists.append(color_histogram(imc))
+ chists.append(chist(imc))
 
 # Files are named like building00.jpg, scene23.jpg...
 labels.append(fname[:-len('xx.jpg')])

-Original file line number
+Diff line change
 importnumpyasnp
 importmahotasasmh
 fromglobimportglob
 -fromfeaturesimporttexture, color_histogram
 +fromfeaturesimporttexture, chist
 frommatplotlibimportpyplotasplt
 fromsklearn.preprocessingimportStandardScaler
 fromscipy.spatialimportdistance
 imc=mh.imread(fname)
 imc=imc[200:-200,200:-200]
 haralicks.append(texture(mh.colors.rgb2grey(imc)))
 -chists.append(color_histogram(imc))
 +chists.append(chist(imc))
 haralicks=np.array(haralicks)
 chists=np.array(chists)