GOMODULES
/
images4
mirror of https://github.com/vitali-fedulov/images4
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added new func: CustomSimilar (2)

master
Vitali Fedulov 2024-01-29 01:06:44 +01:00
parent 53fdf151da
commit f7f7753d86
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
custom.go
View File

@ -19,7 +19,7 @@ type CustomCoefficients struct {
// if necessary. All coefficients set to 0 correspond to identical images, // if necessary. All coefficients set to 0 correspond to identical images,
// for example an image file copy. All coefficients equal to 1 make func // for example an image file copy. All coefficients equal to 1 make func
// CustomSimilar equivalent to func Similar. // CustomSimilar equivalent to func Similar.
func CustomSimilar(iconA, iconB IconT, coeff CustomCoefficients) bool { func CustomSimilar(iconA, iconB IconT, coeff *CustomCoefficients) bool {
if !customPropSimilar(iconA, iconB, coeff) { if !customPropSimilar(iconA, iconB, coeff) {
return false return false
@ -30,11 +30,11 @@ func CustomSimilar(iconA, iconB IconT, coeff CustomCoefficients) bool {
return true return true
} }
func customPropSimilar(iconA, iconB IconT, coeff CustomCoefficients) bool { func customPropSimilar(iconA, iconB IconT, coeff *CustomCoefficients) bool {
return PropMetric(iconA, iconB) <= thProp*coeff.Prop return PropMetric(iconA, iconB) <= thProp*coeff.Prop
} }
func customEucSimilar(iconA, iconB IconT, coeff CustomCoefficients) bool { func customEucSimilar(iconA, iconB IconT, coeff *CustomCoefficients) bool {
m1, m2, m3 := EucMetric(iconA, iconB) m1, m2, m3 := EucMetric(iconA, iconB)
@ -45,7 +45,7 @@ func customEucSimilar(iconA, iconB IconT, coeff CustomCoefficients) bool {
// Similar90270 works like Similar, but also considers rotations of ±90°. // Similar90270 works like Similar, but also considers rotations of ±90°.
// Those are rotations users might reasonably often do. // Those are rotations users might reasonably often do.
func CustomSimilar90270(iconA, iconB IconT, coeff CustomCoefficients) bool { func CustomSimilar90270(iconA, iconB IconT, coeff *CustomCoefficients) bool {
if CustomSimilar(iconA, iconB, coeff) { if CustomSimilar(iconA, iconB, coeff) {
return true return true

16
custom_test.go
View File

@ -19,7 +19,7 @@ func TestCustomSimilar(t *testing.T) {
t.Errorf("distorted.jpg is NOT similar to large.jpg") t.Errorf("distorted.jpg is NOT similar to large.jpg")
} }
if !CustomSimilar(icon1, icon2, CustomCoefficients{1, 1, 1, 10}) { if !CustomSimilar(icon1, icon2, &CustomCoefficients{1, 1, 1, 10}) {
t.Errorf("distorted.jpg IS similar to large.jpg, assuming proportion differences are widely tolerated.") t.Errorf("distorted.jpg IS similar to large.jpg, assuming proportion differences are widely tolerated.")
} }
@ -36,36 +36,36 @@ func TestCustomSimilar(t *testing.T) {
} }
// Luma. // Luma.
if CustomSimilar(icon1, icon2, CustomCoefficients{0, 1, 1, 1}) { if CustomSimilar(icon1, icon2, &CustomCoefficients{0, 1, 1, 1}) {
t.Errorf("1.jpg is NOT IDENTICAL to 2.jpg") t.Errorf("1.jpg is NOT IDENTICAL to 2.jpg")
} }
// Luma. // Luma.
if CustomSimilar(icon1, icon2, CustomCoefficients{0.4, 1, 1, 1}) { if CustomSimilar(icon1, icon2, &CustomCoefficients{0.4, 1, 1, 1}) {
t.Errorf("1.jpg is similar to 2.jpg, BUT NOT VERY SIMILAR") t.Errorf("1.jpg is similar to 2.jpg, BUT NOT VERY SIMILAR")
} }
// Chrominance b. // Chrominance b.
if CustomSimilar(icon1, icon2, CustomCoefficients{1, 0.1, 1, 1}) { if CustomSimilar(icon1, icon2, &CustomCoefficients{1, 0.1, 1, 1}) {
t.Errorf("1.jpg is similar to 2.jpg, BUT NOT VERY SIMILAR") t.Errorf("1.jpg is similar to 2.jpg, BUT NOT VERY SIMILAR")
} }
// Chrominance c. // Chrominance c.
if CustomSimilar(icon1, icon2, CustomCoefficients{1, 1, 0.1, 1}) { if CustomSimilar(icon1, icon2, &CustomCoefficients{1, 1, 0.1, 1}) {
t.Errorf("1.jpg is similar to 2.jpg, BUT NOT VERY SIMILAR") t.Errorf("1.jpg is similar to 2.jpg, BUT NOT VERY SIMILAR")
} }
// Image comparison to itself (or its own copy). // Image comparison to itself (or its own copy).
if !CustomSimilar(icon1, icon1, CustomCoefficients{0, 0, 0, 0}) { if !CustomSimilar(icon1, icon1, &CustomCoefficients{0, 0, 0, 0}) {
t.Errorf("1.jpg IS IDENTICAL to itself") t.Errorf("1.jpg IS IDENTICAL to itself")
} }
if !CustomSimilar(icon1, icon1, CustomCoefficients{0.5, 0.5, 0.5, 0.5}) { if !CustomSimilar(icon1, icon1, &CustomCoefficients{0.5, 0.5, 0.5, 0.5}) {
t.Errorf("1.jpg IS IDENTICAL to itself") t.Errorf("1.jpg IS IDENTICAL to itself")
} }
if !CustomSimilar(icon1, icon1, CustomCoefficients{1, 1, 1, 1}) { if !CustomSimilar(icon1, icon1, &CustomCoefficients{1, 1, 1, 1}) {
t.Errorf("1.jpg IS IDENTICAL to itself") t.Errorf("1.jpg IS IDENTICAL to itself")
} }