Skip to content

Commit 8fc0dd4

Browse files
mattseddonmattseddon
committed
separate color test
1 parent 740c349 commit 8fc0dd4

File tree

1 file changed

+161
-57
lines changed

1 file changed

+161
-57
lines changed

‎tests/test_vega.py

Lines changed: 161 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -729,13 +729,6 @@ def test_optional_anchors_confusion(
729729
"field": "acc",
730730
"loss": 0.1,
731731
},
732-
{
733-
"rev": "C",
734-
"acc": "0.1",
735-
"filename": "test",
736-
"field": "acc",
737-
"loss": 2,
738-
},
739732
],
740733
"acc",
741734
["rev", "acc", "loss"],
@@ -763,20 +756,6 @@ def test_optional_anchors_confusion(
763756
"field": "acc",
764757
"loss": "200121",
765758
},
766-
{
767-
"rev": "C",
768-
"acc": "0.1",
769-
"filename": "train",
770-
"field": "acc",
771-
"loss": "10",
772-
},
773-
{
774-
"rev": "C",
775-
"acc": "0.1",
776-
"filename": "test",
777-
"field": "acc",
778-
"loss": "100",
779-
},
780759
],
781760
"acc",
782761
["rev", "acc", "filename", "loss"],
@@ -823,24 +802,6 @@ def test_optional_anchors_confusion(
823802
"field": "train_acc",
824803
"loss": 0.1,
825804
},
826-
{
827-
"rev": "C",
828-
"dvc_inferred_y_value": "0.1",
829-
"train_acc": "0.1",
830-
"test_acc": "0.2",
831-
"filename": "data",
832-
"field": "acc",
833-
"loss": 2,
834-
},
835-
{
836-
"rev": "C",
837-
"dvc_inferred_y_value": "0.2",
838-
"train_acc": "0.1",
839-
"test_acc": "0.2",
840-
"filename": "data",
841-
"field": "acc",
842-
"loss": 2,
843-
},
844805
],
845806
"dvc_inferred_y_value",
846807
["rev", "dvc_inferred_y_value", "train_acc", "test_acc", "loss"],
@@ -885,22 +846,6 @@ def test_optional_anchors_confusion(
885846
"field": "train_acc",
886847
"loss": 0.1,
887848
},
888-
{
889-
"rev": "C",
890-
"dvc_inferred_y_value": "0.2",
891-
"test_acc": "0.2",
892-
"filename": "test_acc",
893-
"field": "acc",
894-
"loss": 2,
895-
},
896-
{
897-
"rev": "C",
898-
"dvc_inferred_y_value": "0.2",
899-
"train_acc": "0.1",
900-
"filename": "train_acc",
901-
"field": "acc",
902-
"loss": 2,
903-
},
904849
],
905850
"dvc_inferred_y_value",
906851
["rev", "dvc_inferred_y_value", "train_acc", "test_acc", "loss"],
@@ -935,7 +880,7 @@ def test_optional_anchors_scatter(
935880
): # pylint: disable=too-many-arguments
936881
props = {
937882
"anchors_y_definitions": anchors_y_definitions,
938-
"revs_with_datapoints": ["B", "C"],
883+
"revs_with_datapoints": ["B"],
939884
"template": "scatter",
940885
"x": "loss",
941886
"y": y,
@@ -949,7 +894,7 @@ def test_optional_anchors_scatter(
949894
assert plot_content["data"]["values"] == expected_datapoints
950895
assert plot_content["encoding"]["color"] == {
951896
"field": "rev",
952-
"scale": {"domain": ["B", "C"], "range": OPTIONAL_ANCHOR_RANGES["color"][0:2]},
897+
"scale": {"domain": ["B"], "range": OPTIONAL_ANCHOR_RANGES["color"][0:1]},
953898
}
954899
assert plot_content["encoding"]["shape"] == shape_encoding
955900
assert plot_content["encoding"]["tooltip"] == tooltip_encoding
@@ -962,6 +907,165 @@ def test_optional_anchors_scatter(
962907
]
963908

964909

910+
@pytest.mark.parametrize(
911+
",".join(
912+
[
913+
"revs",
914+
"datapoints",
915+
]
916+
),
917+
(
918+
pytest.param(
919+
["B"],
920+
[
921+
{
922+
"rev": "B",
923+
"acc": "0.05",
924+
"step": "1",
925+
"filename": "acc",
926+
"field": "acc",
927+
},
928+
],
929+
id="rev_count_1",
930+
),
931+
pytest.param(
932+
["B", "C", "D", "E", "F"],
933+
[
934+
{
935+
"rev": "B",
936+
"acc": "0.05",
937+
"step": "1",
938+
"filename": "acc",
939+
"field": "acc",
940+
},
941+
{
942+
"rev": "C",
943+
"acc": "0.1",
944+
"step": "1",
945+
"filename": "acc",
946+
"field": "acc",
947+
},
948+
{
949+
"rev": "D",
950+
"acc": "0.06",
951+
"step": "1",
952+
"filename": "acc",
953+
"field": "acc",
954+
},
955+
{
956+
"rev": "E",
957+
"acc": "0.6",
958+
"step": "1",
959+
"filename": "acc",
960+
"field": "acc",
961+
},
962+
{
963+
"rev": "F",
964+
"acc": "1.0",
965+
"step": "1",
966+
"filename": "acc",
967+
"field": "acc",
968+
},
969+
],
970+
id="rev_count_5",
971+
),
972+
pytest.param(
973+
["B", "C", "D", "E", "F", "G", "H", "I", "J"],
974+
[
975+
{
976+
"rev": "B",
977+
"acc": "0.05",
978+
"step": "1",
979+
"filename": "acc",
980+
"field": "acc",
981+
},
982+
{
983+
"rev": "C",
984+
"acc": "0.1",
985+
"step": "1",
986+
"filename": "acc",
987+
"field": "acc",
988+
},
989+
{
990+
"rev": "D",
991+
"acc": "0.06",
992+
"step": "1",
993+
"filename": "acc",
994+
"field": "acc",
995+
},
996+
{
997+
"rev": "E",
998+
"acc": "0.6",
999+
"step": "1",
1000+
"filename": "acc",
1001+
"field": "acc",
1002+
},
1003+
{
1004+
"rev": "F",
1005+
"acc": "1.0",
1006+
"step": "1",
1007+
"filename": "acc",
1008+
"field": "acc",
1009+
},
1010+
{
1011+
"rev": "G",
1012+
"acc": "0.006",
1013+
"step": "1",
1014+
"filename": "acc",
1015+
"field": "acc",
1016+
},
1017+
{
1018+
"rev": "H",
1019+
"acc": "0.00001",
1020+
"step": "1",
1021+
"filename": "acc",
1022+
"field": "acc",
1023+
},
1024+
{
1025+
"rev": "I",
1026+
"acc": "0.8",
1027+
"step": "1",
1028+
"filename": "acc",
1029+
"field": "acc",
1030+
},
1031+
{
1032+
"rev": "J",
1033+
"acc": "0.001",
1034+
"step": "1",
1035+
"filename": "acc",
1036+
"field": "acc",
1037+
},
1038+
],
1039+
id="rev_count_9",
1040+
),
1041+
),
1042+
)
1043+
def test_color_anchor(revs, datapoints):
1044+
props = {
1045+
"anchors_y_definitions": [{"filename": "acc", "field": "acc"}],
1046+
"revs_with_datapoints": revs,
1047+
"template": "linear",
1048+
"x": "step",
1049+
"y": "acc",
1050+
}
1051+
1052+
renderer = VegaRenderer(datapoints, "foo", **props)
1053+
plot_content = renderer.get_filled_template()
1054+
1055+
colors = OPTIONAL_ANCHOR_RANGES["color"]
1056+
range = colors[0 : len(revs)]
1057+
if len(revs) > len(colors):
1058+
range.extend(colors[0 : len(revs) - len(colors)])
1059+
1060+
assert plot_content["encoding"]["color"] == {
1061+
"field": "rev",
1062+
"scale": {
1063+
"domain": revs,
1064+
"range": range,
1065+
},
1066+
}
1067+
1068+
9651069
@pytest.mark.parametrize(
9661070
",".join(
9671071
[

0 commit comments

Comments
 (0)