@@ -466,23 +466,20 @@ def test_lcp_behavior_double():
466466 games .create_2x2_zero_sum_efg (),
467467 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]]
468468 ),
469- pytest . param (
469+ (
470470 games .create_2x2_zero_sum_efg (missing_term_outcome = True ),
471471 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]],
472- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
473472 ),
474473 (games .create_matching_pennies_efg (),
475474 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]]),
476- pytest . param (
475+ (
477476 games .create_matching_pennies_efg (with_neutral_outcome = True ),
478477 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]],
479- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
480478 ),
481479 (games .create_stripped_down_poker_efg (), [[[1 , 0 ], ["1/3" , "2/3" ]], [["2/3" , "1/3" ]]]),
482- pytest . param (
480+ (
483481 games .create_stripped_down_poker_efg (nonterm_outcomes = True ),
484482 [[[1 , 0 ], ["1/3" , "2/3" ]], [["2/3" , "1/3" ]]],
485- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
486483 ),
487484 (
488485 games .create_kuhn_poker_efg (),
@@ -498,7 +495,7 @@ def test_lcp_behavior_double():
498495 [[1 , 0 ], ["2/3" , "1/3" ], [0 , 1 ], [0 , 1 ], ["2/3" , "1/3" ], [1 , 0 ]],
499496 ],
500497 ),
501- pytest . param (
498+ (
502499 games .create_kuhn_poker_efg (nonterm_outcomes = True ),
503500 [
504501 [
@@ -511,7 +508,6 @@ def test_lcp_behavior_double():
511508 ],
512509 [[1 , 0 ], ["2/3" , "1/3" ], [0 , 1 ], [0 , 1 ], ["2/3" , "1/3" ], [1 , 0 ]],
513510 ],
514- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
515511 ),
516512 # In the next test case:
517513 # 1/2-1/2 for l/r is determined by MixedBehaviorProfile.UndefinedToCentroid()
@@ -534,13 +530,12 @@ def test_lcp_behavior_double():
534530 [["2/3" , "1/3" ], ["1/3" , "2/3" ], ["1/3" , "2/3" ]],
535531 ]
536532 ),
537- pytest . param (
533+ (
538534 games .create_three_action_internal_outcomes_efg (nonterm_outcomes = True ),
539535 [
540536 [["1/3" , 0 , "2/3" ], ["2/3" , 0 , "1/3" ]],
541537 [["2/3" , "1/3" ], ["1/3" , "2/3" ], ["1/3" , "2/3" ]],
542538 ],
543- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
544539 ),
545540 (
546541 games .create_large_payoff_game_efg (),
@@ -557,13 +552,12 @@ def test_lcp_behavior_double():
557552 [[1 , 0 ], ["6/11" , "5/11" ]]
558553 ]
559554 ),
560- pytest . param (
555+ (
561556 games .create_chance_in_middle_efg (nonterm_outcomes = True ),
562557 [
563558 [["3/11" , "8/11" ], [1 , 0 ], [1 , 0 ], [1 , 0 ], [1 , 0 ]],
564559 [[1 , 0 ], ["6/11" , "5/11" ]]
565560 ],
566- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
567561 ),
568562 # Non-zero-sum games
569563 (
@@ -586,19 +580,17 @@ def test_lcp_behavior_double():
586580 games .create_entry_accomodation_efg (),
587581 [[["2/3" , "1/3" ], [1 , 0 ], [1 , 0 ]], [["2/3" , "1/3" ]]]
588582 ),
589- pytest . param (
583+ (
590584 games .create_entry_accomodation_efg (nonterm_outcomes = True ),
591585 [[["2/3" , "1/3" ], [1 , 0 ], [1 , 0 ]], [["2/3" , "1/3" ]]],
592- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
593586 ),
594587 (
595588 games .create_non_zero_sum_lacking_outcome_efg (),
596589 [[["1/3" , "2/3" ]], [["1/2" , "1/2" ]]]
597590 ),
598- pytest . param (
591+ (
599592 games .create_non_zero_sum_lacking_outcome_efg (missing_term_outcome = True ),
600593 [[["1/3" , "2/3" ]], [["1/2" , "1/2" ]]],
601- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
602594 ),
603595 ],
604596)
@@ -677,35 +669,31 @@ def test_lp_behavior_double():
677669 games .create_two_player_perfect_info_win_lose_efg (),
678670 [[[0 , 1 ], [1 , 0 ]], [[1 , 0 ], [1 , 0 ]]],
679671 ),
680- pytest . param (
672+ (
681673 games .create_two_player_perfect_info_win_lose_efg (nonterm_outcomes = True ),
682674 [[[0 , 1 ], [1 , 0 ]], [[1 , 0 ], [1 , 0 ]]],
683- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
684675 ),
685676 (
686677 games .create_2x2_zero_sum_efg (missing_term_outcome = False ),
687678 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]]
688679 ),
689- pytest . param (
680+ (
690681 games .create_2x2_zero_sum_efg (missing_term_outcome = True ),
691682 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]],
692- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
693683 ),
694684 (games .create_matching_pennies_efg (with_neutral_outcome = False ),
695685 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]]),
696- pytest . param (
686+ (
697687 games .create_matching_pennies_efg (with_neutral_outcome = True ),
698688 [[["1/2" , "1/2" ]], [["1/2" , "1/2" ]]],
699- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
700689 ),
701690 (
702691 games .create_stripped_down_poker_efg (),
703692 [[[1 , 0 ], ["1/3" , "2/3" ]], [["2/3" , "1/3" ]]],
704693 ),
705- pytest . param (
694+ (
706695 games .create_stripped_down_poker_efg (nonterm_outcomes = True ),
707696 [[[1 , 0 ], ["1/3" , "2/3" ]], [["2/3" , "1/3" ]]],
708- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
709697 ),
710698 (
711699 games .create_kuhn_poker_efg (),
@@ -714,7 +702,7 @@ def test_lp_behavior_double():
714702 [[1 , 0 ], ["2/3" , "1/3" ], [0 , 1 ], [0 , 1 ], ["2/3" , "1/3" ], [1 , 0 ]],
715703 ],
716704 ),
717- pytest . param (
705+ (
718706 games .create_kuhn_poker_efg (nonterm_outcomes = True ),
719707 [
720708 [
@@ -727,7 +715,6 @@ def test_lp_behavior_double():
727715 ],
728716 [[1 , 0 ], ["2/3" , "1/3" ], [0 , 1 ], [0 , 1 ], ["2/3" , "1/3" ], [1 , 0 ]],
729717 ],
730- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
731718 ),
732719 (
733720 games .create_seq_form_STOC_paper_zero_sum_2_player_efg (),
@@ -747,13 +734,12 @@ def test_lp_behavior_double():
747734 [["2/3" , "1/3" ], ["2/3" , "1/3" ], ["1/3" , "2/3" ]],
748735 ]
749736 ),
750- pytest . param (
737+ (
751738 games .create_three_action_internal_outcomes_efg (nonterm_outcomes = True ),
752739 [
753740 [["1/3" , 0 , "2/3" ], ["2/3" , 0 , "1/3" ]],
754741 [["2/3" , "1/3" ], ["2/3" , "1/3" ], ["1/3" , "2/3" ]],
755742 ],
756- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
757743 ),
758744 (
759745 games .create_large_payoff_game_efg (),
@@ -770,13 +756,12 @@ def test_lp_behavior_double():
770756 [[1 , 0 ], ["6/11" , "5/11" ]]
771757 ],
772758 ),
773- pytest . param (
759+ (
774760 games .create_chance_in_middle_efg (nonterm_outcomes = True ),
775761 [
776762 [["3/11" , "8/11" ], [1 , 0 ], [1 , 0 ], [1 , 0 ], [1 , 0 ]],
777763 [[1 , 0 ], ["6/11" , "5/11" ]]
778764 ],
779- marks = pytest .mark .xfail (reason = "Problem with non-standard outcomes" )
780765 ),
781766 ],
782767)
0 commit comments