| Accepted proposal ID |
@@ -45,9 +45,9 @@ All proposals
| ID |
From |
- P1 |
- P2 |
- P3 |
+ {{P1}} |
+ {{P2}} |
+ {{P3}} |
diff --git a/live_bargaining/Info.html b/live_bargaining/Info.html
index 05ed712..d048c12 100644
--- a/live_bargaining/Info.html
+++ b/live_bargaining/Info.html
@@ -20,7 +20,7 @@
In this round, unlike in previous rounds, adding Player 5 has no impact on the budget.
{{ endif }}
- In this round you are Player {{ player.id_in_group }}.
+ In this round you are Player {{ player_name }}.
Remember, payoffs are determined as follows:
diff --git a/live_bargaining/__init__.py b/live_bargaining/__init__.py
index 6dccf97..c10a50a 100644
--- a/live_bargaining/__init__.py
+++ b/live_bargaining/__init__.py
@@ -45,10 +45,6 @@ class C(BaseConstants):
PLAYERS_PER_GROUP = 3
NUM_ROUNDS = 5 # todo: adjust for main experiment
- BIG_ROLE = "Player 1"
- SMALL1_ROLE = "Player 2"
- SMALL2_ROLE = "Player 3"
-
class Subsession(BaseSubsession):
start_time = models.FloatField(initial=float("inf")) # type: ignore
@@ -179,16 +175,37 @@ def check_proposal_validity(player: Player, members, allocations):
}
}
- if not big_player_included and sum(allocations) > 0:
+ last_player_is_dummy = len(prod_fct) == C.PLAYERS_PER_GROUP - 1
+
+ if not last_player_is_dummy and not big_player_included and sum(allocations) > 0:
+ return {
+ player.id_in_group: {
+ "type": "error",
+ "content": (
+ "Invalid allocation: allocation has to be zero when "
+ f"Player {player.session.config['player_names']['P1']} is not included"
+ ),
+ }
+ }
+
+ if (
+ last_player_is_dummy
+ and not (members[0] and members[1])
+ and sum(allocations) > 0
+ ):
return {
player.id_in_group: {
"type": "error",
- "content": "Invalid allocation: allocation has to be zero when Player 1 is not included", # noqa: E501
+ "content": (
+ "Invalid allocation: allocation has to be zero when Players "
+ f"{player.session.config['player_names']['P1']} and "
+ f"{player.session.config['player_names']['P2']} are not included"
+ ),
}
}
num_small_players = coalition_size - big_player_included
- if len(prod_fct) == C.PLAYERS_PER_GROUP - 1: # last player is a dummy player
+ if last_player_is_dummy: # last player is a dummy player
num_small_players -= members[-1] # the dummy player is always last
if sum(allocations) > prod_fct[num_small_players]:
@@ -246,7 +263,10 @@ def create_acceptance_data(group: Group):
class Info(Page):
@staticmethod
def vars_for_template(player: Player):
- return dict(actual_round_number=player.subsession.round_number - 1)
+ return dict(
+ actual_round_number=player.subsession.round_number - 1,
+ player_name=player.session.config["player_names"][f"P{player.id_in_group}"],
+ )
@staticmethod
def js_vars(player: Player):
@@ -279,6 +299,7 @@ def js_vars(player: Player):
my_id=player.id_in_group,
prod_fct=list(player.session.config["prod_fct"].values()),
prod_fct_labels=list(player.session.config["prod_fct"].keys()),
+ player_names=player.session.config["player_names"],
)
@staticmethod
@@ -286,7 +307,9 @@ def vars_for_template(player: Player):
return dict(
last_player_is_dummy=len(player.session.config["prod_fct"])
== C.PLAYERS_PER_GROUP - 1,
+ player_name=player.session.config["player_names"][f"P{player.id_in_group}"],
actual_round_number=player.subsession.round_number - 1,
+ **player.session.config["player_names"],
)
@staticmethod
@@ -377,12 +400,14 @@ def js_vars(player: Player):
acceptances=acceptance_data["acceptances"],
coalition_members=acceptance_data["coalition_members"],
payoffs=acceptance_data["payoffs"],
+ player_names=player.session.config["player_names"],
)
@staticmethod
def vars_for_template(player: Player):
return dict(
payoff_to_display=f"CHF {player.payoff_this_round:.2f}",
+ **player.session.config["player_names"],
)
diff --git a/live_bargaining/tests.py b/live_bargaining/tests.py
index cc904a6..cb99239 100644
--- a/live_bargaining/tests.py
+++ b/live_bargaining/tests.py
@@ -39,7 +39,7 @@ def create_offers(method, Y):
)
-def test_invalid_input(method, Y, dummy_player=False):
+def test_invalid_input(method, Y, dummy_player, player_names):
non_existing_offer = method(1, {"type": "accept", "offer_id": 1})
expect(
non_existing_offer,
@@ -69,8 +69,8 @@ def test_invalid_input(method, Y, dummy_player=False):
2,
{
"type": "propose",
- "members": [True, False, True],
- "allocations": [50, 0, 50],
+ "members": [True, True, True],
+ "allocations": [50, 50, 10],
},
)
expect(
@@ -91,15 +91,26 @@ def test_invalid_input(method, Y, dummy_player=False):
"allocations": [0, 50, 50],
},
)
- expect(
- p1_not_included,
- {
- 3: {
- "type": "error",
- "content": "Invalid allocation: allocation has to be zero when Player 1 is not included",
- }
- },
- )
+ if not dummy_player:
+ expect(
+ p1_not_included,
+ {
+ 3: {
+ "type": "error",
+ "content": f"Invalid allocation: allocation has to be zero when Player {player_names['P1']} is not included",
+ }
+ },
+ )
+ else:
+ expect(
+ p1_not_included,
+ {
+ 3: {
+ "type": "error",
+ "content": f"Invalid allocation: allocation has to be zero when Players {player_names['P1']} and {player_names['P2']} are not included",
+ }
+ },
+ )
invalid_allocaion_negative = method(
1,
@@ -179,12 +190,13 @@ def call_live_method(method, **kwargs):
)
prod_fct = kwargs["group"].session.config["prod_fct"]
+ player_names = kwargs["group"].session.config["player_names"]
Y = list(prod_fct.values())[1]
dummy_player = len(prod_fct) == 2
if kwargs["round_number"] == 1:
print("Testing invalid input")
- test_invalid_input(method, Y, dummy_player)
+ test_invalid_input(method, Y, dummy_player, player_names)
if kwargs["round_number"] == 2:
print("Testing grand coalition")
diff --git a/settings.py b/settings.py
index c706e3b..c2a47d7 100644
--- a/settings.py
+++ b/settings.py
@@ -13,10 +13,15 @@
num_demo_participants=3,
seconds_per_round=5 * 60,
prod_fct={
- "{P2,\xa0P3}": 0,
- "{P1,\xa0P2},\n{P1,\xa0P3}": 10,
+ "{B1,\xa0B2}": 0,
+ "{A,\xa0B1},\n{A,\xa0B2}": 10,
"Everyone": 100,
},
+ player_names={
+ "P1": "A",
+ "P2": "B1",
+ "P3": "B2",
+ },
doc="Treatment with production function [0, 10, 100]",
),
dict(
@@ -26,10 +31,15 @@
num_demo_participants=3,
seconds_per_round=5 * 60,
prod_fct={
- "{P2,\xa0P3}": 0,
- "{P1,\xa0P2}, {P1,\xa0P3}": 30,
+ "{B1,\xa0B2}": 0,
+ "{A,\xa0B1}, {A,\xa0B2}": 30,
"Everyone": 100,
},
+ player_names={
+ "P1": "A",
+ "P2": "B1",
+ "P3": "B2",
+ },
doc="Treatment with production function [0, 30, 100]",
),
dict(
@@ -39,10 +49,15 @@
num_demo_participants=3,
seconds_per_round=5 * 60,
prod_fct={
- "{P2,\xa0P3}": 0,
- "{P1,\xa0P2}, {P1,\xa0P3}": 90,
+ "{B1,\xa0B2}": 0,
+ "{A,\xa0B1}, {A,\xa0B2}": 90,
"Everyone": 100,
},
+ player_names={
+ "P1": "A",
+ "P2": "B1",
+ "P3": "B2",
+ },
doc="Treatment with production function [0, 90, 100]",
),
dict(
@@ -52,8 +67,13 @@
num_demo_participants=3,
seconds_per_round=5 * 60,
prod_fct={
- "{P1,\xa0P3}, {P2,\xa0P3}": 0,
- "{P1,\xa0P2}, Everyone": 100,
+ "{A1,\xa0B}, {A2,\xa0B}": 0,
+ "{A1,\xa0A2}, Everyone": 100,
+ },
+ player_names={
+ "P1": "A1",
+ "P2": "A2",
+ "P3": "B",
},
doc="Treatment with production function [0, 100] and P3 as dummy player",
),