Skip to content

Commit 75bc2b9

Browse files
Fix linter issues (#40)
1 parent db3ce14 commit 75bc2b9

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

Diff for: grim/grim.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,9 @@ def graph_freqs(conf_file="", for_em=False, em_pop=None):
5454
)
5555

5656

57-
def impute(conf_file="", hap_pop_pair = False, graph = None):
58-
57+
def impute(conf_file="", hap_pop_pair=False, graph=None):
5958
project_dir_in_file, project_dir_graph = "", ""
6059
if conf_file == "":
61-
6260
conf_file = (
6361
os.path.dirname(os.path.realpath(__file__)).replace("/grim", "")
6462
+ "/conf/minimal-configuration.json"
@@ -70,7 +68,9 @@ def impute(conf_file="", hap_pop_pair = False, graph = None):
7068
project_dir_in_file = (
7169
os.path.dirname(os.path.realpath(__file__)).replace("/grim", "") + "/"
7270
)
73-
graph = run_impute(conf_file, project_dir_graph, project_dir_in_file, hap_pop_pair, graph)
71+
graph = run_impute(
72+
conf_file, project_dir_graph, project_dir_in_file, hap_pop_pair, graph
73+
)
7474
return graph
7575

7676

Diff for: grim/run_impute_def.py

+21-10
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ def run_impute(
4242
conf_file="../conf/minimal-configuration.json",
4343
project_dir_graph="",
4444
project_dir_in_file="",
45-
hap_pop_pair = False,
46-
graph = None
45+
hap_pop_pair=False,
46+
graph=None,
4747
):
48-
4948
configuration_file = conf_file
5049

5150
# project_dir = ""# "../"
@@ -81,12 +80,24 @@ def run_impute(
8180
+ json_conf.get("edges_csv_file"),
8281
"imputation_input_file": project_dir_in_file
8382
+ json_conf.get("imputation_in_file"),
84-
"imputation_out_umug_freq_file": full_path(output_dir, json_conf.get("imputation_out_umug_freq_filename")),
85-
"imputation_out_umug_pops_file": full_path(output_dir, json_conf.get("imputation_out_umug_pops_filename")),
86-
"imputation_out_hap_freq_file": full_path(output_dir, json_conf.get("imputation_out_hap_freq_filename")),
87-
"imputation_out_hap_pops_file": full_path(output_dir, json_conf.get("imputation_out_hap_pops_filename")),
88-
"imputation_out_miss_file": full_path(output_dir, json_conf.get("imputation_out_miss_filename")),
89-
"imputation_out_problem_file": full_path(output_dir, json_conf.get("imputation_out_problem_filename")),
83+
"imputation_out_umug_freq_file": full_path(
84+
output_dir, json_conf.get("imputation_out_umug_freq_filename")
85+
),
86+
"imputation_out_umug_pops_file": full_path(
87+
output_dir, json_conf.get("imputation_out_umug_pops_filename")
88+
),
89+
"imputation_out_hap_freq_file": full_path(
90+
output_dir, json_conf.get("imputation_out_hap_freq_filename")
91+
),
92+
"imputation_out_hap_pops_file": full_path(
93+
output_dir, json_conf.get("imputation_out_hap_pops_filename")
94+
),
95+
"imputation_out_miss_file": full_path(
96+
output_dir, json_conf.get("imputation_out_miss_filename")
97+
),
98+
"imputation_out_problem_file": full_path(
99+
output_dir, json_conf.get("imputation_out_problem_filename")
100+
),
90101
"factor_missing_data": json_conf.get("factor_missing_data", 0.01),
91102
"loci_map": json_conf.get(
92103
"loci_map", {"A": 1, "B": 3, "C": 2, "DQB1": 4, "DRB1": 5}
@@ -180,7 +191,7 @@ def run_impute(
180191

181192
config["full_loci"] = "".join(sorted(all_loci_set))
182193
# Perform imputation
183-
if graph==None:
194+
if graph == None:
184195
graph = Graph(config)
185196
graph.build_graph(
186197
config["node_file"], config["top_links_file"], config["edges_file"]

0 commit comments

Comments
 (0)