Skip to content

Commit a867458

Browse files
committed
Tox fixes
1 parent 33f1143 commit a867458

File tree

226 files changed

+113
-374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+113
-374
lines changed

src/scripts/Alri_analyses/alri_azure_run_scenarios/base_scenario_inc_mort_plots.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import matplotlib.pyplot as plt
1010
import numpy as np
1111
import pandas as pd
12-
1312
from tlo.analysis.utils import (
1413
extract_params,
1514
extract_results,

src/scripts/Alri_analyses/alri_azure_run_scenarios/base_scenario_plots.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import matplotlib.pyplot as plt
99
import numpy as np
1010
import pandas as pd
11-
1211
from tlo.analysis.utils import (
1312
extract_params,
1413
extract_results,

src/scripts/Alri_analyses/alri_calibration_plots/GBD_comparison_plots.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import pandas as pd
1111
from matplotlib import pyplot as plt
12-
1312
from tlo import Date, Simulation, logging
1413
from tlo.analysis.utils import compare_number_of_deaths, parse_log_file
1514
from tlo.methods import (

src/scripts/Alri_analyses/alri_calibration_plots/analysis_Alri_default_params.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import pandas as pd
1313
from matplotlib import pyplot as plt
14-
1514
from tlo import Date, Simulation, logging
1615
from tlo.analysis.utils import compare_number_of_deaths, parse_log_file
1716
from tlo.methods import (

src/scripts/Alri_analyses/alri_calibration_plots/analysis_Alri_with_and_without_treatment.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import pandas as pd
1010
from matplotlib import pyplot as plt
11-
1211
from tlo import Date, Simulation, logging
1312
from tlo.analysis.utils import parse_log_file
1413
from tlo.methods import (

src/scripts/Alri_analyses/alri_calibration_plots/analysis_effect_of_treatment.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import pandas as pd
88
from matplotlib import pyplot as plt
9-
109
from tlo import Date, Simulation
1110
from tlo.methods import (
1211
alri,

src/scripts/Alri_analyses/alri_calibration_plots/analysis_pulse_oximeter_vs_none.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import pandas as pd
1111
from matplotlib import pyplot as plt
12-
1312
from tlo import Date, Simulation, logging
1413
from tlo.analysis.utils import parse_log_file
1514
from tlo.methods import (

src/scripts/Alri_analyses/alri_calibration_plots/baseline_outputs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import matplotlib.pyplot as plt
1111
import pandas as pd
12-
1312
from tlo import Date, Simulation, logging
1413
from tlo.analysis.utils import parse_log_file
1514
from tlo.methods import (

src/scripts/analysis_data_generation/analysis_extract_data.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
# short tclose -> ideal case
55
# long tclose -> status quo
66
import argparse
7+
from collections import Counter
8+
from datetime import datetime
79
from pathlib import Path
810
from typing import Tuple
911

1012
import pandas as pd
11-
import matplotlib.pyplot as plt
12-
1313
from tlo import Date
14-
from tlo.analysis.utils import extract_results, extract_event_chains
15-
from datetime import datetime
16-
from collections import Counter
17-
import ast
14+
from tlo.analysis.utils import extract_event_chains, extract_results
1815

1916
# Time simulated to collect data
2017
start_date = Date(2010, 1, 1)
@@ -76,7 +73,6 @@ def apply(results_folder: Path, output_folder: Path, resourcefilepath: Path = No
7673
'nan': float('nan'), # Include NaN for eval (can also use pd.NA if preferred)
7774
}
7875

79-
initial_properties_of_interest = ['rt_MAIS_military_score','rt_ISS_score','rt_disability','rt_polytrauma','rt_injury_1','rt_injury_2','rt_injury_3','rt_injury_4','rt_injury_5','rt_injury_6', 'rt_imm_death','sy_injury','sy_severe_trauma','sex','li_urban', 'li_wealth', 'li_mar_stat', 'li_in_ed', 'li_ed_lev']
8076

8177
# Will be added through computation: age at time of RTI
8278
# Will be added through computation: total duration of event
@@ -104,17 +100,7 @@ def apply(results_folder: Path, output_folder: Path, resourcefilepath: Path = No
104100
)
105101

106102
for r in range(0,num_runs):
107-
initial_properties = {}
108-
key_first_event = {}
109-
key_last_event = {}
110-
first_event = {}
111-
last_event = {}
112-
properties = {}
113-
average_disability = 0
114-
total_dt_included = 0
115-
dt_in_prev_disability = 0
116-
prev_disability_incurred = 0
117-
ind_Counter = {'0': Counter(), '1a': Counter(), '1b' : Counter(), '2' : Counter()}
103+
{'0': Counter(), '1a': Counter(), '1b' : Counter(), '2' : Counter()}
118104
# Count total appts
119105

120106
list_for_individual = []

src/scripts/analysis_data_generation/postprocess_events_chain.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import pandas as pd
22
from dateutil.relativedelta import relativedelta
33

4+
45
# Remove from every individual's event chain all events that were fired after death
56
def cut_off_events_after_death(df):
67

0 commit comments

Comments
 (0)