Marmelator/image-classification-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 29 Wiki Activity

renaming

Browse Source
This commit is contained in:
Matthias Bisping 2022-04-13 13:36:45 +02:00
parent daa1da3a50
commit 2cc52c4630
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/conftest.py
View File

@ -510,7 +510,6 @@ def random_single_color_image_from_metadata(metadata):
return image return image
# TODO: rename: not random! def gray_image_from_metadata(metadata):
def random_size_gray_image_from_metadata(metadata):
image = Image.new("RGB", (metadata[Info.WIDTH], metadata[Info.HEIGHT]), color=(100, 100, 100)) image = Image.new("RGB", (metadata[Info.WIDTH], metadata[Info.HEIGHT]), color=(100, 100, 100))
return image return image

0
test/exploration_tests/utils_test.py → test/exploration_tests/funcy_test.py
View File

16
test/unit_tests/image_stitching_test.py
View File

@ -37,7 +37,7 @@ from image_prediction.stitching.utils import (
from test.conftest import ( from test.conftest import (
add_image, add_image,
random_single_color_image_from_metadata, random_single_color_image_from_metadata,
random_size_gray_image_from_metadata, gray_image_from_metadata,
) )
from test.utils.stitching import BoxSplitter from test.utils.stitching import BoxSplitter
@ -72,7 +72,7 @@ def test_image_stitcher_with_gaps_must_succeed():
with open(os.path.join(TEST_DATA_DIR, "stitching_with_tolerance.json")) as f: with open(os.path.join(TEST_DATA_DIR, "stitching_with_tolerance.json")) as f:
patches_metadata, base_patch_metadata = itemgetter("input", "target")(ReverseEnumFormatter(Info)(json.load(f))) patches_metadata, base_patch_metadata = itemgetter("input", "target")(ReverseEnumFormatter(Info)(json.load(f)))
images = map(random_size_gray_image_from_metadata, patches_metadata) images = map(gray_image_from_metadata, patches_metadata)
patch_image_metadata_pairs = list(starmap(ImageMetadataPair, zip(images, patches_metadata))) patch_image_metadata_pairs = list(starmap(ImageMetadataPair, zip(images, patches_metadata)))
pairs_stitched = stitch_pairs(patch_image_metadata_pairs, tolerance=7) pairs_stitched = stitch_pairs(patch_image_metadata_pairs, tolerance=7)
@ -105,7 +105,7 @@ def test_merge_group_horizontally(horizontal_merge_test_pairs):
mdat3 = deepcopy(pr2.metadata) mdat3 = deepcopy(pr2.metadata)
mdat3[Info.HEIGHT] += 30 mdat3[Info.HEIGHT] += 30
mdat3[Info.Y2] += 30 mdat3[Info.Y2] += 30
im3 = random_size_gray_image_from_metadata(mdat3) im3 = gray_image_from_metadata(mdat3)
pr3 = ImageMetadataPair(im3, mdat3) pr3 = ImageMetadataPair(im3, mdat3)
prs_merged = merge_group_horizontally([pr1, pr2, pr3]) prs_merged = merge_group_horizontally([pr1, pr2, pr3])
@ -123,7 +123,7 @@ def test_merge_group_vertically(vertical_merge_test_pairs):
mdat3 = deepcopy(pr2.metadata) mdat3 = deepcopy(pr2.metadata)
mdat3[Info.WIDTH] += 30 mdat3[Info.WIDTH] += 30
mdat3[Info.X2] += 30 mdat3[Info.X2] += 30
im3 = random_size_gray_image_from_metadata(mdat3) im3 = gray_image_from_metadata(mdat3)
pr3 = ImageMetadataPair(im3, mdat3) pr3 = ImageMetadataPair(im3, mdat3)
prs_merged = merge_group_vertically([pr1, pr2, pr3]) prs_merged = merge_group_vertically([pr1, pr2, pr3])
@ -153,13 +153,13 @@ def images_equal(im1: Image, im2: Image, **kwargs):
@pytest.fixture @pytest.fixture
def horizontal_merge_test_pairs(horizontal_merge_test_metadata): def horizontal_merge_test_pairs(horizontal_merge_test_metadata):
images = map(random_size_gray_image_from_metadata, horizontal_merge_test_metadata) images = map(gray_image_from_metadata, horizontal_merge_test_metadata)
return list(starmap(ImageMetadataPair, zip(images, horizontal_merge_test_metadata))) return list(starmap(ImageMetadataPair, zip(images, horizontal_merge_test_metadata)))
@pytest.fixture @pytest.fixture
def vertical_merge_test_pairs(vertical_merge_test_metadata): def vertical_merge_test_pairs(vertical_merge_test_metadata):
images = map(random_size_gray_image_from_metadata, vertical_merge_test_metadata) images = map(gray_image_from_metadata, vertical_merge_test_metadata)
return list(starmap(ImageMetadataPair, zip(images, vertical_merge_test_metadata))) return list(starmap(ImageMetadataPair, zip(images, vertical_merge_test_metadata)))
@ -209,7 +209,7 @@ def base_patch_image(stitch_test_pdf):
def test_concat_images_horizontally(horizontal_merge_test_metadata): def test_concat_images_horizontally(horizontal_merge_test_metadata):
mdat1, mdat2, mdat_merged = horizontal_merge_test_metadata mdat1, mdat2, mdat_merged = horizontal_merge_test_metadata
im1, im2, im_merged_expected = map(random_size_gray_image_from_metadata, [mdat1, mdat2, mdat_merged]) im1, im2, im_merged_expected = map(gray_image_from_metadata, [mdat1, mdat2, mdat_merged])
im_merged = concat_images_horizontally(im1, im2, mdat_merged) im_merged = concat_images_horizontally(im1, im2, mdat_merged)
assert im_merged.size == im_merged_expected.size assert im_merged.size == im_merged_expected.size
assert images_equal(im_merged, im_merged_expected) assert images_equal(im_merged, im_merged_expected)
@ -217,7 +217,7 @@ def test_concat_images_horizontally(horizontal_merge_test_metadata):
def test_concat_images_vertically(vertical_merge_test_metadata): def test_concat_images_vertically(vertical_merge_test_metadata):
mdat1, mdat2, mdat_merged = vertical_merge_test_metadata mdat1, mdat2, mdat_merged = vertical_merge_test_metadata
im1, im2, im_merged_expected = map(random_size_gray_image_from_metadata, [mdat1, mdat2, mdat_merged]) im1, im2, im_merged_expected = map(gray_image_from_metadata, [mdat1, mdat2, mdat_merged])
im_merged = concat_images_vertically(im1, im2, mdat_merged) im_merged = concat_images_vertically(im1, im2, mdat_merged)
assert im_merged.size == im_merged_expected.size assert im_merged.size == im_merged_expected.size
assert images_equal(im_merged, im_merged_expected) assert images_equal(im_merged, im_merged_expected)