Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bws/calc/calcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def _run_risks(self):
elif ry is not None:
self.ten_yr_nhs_protocol = ry
if mp is not None:
self.mutation_probabilties = mp
self.mutation_probabilities = mp

# remaining lifetime baseline
if rr is not None:
Expand Down
2 changes: 1 addition & 1 deletion bws/rest_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def post_to_model(self, request, model_settings):
this_pedigree["prs"] = {'alpha': prs.alpha, 'zscore': prs.zscore}
this_pedigree["mutation_frequency"] = {this_params.population: this_params.mutation_frequency}
self.add_attr("version", output, calcs, output)
self.add_attr("mutation_probabilties", this_pedigree, calcs, output)
self.add_attr("mutation_probabilities", this_pedigree, calcs, output)
self.add_attr("cancer_risks", this_pedigree, calcs, output)
self.add_attr("baseline_cancer_risks", this_pedigree, calcs, output)
self.add_attr("lifetime_cancer_risk", this_pedigree, calcs, output)
Expand Down
6 changes: 3 additions & 3 deletions bws/scripts/run_webservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ def post_requests(url, **kwargs):

def mutation_probability_output(res, writer):
''' Write out mutation carrier probabilities '''
if 'mutation_probabilties' in res:
writer.writerow(['Mutation Carrier Probabilties'])
muts = res['mutation_probabilties']
if 'mutation_probabilities' in res:
writer.writerow(['Mutation Carrier probabilities'])
muts = res['mutation_probabilities']
col = ['FamID']
val = [res['family_id']]
for m in muts:
Expand Down
2 changes: 1 addition & 1 deletion bws/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class PedigreeResultSerializer(serializers.Serializer):
ten_yr_cancer_risk = serializers.ListField(read_only=True, required=False, help_text="10 year age range risks")
baseline_ten_yr_cancer_risk = serializers.ListField(read_only=True, required=False, help_text="Baseline/population 10 year age range risks")
ten_yr_nhs_protocol = serializers.ListField(read_only=True, required=False, help_text="NHS protocol 10 year breast cancer risks")
mutation_probabilties = serializers.ListField(read_only=True, help_text="Pathogenic variant carrier probability")
mutation_probabilities = serializers.ListField(read_only=True, help_text="Pathogenic variant carrier probability")


class OutputSerializer(serializers.Serializer):
Expand Down
2 changes: 1 addition & 1 deletion bws/tests/test_pws.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def test_pws_warnings(self):
content = json.loads(force_str(response.content))
self.assertTrue("pedigree_result" in content)
self.assertTrue('cancer_risks not provided' in content['warnings'])
self.assertTrue('mutation_probabilties' in content['pedigree_result'][0])
self.assertTrue('mutation_probabilities' in content['pedigree_result'][0])

def test_pws_err(self):
''' Test error with an invalid gene test resuly. '''
Expand Down
16 changes: 8 additions & 8 deletions bws/tests/tests_pedigree.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ def test_calculations(self):
calcs = Predictions(pedigree, cwd=self.cwd)

# each gene should have a mutation probability plus a result for no mutations
for mp in calcs.mutation_probabilties:
for mp in calcs.mutation_probabilities:
key = list(mp.keys())[0]
self.assertTrue(key in settings.BC_MODEL['GENES'] or key == "no mutation")
self.assertEqual(len(calcs.mutation_probabilties), len(settings.BC_MODEL['GENES']) + 1)
self.assertEqual(len(calcs.mutation_probabilities), len(settings.BC_MODEL['GENES']) + 1)

# risks calculated at 16 different ages:
self.assertEqual(len(calcs.cancer_risks), 16)
Expand Down Expand Up @@ -132,10 +132,10 @@ def test_calculations2(self):
calcs = Predictions(pedigree, cwd=self.cwd)

# each gene should have a mutation probability plus a result for no mutations
for mp in calcs.mutation_probabilties:
for mp in calcs.mutation_probabilities:
key = list(mp.keys())[0]
self.assertTrue(key in settings.BC_MODEL['GENES'] or key == "no mutation")
self.assertEqual(len(calcs.mutation_probabilties), len(settings.BC_MODEL['GENES']) + 1)
self.assertEqual(len(calcs.mutation_probabilities), len(settings.BC_MODEL['GENES']) + 1)

# risks calculated at different ages:
self.assertEqual(len(calcs.cancer_risks), 9)
Expand All @@ -157,10 +157,10 @@ def test_ovarian_calculations(self):
model_settings=settings.OC_MODEL, calcs=[])

# each gene should have a mutation probability plus a result for no mutations
for mp in calcs.mutation_probabilties:
for mp in calcs.mutation_probabilities:
key = list(mp.keys())[0]
self.assertTrue(key in settings.OC_MODEL['GENES'] or key == "no mutation")
self.assertEqual(len(calcs.mutation_probabilties), len(settings.OC_MODEL['GENES']) + 1)
self.assertEqual(len(calcs.mutation_probabilities), len(settings.OC_MODEL['GENES']) + 1)

# risks calculated at 16 different ages:
self.assertEqual(len(calcs.cancer_risks), 16)
Expand Down Expand Up @@ -228,7 +228,7 @@ def test_incidence_rates(self):
calcs = Predictions(pedigree, cwd=self.cwd, model_params=params)

# each gene should have a mutation probability plus a result for no mutations
self.assertEqual(len(calcs.mutation_probabilties), len(settings.BC_MODEL['GENES']) + 1)
self.assertEqual(len(calcs.mutation_probabilities), len(settings.BC_MODEL['GENES']) + 1)

# risks calculated at different ages:
self.assertTrue([c.get('age') for c in calcs.cancer_risks] ==
Expand Down Expand Up @@ -269,7 +269,7 @@ def test_mutation_frequencies(self):
calcs = Predictions(pedigree, cwd=self.cwd, model_params=params)

# each gene should have a mutation probability plus a result for no mutations
self.assertEqual(len(calcs.mutation_probabilties), len(settings.BC_MODEL['GENES']) + 1)
self.assertEqual(len(calcs.mutation_probabilities), len(settings.BC_MODEL['GENES']) + 1)

# risks calculated at different ages:
self.assertTrue([c.get('age') for c in calcs.cancer_risks] ==
Expand Down