1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044
|
from __future__ import annotations
from functools import reduce
from itertools import pairwise
from operator import add
from typing import TYPE_CHECKING, cast
import numpy as np
from numpy.testing import assert_allclose, assert_array_equal
import pytest
from contourpy import FillType, contour_generator, max_threads
from contourpy.util.data import random, simple
from . import util_test
if TYPE_CHECKING:
import contourpy._contourpy as cpy
@pytest.fixture
def two_outers_one_hole() -> tuple[cpy.CoordinateArray, ...]:
x, y = np.meshgrid([0., 1., 2., 3.], [0., 1., 2.])
z = np.array([[1.5, 1.5, 0.9, 0.0],
[1.5, 2.8, 0.4, 0.8],
[0.0, 0.0, 0.8, 1.9]])
return x, y, z
@pytest.fixture
def xyz_chunk_test() -> tuple[cpy.CoordinateArray, ...]:
x, y = np.meshgrid(np.arange(5), np.arange(5))
z = 0.5*np.abs(y - 2) + 0.1*(x - 2)
return x, y, z
@pytest.mark.parametrize("name", util_test.all_names())
def test_filled_decreasing_levels(name: str) -> None:
cont_gen = contour_generator(z=[[0, 1], [2, 3]], name=name, fill_type=FillType.OuterCode)
with pytest.raises(ValueError, match="upper_level must be larger than lower_level"):
cont_gen.filled(2.0, 1.0)
@pytest.mark.parametrize("name", util_test.all_names())
def test_filled_nan_levels(name: str) -> None:
cont_gen = contour_generator(z=[[0, 1], [2, 3]], name=name, fill_type=FillType.OuterCode)
msg = r"lower_level and upper_level cannot be NaN"
with pytest.raises(ValueError, match=msg):
cont_gen.filled(0, np.nan)
with pytest.raises(ValueError, match=msg):
cont_gen.filled(np.nan, 0)
with pytest.raises(ValueError, match=msg):
cont_gen.filled(np.nan, np.nan)
@pytest.mark.parametrize("name", util_test.all_names())
def test_filled_identical_levels(name: str) -> None:
cont_gen = contour_generator(z=[[0, 1], [2, 3]], name=name, fill_type=FillType.OuterCode)
with pytest.raises(ValueError, match="upper_level must be larger than lower_level"):
cont_gen.filled(2.0, 2.0)
@pytest.mark.image
@pytest.mark.parametrize("multi", [False, True])
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_simple(name: str, fill_type: FillType, multi: bool) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40))
cont_gen = contour_generator(x, y, z, name=name, fill_type=fill_type)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (1, 1)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
if multi:
multi_filled = cont_gen.multi_filled(levels)
renderer.multi_filled(multi_filled, fill_type)
else:
for i in range(len(levels)-1):
renderer.filled(cont_gen.filled(levels[i], levels[i+1]), fill_type, color=f"C{i}")
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_simple.png", f"{name}_{fill_type}_{multi}")
@pytest.mark.image
@pytest.mark.parametrize("multi", [False, True])
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_simple_chunk(name: str, fill_type: FillType, multi: bool) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40))
cont_gen = contour_generator(
x, y, z, name=name, fill_type=fill_type, chunk_size=2, thread_count=1,
)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
if multi:
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
else:
for i in range(len(levels)-1):
renderer.filled(cont_gen.filled(levels[i], levels[i+1]), fill_type, color=f"C{i}")
image_buffer = renderer.save_to_buffer()
compare_images(
image_buffer, "filled_simple_chunk.png", f"{name}_{fill_type}_{multi}", mean_threshold=0.12,
)
@pytest.mark.image
@pytest.mark.threads
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("thread_count", util_test.thread_counts())
def test_filled_simple_chunk_threads(fill_type: FillType, thread_count: int) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40))
cont_gen = contour_generator(
x, y, z, name="threaded", fill_type=fill_type, chunk_size=2, thread_count=thread_count,
)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == thread_count
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(
image_buffer, "filled_simple_chunk.png", f"{fill_type}_{thread_count}", mean_threshold=0.12,
)
@pytest.mark.image
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_simple_no_corner_mask(name: str, fill_type: FillType) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40), want_mask=True)
cont_gen = contour_generator(x, y, z, name=name, fill_type=fill_type, corner_mask=False)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (1, 1)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_simple_no_corner_mask.png", f"{name}_{fill_type}")
@pytest.mark.image
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_simple_no_corner_mask_chunk(name: str, fill_type: FillType) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40), want_mask=True)
cont_gen = contour_generator(
x, y, z, name=name, fill_type=fill_type, corner_mask=False, chunk_size=2, thread_count=1,
)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(
image_buffer, "filled_simple_no_corner_mask_chunk.png", f"{name}_{fill_type}",
mean_threshold=0.11,
)
@pytest.mark.image
@pytest.mark.threads
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("thread_count", util_test.thread_counts())
def test_filled_simple_no_corner_mask_chunk_threads(fill_type: FillType, thread_count: int) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40), want_mask=True)
cont_gen = contour_generator(
x, y, z, name="threaded", fill_type=fill_type, corner_mask=False, chunk_size=2,
thread_count=thread_count,
)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == thread_count
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(
image_buffer, "filled_simple_no_corner_mask_chunk.png", f"{fill_type}_{thread_count}",
mean_threshold=0.11,
)
@pytest.mark.image
@pytest.mark.parametrize("name", util_test.corner_mask_names())
def test_filled_simple_corner_mask(name: str) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40), want_mask=True)
fill_type = FillType.OuterCode
cont_gen = contour_generator(x, y, z, name=name, fill_type=fill_type, corner_mask=True)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (1, 1)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_simple_corner_mask.png", f"{name}_{fill_type}")
@pytest.mark.image
@pytest.mark.parametrize("name", util_test.corner_mask_names())
def test_filled_simple_corner_mask_chunk(name: str) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40), want_mask=True)
fill_type = FillType.OuterCode
cont_gen = contour_generator(
x, y, z, name=name, fill_type=fill_type, corner_mask=True, chunk_size=2, thread_count=1,
)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(
image_buffer, "filled_simple_corner_mask_chunk.png", f"{name}_{fill_type}",
mean_threshold=0.10,
)
@pytest.mark.image
@pytest.mark.threads
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("thread_count", util_test.thread_counts())
def test_filled_simple_corner_mask_chunk_threads(fill_type: FillType, thread_count: int) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40), want_mask=True)
fill_type = FillType.OuterCode
cont_gen = contour_generator(
x, y, z, name="threaded", fill_type=fill_type, corner_mask=True, chunk_size=2,
thread_count=thread_count,
)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == thread_count
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(
image_buffer, "filled_simple_corner_mask_chunk.png", f"{fill_type}_{thread_count}",
mean_threshold=0.10,
)
@pytest.mark.image
@pytest.mark.parametrize("name", util_test.quad_as_tri_names())
def test_filled_simple_quad_as_tri(name: str) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = simple((30, 40))
cont_gen = contour_generator(x, y, z, name=name, quad_as_tri=True)
levels = np.arange(-1.0, 1.01, 0.1)
assert cont_gen.chunk_count == (1, 1)
assert cont_gen.thread_count == 1
assert cont_gen.quad_as_tri
fill_type = cont_gen.fill_type
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_simple_quad_as_tri.png", f"{name}")
@pytest.mark.image
@pytest.mark.parametrize("multi", [False, True])
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_random(name: str, fill_type: FillType, multi: bool) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.0)
cont_gen = contour_generator(x, y, z, name=name, fill_type=fill_type)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (1, 1)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
if multi:
multi_filled = cont_gen.multi_filled(levels)
renderer.multi_filled(multi_filled, fill_type)
else:
for i in range(len(levels)-1):
renderer.filled(cont_gen.filled(levels[i], levels[i+1]), fill_type, color=f"C{i}")
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_random.png", f"{name}_{fill_type}_{multi}")
@pytest.mark.image
@pytest.mark.parametrize("multi", [False, True])
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_random_chunk(name: str, fill_type: FillType, multi: bool) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.0)
cont_gen = contour_generator(
x, y, z, name=name, fill_type=fill_type, chunk_size=2, thread_count=1,
)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
if multi:
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
else:
for i in range(len(levels)-1):
renderer.filled(cont_gen.filled(levels[i], levels[i+1]), fill_type, color=f"C{i}")
image_buffer = renderer.save_to_buffer()
max_threshold = None
mean_threshold = None
if name == "mpl2005":
max_threshold = 128
mean_threshold = 0.16
elif name in ("serial", "threaded"):
if fill_type in (FillType.ChunkCombinedCode, FillType.ChunkCombinedOffset):
max_threshold = 99
mean_threshold = 0.142
else:
max_threshold = 135
mean_threshold = 0.19
compare_images(
image_buffer, "filled_random_chunk.png", f"{name}_{fill_type}_{multi}",
max_threshold=max_threshold, mean_threshold=mean_threshold,
)
@pytest.mark.image
@pytest.mark.threads
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("thread_count", util_test.thread_counts())
def test_filled_random_chunk_threads(fill_type: FillType, thread_count: int) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.0)
cont_gen = contour_generator(
x, y, z, name="threaded", fill_type=fill_type, chunk_size=2, thread_count=thread_count,
)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == thread_count
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
if fill_type in (FillType.ChunkCombinedCode, FillType.ChunkCombinedOffset):
max_threshold = 99
mean_threshold = 0.142
else:
max_threshold = 135
mean_threshold = 0.19
compare_images(
image_buffer, "filled_random_chunk.png", f"{fill_type}_{thread_count}",
max_threshold=max_threshold, mean_threshold=mean_threshold,
)
@pytest.mark.image
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_random_no_corner_mask(name: str, fill_type: FillType) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.05)
cont_gen = contour_generator(x, y, z, name=name, fill_type=fill_type, corner_mask=False)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (1, 1)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_random_no_corner_mask.png", f"{name}_{fill_type}")
@pytest.mark.image
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_filled_random_no_corner_mask_chunk(name: str, fill_type: FillType) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.05)
cont_gen = contour_generator(
x, y, z, name=name, fill_type=fill_type, corner_mask=False, chunk_size=2, thread_count=1,
)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
max_threshold = None
mean_threshold = None
if name == "mpl2005":
max_threshold = 128
mean_threshold = 0.19
elif name in ("serial", "threaded"):
if fill_type in (FillType.ChunkCombinedCode, FillType.ChunkCombinedOffset):
max_threshold = 99
mean_threshold = 0.18
else:
max_threshold = 135
mean_threshold = 0.23
compare_images(
image_buffer, "filled_random_no_corner_mask_chunk.png", f"{name}_{fill_type}",
max_threshold=max_threshold, mean_threshold=mean_threshold,
)
@pytest.mark.image
@pytest.mark.threads
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("thread_count", util_test.thread_counts())
def test_filled_random_no_corner_mask_chunk_threads(fill_type: FillType, thread_count: int) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.05)
cont_gen = contour_generator(
x, y, z, name="threaded", fill_type=fill_type, corner_mask=False, chunk_size=2,
thread_count=thread_count,
)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == thread_count
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
if fill_type in (FillType.ChunkCombinedCode, FillType.ChunkCombinedOffset):
max_threshold = 99
mean_threshold = 0.18
else:
max_threshold = 135
mean_threshold = 0.23
compare_images(
image_buffer, "filled_random_no_corner_mask_chunk.png", f"{fill_type}_{thread_count}",
max_threshold=max_threshold, mean_threshold=mean_threshold,
)
@pytest.mark.image
@pytest.mark.parametrize("name", util_test.corner_mask_names())
def test_filled_random_corner_mask(name: str) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.05)
fill_type = FillType.OuterCode
cont_gen = contour_generator(x, y, z, name=name, corner_mask=True, fill_type=fill_type)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (1, 1)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_random_corner_mask.png", f"{name}_{fill_type}")
@pytest.mark.image
@pytest.mark.parametrize("name", util_test.corner_mask_names())
def test_filled_random_corner_mask_chunk(name: str) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.05)
fill_type = FillType.OuterCode
cont_gen = contour_generator(
x, y, z, name=name, corner_mask=True, fill_type=fill_type, chunk_size=2, thread_count=1,
)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == 1
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
max_threshold = None
mean_threshold = None
if name in ("serial", "threaded"):
max_threshold = 135
mean_threshold = 0.17
compare_images(
image_buffer, "filled_random_corner_mask_chunk.png", f"{name}_{fill_type}",
max_threshold=max_threshold, mean_threshold=mean_threshold,
)
@pytest.mark.image
@pytest.mark.threads
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("thread_count", util_test.thread_counts())
def test_filled_random_corner_mask_chunk_threads(fill_type: FillType, thread_count: int) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.05)
fill_type = FillType.OuterCode
cont_gen = contour_generator(
x, y, z, name="threaded", corner_mask=True, fill_type=fill_type, chunk_size=2,
thread_count=thread_count,
)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (15, 20)
assert cont_gen.thread_count == thread_count
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(
image_buffer, "filled_random_corner_mask_chunk.png", f"{fill_type}_{thread_count}",
max_threshold=135, mean_threshold=0.17,
)
@pytest.mark.image
@pytest.mark.parametrize("name", util_test.quad_as_tri_names())
def test_filled_random_quad_as_tri(name: str) -> None:
from contourpy.util.mpl_renderer import MplTestRenderer
from .image_comparison import compare_images
x, y, z = random((30, 40), mask_fraction=0.0)
cont_gen = contour_generator(x, y, z, name=name, quad_as_tri=True)
levels = np.arange(0.0, 1.01, 0.2)
assert cont_gen.thread_count == 1
assert cont_gen.quad_as_tri
fill_type = cont_gen.fill_type
renderer = MplTestRenderer()
renderer.multi_filled(cont_gen.multi_filled(levels), fill_type)
image_buffer = renderer.save_to_buffer()
compare_images(image_buffer, "filled_random_quad_as_tri.png", f"{name}")
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("name", ["serial", "threaded"])
def test_return_by_fill_type(
two_outers_one_hole: tuple[cpy.CoordinateArray, ...],
name: str,
fill_type: FillType,
) -> None:
x, y, z = two_outers_one_hole
cont_gen = contour_generator(x, y, z, name=name, fill_type=fill_type)
assert cont_gen.fill_type == fill_type
assert cont_gen.thread_count == 1
filled = cont_gen.filled(1.0, 2.0)
util_test.assert_filled(filled, fill_type)
# Helper functions to avoid code duplication for the different FillTypes.
def assert_outer_points(points: list[cpy.PointArray]) -> None:
assert isinstance(points, list) and len(points) == 2
assert points[0].shape == (13, 2)
assert points[1].shape == (4, 2)
assert_array_equal(points[0][0], points[0][7])
assert_array_equal(points[0][8], points[0][12])
assert_array_equal(points[1][0], points[1][3])
def assert_chunk_points(points_or_none: list[cpy.PointArray | None]) -> None:
assert isinstance(points_or_none, list) and len(points_or_none) == 1
assert points_or_none[0] is not None
points = points_or_none[0]
assert points.shape == (17, 2)
assert_array_equal(points[0], points[7])
assert_array_equal(points[8], points[12])
assert_array_equal(points[13], points[16])
def assert_chunk_codes(codes_or_none: list[cpy.CodeArray | None]) -> None:
assert isinstance(codes_or_none, list) and len(codes_or_none) == 1
assert codes_or_none[0] is not None
codes = codes_or_none[0]
assert_array_equal(codes, [1, 2, 2, 2, 2, 2, 2, 79, 1, 2, 2, 2, 79, 1, 2, 2, 79])
def assert_chunk_offsets(offsets_or_none: list[cpy.OffsetArray | None]) -> None:
assert isinstance(offsets_or_none, list) and len(offsets_or_none) == 1
assert offsets_or_none[0] is not None
offsets = offsets_or_none[0]
assert_array_equal(offsets, [0, 8, 13, 17])
if fill_type == FillType.OuterCode:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_OuterCode, filled)
assert_outer_points(filled[0])
codes = filled[1]
assert isinstance(codes, list) and len(codes) == 2
assert_array_equal(codes[0], [1, 2, 2, 2, 2, 2, 2, 79, 1, 2, 2, 2, 79])
assert_array_equal(codes[1], [1, 2, 2, 79])
elif fill_type == FillType.OuterOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_OuterOffset, filled)
assert_outer_points(filled[0])
offsets = filled[1]
assert isinstance(offsets, list) and len(offsets) == 2
assert_array_equal(offsets[0], [0, 8, 13])
assert_array_equal(offsets[1], [0, 4])
elif fill_type == FillType.ChunkCombinedCode:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedCode, filled)
assert_chunk_points(filled[0])
assert_chunk_codes(filled[1])
elif fill_type == FillType.ChunkCombinedOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedOffset, filled)
assert_chunk_points(filled[0])
assert_chunk_offsets(filled[1])
elif fill_type == FillType.ChunkCombinedCodeOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedCodeOffset, filled)
assert_chunk_points(filled[0])
assert_chunk_codes(filled[1])
outer_offsets_or_none = filled[2]
assert isinstance(outer_offsets_or_none, list) and len(outer_offsets_or_none) == 1
assert outer_offsets_or_none[0] is not None
assert_array_equal(outer_offsets_or_none[0], [0, 13, 17])
elif fill_type == FillType.ChunkCombinedOffsetOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedOffsetOffset, filled)
assert_chunk_points(filled[0])
assert_chunk_offsets(filled[1])
outer_offsets_or_none = filled[2]
assert isinstance(outer_offsets_or_none, list) and len(outer_offsets_or_none) == 1
assert outer_offsets_or_none[0] is not None
assert_array_equal(outer_offsets_or_none[0], [0, 2, 3])
else:
raise RuntimeError(f"Unexpected fill_type {fill_type}")
@pytest.mark.threads
@pytest.mark.parametrize("fill_type", FillType.__members__.values())
@pytest.mark.parametrize("name, thread_count",
[("serial", 1), ("threaded", 1),
pytest.param("threaded", 2,
marks = pytest.mark.skipif(
max_threads() <= 1, reason = "executing on unicore host"))])
def test_return_by_fill_type_chunk(
xyz_chunk_test: tuple[cpy.CoordinateArray, ...],
name: str,
thread_count: int,
fill_type: FillType,
) -> None:
x, y, z = xyz_chunk_test
cont_gen = contour_generator(
x, y, z, name=name, fill_type=fill_type, chunk_count=2, thread_count=thread_count,
)
assert cont_gen.fill_type == fill_type
assert cont_gen.chunk_count == (2, 2)
assert cont_gen.chunk_size == (2, 2)
assert cont_gen.thread_count == thread_count
filled = cont_gen.filled(0.45, 0.55)
util_test.assert_filled(filled, fill_type)
# Expected points by chunk.
expected: list[cpy.PointArray] = [
np.asarray([[0.0, 0.7], [0.0, 0.5], [1.0, 0.7], [2.0, 0.9], [2.0, 1.0], [2.0, 1.1],
[1.5, 1.0], [1.0, 0.9], [0.0, 0.7]]),
np.asarray([[2.0, 1.0], [2.0, 0.9], [2.5, 1.0], [3.0, 1.1], [4.0, 1.3], [4.0, 1.5],
[3.0, 1.3], [2.0, 1.1], [2.0, 1.0]]),
np.asarray([[1.5, 3.0], [2.0, 2.9], [2.0, 3.0], [2.0, 3.1], [1.0, 3.3], [0.0, 3.5],
[0.0, 3.3], [1.0, 3.1], [1.5, 3.0]]),
np.asarray([[2.0, 3.0], [2.0, 2.9], [3.0, 2.7], [4.0, 2.5], [4.0, 2.7], [3.0, 2.9],
[2.5, 3.0], [2.0, 3.1], [2.0, 3.0]]),
]
# Helper functions to avoid code duplication for the different FillTypes.
def assert_outer_points(points: list[cpy.PointArray], expected: list[cpy.PointArray]) -> None:
assert isinstance(points, list) and len(points) == 4
if name == "threaded" and cont_gen.thread_count > 1:
# Polygons may be in any order so sort lines and expected.
points = util_test.sort_by_first_xy(points)
expected = util_test.sort_by_first_xy(expected)
for chunk in range(4):
assert_allclose(points[chunk], expected[chunk])
def assert_chunk_points(
points_or_none: list[cpy.PointArray | None], expected: list[cpy.PointArray],
) -> None:
assert isinstance(points_or_none, list) and len(points_or_none) == 4
for chunk in range(4):
chunk_points = points_or_none[chunk]
assert chunk_points is not None
assert_allclose(chunk_points, expected[chunk])
def assert_chunk_codes(codes_or_none: list[cpy.CodeArray | None]) -> None:
assert isinstance(codes_or_none, list) and len(codes_or_none) == 4
for chunk in range(4):
chunk_codes = codes_or_none[chunk]
assert chunk_codes is not None
assert_array_equal(chunk_codes, [1, 2, 2, 2, 2, 2, 2, 2, 79])
def assert_chunk_offsets(offsets_or_none: list[cpy.OffsetArray | None]) -> None:
assert isinstance(offsets_or_none, list) and len(offsets_or_none) == 4
for chunk in range(4):
chunk_offsets = offsets_or_none[chunk]
assert chunk_offsets is not None
assert_array_equal(chunk_offsets, [0, 9])
if fill_type == FillType.OuterCode:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_OuterCode, filled)
assert_outer_points(filled[0], expected)
codes = filled[1]
assert isinstance(codes, list) and len(codes) == 4
for chunk in range(4):
assert_array_equal(codes[chunk], [1, 2, 2, 2, 2, 2, 2, 2, 79])
elif fill_type == FillType.OuterOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_OuterOffset, filled)
assert_outer_points(filled[0], expected)
offsets = filled[1]
assert isinstance(offsets, list) and len(offsets) == 4
for chunk in range(4):
assert_array_equal(offsets[chunk], [0, 9])
elif fill_type == FillType.ChunkCombinedCode:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedCode, filled)
assert_chunk_points(filled[0], expected)
assert_chunk_codes(filled[1])
elif fill_type == FillType.ChunkCombinedOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedOffset, filled)
assert_chunk_points(filled[0], expected)
assert_chunk_offsets(filled[1])
elif fill_type == FillType.ChunkCombinedCodeOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedCodeOffset, filled)
assert_chunk_points(filled[0], expected)
assert_chunk_codes(filled[1])
outer_offsets_or_none = filled[2]
assert isinstance(outer_offsets_or_none, list) and len(outer_offsets_or_none) == 4
for chunk in range(4):
chunk_outer_offsets = outer_offsets_or_none[chunk]
assert chunk_outer_offsets is not None
assert_array_equal(chunk_outer_offsets, [0, 9])
elif fill_type == FillType.ChunkCombinedOffsetOffset:
if TYPE_CHECKING:
filled = cast(cpy.FillReturn_ChunkCombinedOffsetOffset, filled)
assert_chunk_points(filled[0], expected)
assert_chunk_offsets(filled[1])
outer_offsets_or_none = filled[2]
assert isinstance(outer_offsets_or_none, list) and len(outer_offsets_or_none) == 4
for chunk in range(4):
chunk_outer_offsets = outer_offsets_or_none[chunk]
assert chunk_outer_offsets is not None
assert_array_equal(chunk_outer_offsets, [0, 1])
else:
raise RuntimeError(f"Unexpected fill_type {fill_type}")
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
@pytest.mark.parametrize("corner_mask", [None, False, True])
def test_filled_random_big(name: str, fill_type: FillType, corner_mask: bool | None) -> None:
if corner_mask and name in ["mpl2005", "mpl2014"]:
pytest.skip()
x, y, z = random((1000, 1000), mask_fraction=0.0 if corner_mask is None else 0.05)
cont_gen = contour_generator(
x, y, z, name=name, corner_mask=corner_mask if isinstance(corner_mask, bool) else False,
fill_type=fill_type,
)
levels = np.arange(0.0, 1.01, 0.1)
assert cont_gen.fill_type == fill_type
for i in range(len(levels)-1):
filled = cont_gen.filled(levels[i], levels[i+1])
util_test.assert_filled(filled, fill_type)
@pytest.mark.slow
@pytest.mark.parametrize("seed", np.arange(10))
def test_filled_compare_slow(seed: int) -> None:
x, y, z = random((1000, 1000), mask_fraction=0.05, seed=seed)
levels = np.arange(0.0, 1.01, 0.1)
cont_gen_mpl2014 = contour_generator(x, y, z, name="mpl2014", corner_mask=True)
cont_gen_serial = contour_generator(
x, y, z, name="serial", corner_mask=True, fill_type=FillType.ChunkCombinedOffsetOffset)
assert cont_gen_mpl2014.fill_type == FillType.OuterCode
assert cont_gen_serial.fill_type == FillType.ChunkCombinedOffsetOffset
for i in range(len(levels)-1):
filled_mpl2014 = cont_gen_mpl2014.filled(levels[i], levels[i+1])
util_test.assert_filled(filled_mpl2014, cont_gen_mpl2014.fill_type)
filled_serial = cont_gen_serial.filled(levels[i], levels[i+1])
util_test.assert_filled(filled_serial, cont_gen_serial.fill_type)
if TYPE_CHECKING:
filled_mpl2014 = cast(cpy.FillReturn_OuterCode, filled_mpl2014)
filled_serial = cast(cpy.FillReturn_ChunkCombinedOffsetOffset, filled_serial)
# Check same results obtained for each in terms of number of points, etc.
code_list = filled_mpl2014[1]
n_points = reduce(add, map(len, code_list))
n_outers = len(code_list)
n_lines = reduce(add, (np.count_nonzero(c == 1) for c in code_list))
assert filled_serial[0][0] is not None
assert n_points == len(filled_serial[0][0])
assert filled_serial[1][0] is not None
assert n_lines == len(filled_serial[1][0]) - 1
assert filled_serial[2][0] is not None
assert n_outers == len(filled_serial[2][0]) - 1
@pytest.mark.parametrize("name", util_test.all_names())
@pytest.mark.parametrize("z", [np.nan, -np.nan, np.inf, -np.inf])
@pytest.mark.parametrize("lower_level", [0.0, np.inf, -np.inf])
@pytest.mark.parametrize("upper_level", [0.0, np.inf, -np.inf])
def test_filled_z_nonfinite(name: str, z: float, lower_level: float, upper_level: float) -> None:
cont_gen = contour_generator(z=[[z, z], [z, z]], name=name, fill_type=FillType.OuterCode)
if lower_level >= upper_level:
with pytest.raises(ValueError, match="upper_level must be larger than lower_level"):
cont_gen.filled(lower_level, upper_level)
else:
filled = cont_gen.filled(lower_level, upper_level)
assert filled == ([], [])
@pytest.mark.parametrize("name", util_test.all_names())
def test_filled_infinite_level(name: str) -> None:
levels_all = [(0.5, np.inf), (-np.inf, 0.5), (-np.inf, np.inf)]
if name == "mpl2014":
expected_all = [
np.array([[1, 0.5], [1, 1], [0, 1], [0, 0.5], [1, 0.5]]),
np.array([[1, 0], [1, 0.5], [0, 0.5], [0, 0], [1, 0]]),
np.array([[1, 0], [1, 1], [0, 1], [0, 0], [1, 0]]),
]
else:
expected_all = [
np.array([[0, 1], [0, 0.5], [1, 0.5], [1, 1], [0, 1]]),
np.array([[0, 0], [1, 0], [1, 0.5], [0, 0.5], [0, 0]]),
np.array([[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]]),
]
cont_gen = contour_generator(z=[[0, 0], [1, 1]], name=name, fill_type=FillType.OuterCode)
for (lower_level, upper_level), expected in zip(levels_all, expected_all):
filled = cont_gen.filled(lower_level, upper_level)
assert len(filled[0]) == 1 # Single polygon
points = filled[0][0]
assert isinstance(points, np.ndarray)
assert_allclose(points, expected)
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
def test_multi_filled_invalid_levels(name: str, fill_type: FillType) -> None:
z = [[1, 2], [3, 4]]
cont_gen = contour_generator(z=z, name=name, fill_type=fill_type)
with pytest.raises(ValueError, match=r"Levels array must be 1D not 2D"):
cont_gen.multi_filled([[1, 2]])
with pytest.raises(ValueError, match=r"Levels array must be 1D not 3D"):
cont_gen.multi_filled([[[1], [2]]])
with pytest.raises(ValueError, match=r"Levels array must have at least 2 elements, not 1"):
cont_gen.multi_filled([1])
with pytest.raises(ValueError, match=r"Levels array must have at least 2 elements, not 0"):
cont_gen.multi_filled([])
for levels in (
[0, np.nan],
[np.nan, 0],
[np.nan, np.nan],
):
with pytest.raises(ValueError, match=r"Levels must not contain any NaN"):
cont_gen.multi_filled(levels)
for levels in (
[1.0, 1],
[1, 0.99],
[0, -np.inf],
[np.inf, 0],
[np.inf, -np.inf],
):
with pytest.raises(ValueError, match=r"Levels must be increasing"):
cont_gen.multi_filled(levels)
@pytest.mark.parametrize("name, fill_type", util_test.all_names_and_fill_types())
@pytest.mark.parametrize("corner_mask", [None, False, True])
def test_multi_filled_levels_type(name: str, fill_type: FillType, corner_mask: bool | None) -> None:
if corner_mask and name in ["mpl2005", "mpl2014"]:
pytest.skip()
z = random((10, 10), mask_fraction=0.0 if corner_mask is None else 0.05)[2]*4
cont_gen = contour_generator(z=z, name=name, corner_mask=corner_mask, fill_type=fill_type)
levels = [2, 3, 4]
# Reference result using filled() not multi_filled().
reference = [cont_gen.filled(lower, upper) for lower, upper in pairwise(levels)]
# List.
util_test.assert_equal_recursive(reference, cont_gen.multi_filled(list(levels)))
# Tuple.
util_test.assert_equal_recursive(reference, cont_gen.multi_filled(tuple(levels)))
# Numpy array of floats.
util_test.assert_equal_recursive(
reference, cont_gen.multi_filled(np.asarray(levels, dtype=np.float64)),
)
# Numpy array of ints.
util_test.assert_equal_recursive(
reference, cont_gen.multi_filled(np.asarray(levels, dtype=np.int64)),
)
# Slice of larger numpy array.
levels2 = np.array([1.5, 2, 2.5, 3, 3.5, 4, 4.5])
util_test.assert_equal_recursive(reference, cont_gen.multi_filled(levels2[1::2]))
|