Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Павлов Леонид Алексеевич committed Dec 6, 2023
2 parents 0889f7d + 654e0f2 commit 3372fa8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

# Zefirrat.ImageComparer.Abstractions
- name: Build Zefirrat.ImageComparer.Abstractions
run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer"
run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…"
working-directory: ./Zefirrat.ImageComparer.Abstractions
- name: Pack Zefirrat.ImageComparer.Abstractions
run: dotnet pack -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer"
run: dotnet pack -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…"
working-directory: ./Zefirrat.ImageComparer.Abstractions
- name: Upload artifact Zefirrat.ImageComparer.Abstractions
uses: actions/upload-artifact@v1
Expand All @@ -30,10 +30,10 @@ jobs:

# Zefirrat.ImageComparer.AspNet.Di
- name: Build Zefirrat.ImageComparer.AspNet.Di
run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer"
run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…"
working-directory: ./Zefirrat.ImageComparer.AspNet.Di
- name: Pack Zefirrat.ImageComparer.AspNet.Di
run: dotnet pack -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer"
run: dotnet pack -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…"
working-directory: ./Zefirrat.ImageComparer.AspNet.Di
- name: Upload artifact Zefirrat.ImageComparer.AspNet.Di
uses: actions/upload-artifact@v1
Expand All @@ -45,10 +45,10 @@ jobs:

# Zefirrat.ImageComparer
- name: Build Zefirrat.ImageComparer
run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer"
run: dotnet build -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…"
working-directory: ./Zefirrat.ImageComparer
- name: Pack Zefirrat.ImageComparer
run: dotnet pack -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer"
run: dotnet pack -c Release /p:Version=${{ github.event.release.tag_name }} /p:PackageReleaseNotes="See https://github.com/Zefirrat/ImageComparer/releases/tag/${{ github.event.release.tag_name }}" /p:Authors="Zefirrat" /p:PackageDescription="See https://github.com/Zefirrat/ImageComparer" /p:Links="https://github.com/Zefirrat/ImageComparer" /p:RepositoryUrl="https://github.com/Zefirrat/ImageComparer" /p:IconUrl="https://avatars.githubusercontent.com/u/37443756?v=4" /p:Description="Recognition of similar or same images with varying degrees of accuracy. For example for images with noise the similarity of compressed images and the original ones to search for the original im…"
working-directory: ./Zefirrat.ImageComparer
- name: Upload artifact Zefirrat.ImageComparer
uses: actions/upload-artifact@v1
Expand Down
30 changes: 22 additions & 8 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ For example, for images with noise, the similarity of compressed images and the
![image](Test_Images/test_image_source.png)

## Comparing with compressed:
![image](Test_Images/test_image_source_compressed.jpg)
|Original|Compressed|
|-|-|
|![image](Test_Images/test_image_source.png)|![image](Test_Images/test_image_source_compressed.jpg)|

### Result:
```sh
Expand All @@ -35,7 +37,9 @@ Accuracy: VeryHigh
```

## Added transparent drawing at right bottom corner:
![image](Test_Images/test_image_changed.png)
|Original|With light drawing|
|-|-|
|![image](Test_Images/test_image_source.png)|![image](Test_Images/test_image_changed.png)|

### Result:
```sh
Expand All @@ -62,7 +66,9 @@ Accuracy: VeryHigh
```

## Added few red curves:
![image](Test_Images/test_image_changed_2.png)
|Original|With red curves|
|-|-|
|![image](Test_Images/test_image_source.png)|![image](Test_Images/test_image_changed_2.png)|

### Result:
```sh
Expand All @@ -89,7 +95,9 @@ Accuracy: VeryHigh
```

## Added more red curves:
![image](Test_Images/test_image_changed_3.png)
|Original|With red curves|
|-|-|
|![image](Test_Images/test_image_source.png)|![image](Test_Images/test_image_changed_3.png)|

### Result:
```sh
Expand All @@ -115,8 +123,10 @@ Accuracy: VeryHigh
-------------------------
```

## Added mush more red curves:
![image](Test_Images/test_image_changed_4.png)
## Added much more red curves:
|Original|Painted|
|-|-|
|![image](Test_Images/test_image_source.png)|![image](Test_Images/test_image_changed_4.png)|

### Result:
```sh
Expand Down Expand Up @@ -160,8 +170,12 @@ PM > Install-Package Zefirrat.ImageComparer
var similar = imageComparer.AreSimilar(image1, image2);
var equal = imageComparer.AreEqual(image1, image2);
```

## Overloads
![image](https://github.com/Zefirrat/ImageComparer/assets/37443756/9a2fe232-70a3-44c9-9712-cf29e183b7eb)

## Accuracy options
Выше значение - выше допускаемый разброс.
A higher value means a higher acceptable spread.

```csharp
public cllass ImageComparer
Expand Down Expand Up @@ -213,4 +227,4 @@ I took from this approach, the work with the mean square deviation (standard dev

**For similarity**:
- Getting the quadratic deviation (standard deviation) between the vectors for each image, and the sum of all vectors
- The difference between the total deviation and the deviation for each image should not exceed the allowable discrepancy
- The difference between the total deviation and the deviation for each image should not exceed the allowable discrepancy

0 comments on commit 3372fa8

Please sign in to comment.