diff --git a/src/pytal/assess.py b/src/pytal/assess.py index af91408..36c62aa 100644 --- a/src/pytal/assess.py +++ b/src/pytal/assess.py @@ -70,9 +70,7 @@ def assess(country, regions, option, global_parameters, country_parameters, cost else: region['cost_per_sp_user'] = 0 - #revenue cost ratio = expenses / revenue - region['bcr'] = calculate_benefit_cost_ratio(region, country_parameters) - + #apply cross subsidy region = allocate_available_excess(region) available_for_cross_subsidy += region['available_cross_subsidy'] diff --git a/tests/test_assess.py b/tests/test_assess.py index cba3802..3aabd9b 100644 --- a/tests/test_assess.py +++ b/tests/test_assess.py @@ -1,6 +1,6 @@ import pytest from pytal.assess import (get_administration_cost, - get_spectrum_costs, calculate_tax, calculate_profit, calculate_benefit_cost_ratio, + get_spectrum_costs, calculate_tax, calculate_profit, assess, estimate_subsidies, allocate_available_excess) @@ -170,14 +170,12 @@ def test_assess(setup_option, setup_global_parameters, setup_country_parameters, assert answer[0]['total_revenue'] == 20000 assert answer[0]['network_cost'] == 5000 - # assert answer[0]['subs_acquisition'] == 500 assert answer[0]['spectrum_cost'] == 3000 assert answer[0]['tax'] == 1250 assert answer[0]['profit_margin'] == 1850 assert answer[0]['total_cost'] == 12100.0 assert answer[0]['available_cross_subsidy'] == 7900.0 assert answer[0]['used_cross_subsidy'] == 0 - assert answer[0]['bcr'] == 1.8018018018018018 assert answer[0]['required_state_subsidy'] == 0 assert answer[1]['total_revenue'] == 12000 @@ -188,7 +186,6 @@ def test_assess(setup_option, setup_global_parameters, setup_country_parameters, assert answer[1]['total_cost'] == 15400 assert answer[1]['available_cross_subsidy'] == 0 assert answer[1]['used_cross_subsidy'] == 3400.0 - assert answer[1]['bcr'] == 0.8695652173913043 assert answer[1]['required_state_subsidy'] == 0 regions = [ diff --git a/tests/test_supply.py b/tests/test_supply.py index deed626..5396ddc 100644 --- a/tests/test_supply.py +++ b/tests/test_supply.py @@ -183,7 +183,7 @@ def test_estimate_supply( setup_ci ) - assert round(answer[0]['site_density'], 1) == 0.9 + assert round(answer[0]['network_site_density'], 1) == 0.9 def test_estimate_backhaul_upgrades(