Skip to content

Commit 1903317

Browse files
committed
goimagehash: Fix quickselect algorithm to pick median value.
1 parent ad2b6de commit 1903317

File tree

3 files changed

+31
-28
lines changed

3 files changed

+31
-28
lines changed

etcs/utils.go

+24-21
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,38 @@ func MeanOfPixels(pixels []float64) float64 {
2424
func MedianOfPixels(pixels []float64) float64 {
2525
tmp := make([]float64, len(pixels))
2626
copy(tmp, pixels)
27-
l := len(tmp) - 1
27+
l := len(tmp)
2828
pos := l / 2
29-
v := quickSelect(tmp, 0, l, pos)
29+
v := quickSelectMedian(tmp, 0, l-1, pos)
3030
return v
3131
}
3232

33-
func quickSelect(sequence []float64, low int, hi int, k int) float64 {
34-
if hi-low <= 1 {
33+
func quickSelectMedian(sequence []float64, low int, hi int, k int) float64 {
34+
if low == hi {
3535
return sequence[k]
3636
}
37-
j := low
38-
sequence[j], sequence[k] = sequence[k], sequence[j]
39-
j++
40-
for i := j; i < hi; i++ {
41-
if sequence[i] < sequence[low] {
42-
sequence[j], sequence[i] = sequence[i], sequence[j]
43-
j++
44-
}
45-
}
46-
j--
47-
sequence[j], sequence[low] = sequence[low], sequence[j]
4837

49-
if k < j {
50-
return quickSelect(sequence, low, j, k)
38+
for low < hi {
39+
pivot := low/2 + hi/2
40+
pivotValue := sequence[pivot]
41+
storeIdx := low
42+
sequence[pivot], sequence[hi] = sequence[hi], sequence[pivot]
43+
for i := low; i < hi; i++ {
44+
if sequence[i] < pivotValue {
45+
sequence[storeIdx], sequence[i] = sequence[i], sequence[storeIdx]
46+
storeIdx++
47+
}
48+
}
49+
sequence[hi], sequence[storeIdx] = sequence[storeIdx], sequence[hi]
50+
if k <= storeIdx {
51+
hi = storeIdx
52+
} else {
53+
low = storeIdx + 1
54+
}
5155
}
5256

53-
if k > j {
54-
return quickSelect(sequence, j+1, hi, k-j)
57+
if len(sequence)%2 == 0 {
58+
return sequence[k-1]/2 + sequence[k]/2
5559
}
56-
57-
return sequence[j]
60+
return sequence[k]
5861
}

etcs/utils_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ func TestMedianPixels(t *testing.T) {
3030
}{
3131
{[]float64{0, 0, 0, 0}, 0},
3232
{[]float64{1}, 1},
33-
{[]float64{1, 2, 3, 4}, 2},
33+
{[]float64{1, 2, 3, 4}, 2.5},
3434
{[]float64{5, 3, 1, 7, 9}, 5},
35-
{[]float64{98.3, 33.4, 105.44, 1500.4, 22.5, 66.6}, 98.3},
35+
{[]float64{98.3, 33.4, 105.44, 1500.4, 22.5, 66.6}, 82.44999999999999},
3636
} {
3737
pixels := tt.pixels
3838
result := MedianOfPixels(pixels)

hashcompute_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ func TestHashCompute(t *testing.T) {
4141
{"_examples/sample2.jpg", "_examples/sample2.jpg", PerceptionHash, "PerceptionHash", 0},
4242
{"_examples/sample3.jpg", "_examples/sample3.jpg", PerceptionHash, "PerceptionHash", 0},
4343
{"_examples/sample4.jpg", "_examples/sample4.jpg", PerceptionHash, "PerceptionHash", 0},
44-
{"_examples/sample1.jpg", "_examples/sample2.jpg", PerceptionHash, "PerceptionHash", 34},
45-
{"_examples/sample1.jpg", "_examples/sample3.jpg", PerceptionHash, "PerceptionHash", 7},
46-
{"_examples/sample1.jpg", "_examples/sample4.jpg", PerceptionHash, "PerceptionHash", 31},
47-
{"_examples/sample2.jpg", "_examples/sample3.jpg", PerceptionHash, "PerceptionHash", 31},
48-
{"_examples/sample2.jpg", "_examples/sample4.jpg", PerceptionHash, "PerceptionHash", 23},
44+
{"_examples/sample1.jpg", "_examples/sample2.jpg", PerceptionHash, "PerceptionHash", 32},
45+
{"_examples/sample1.jpg", "_examples/sample3.jpg", PerceptionHash, "PerceptionHash", 2},
46+
{"_examples/sample1.jpg", "_examples/sample4.jpg", PerceptionHash, "PerceptionHash", 30},
47+
{"_examples/sample2.jpg", "_examples/sample3.jpg", PerceptionHash, "PerceptionHash", 34},
48+
{"_examples/sample2.jpg", "_examples/sample4.jpg", PerceptionHash, "PerceptionHash", 20},
4949
} {
5050
file1, err := os.Open(tt.img1)
5151
if err != nil {

0 commit comments

Comments
 (0)