Skip to content

Commit

Permalink
Fix ticket-price usage from parameters (#526)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeandemeusy authored Jun 6, 2024
1 parent 8c728e2 commit f9633b1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions ct-app/core/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ async def apply_economic_model(self):
)

model = EconomicModel.fromParameters(self.params.economicModel)
model.budget.ticket_price = await self.ticket_price.get()

redeemed_rewards = await self.peer_rewards.get()

Expand Down
7 changes: 3 additions & 4 deletions ct-app/core/model/economic_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,14 @@ def __init__(
period: float,
s: float,
distribution_per_period: float,
ticket_price: float,
winning_probability: float,
):
self.amount = amount
self.period = period
self.s = s
self.distribution_per_period = distribution_per_period
self.ticket_price = ticket_price
self.winning_probability = winning_probability
self.ticket_price = None

@property
def amount(self):
Expand Down Expand Up @@ -102,7 +101,8 @@ def distribution_per_period(self, value):
@ticket_price.setter
def ticket_price(self, value):
self._ticket_price = value
TICKET_PRICE.set(value)
if value is not None:
TICKET_PRICE.set(value)

@winning_probability.setter
def winning_probability(self, value):
Expand All @@ -116,7 +116,6 @@ def fromParameters(cls, parameters: Parameters):
parameters.period,
parameters.s,
parameters.countsInPeriod,
parameters.ticketPrice,
parameters.winningProbability,
)

Expand Down

0 comments on commit f9633b1

Please sign in to comment.