Skip to content

Commit 2f5c843

Browse files
committed
Merge branch 'mmaiers-nmdp-absolutepaths'
2 parents 667b5b3 + 145196c commit 2f5c843

File tree

18 files changed

+147
-393791
lines changed

18 files changed

+147
-393791
lines changed

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ Description of Pull Request..
33
## Checklist
44

55
- [ ] Unit tests
6-
- [ ] Documentation
6+
- [ ] Documentation
77

88
Fixes #

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,5 @@ allure_report/
139139
# cython temp files
140140
grim/**/*.c
141141

142+
.DS_Store
142143
output/

conf/minimal-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
"imputation_out_miss_filename": "don.miss",
5252
"imputation_out_problem_filename": "don.problem",
5353
"max_haplotypes_number_in_phase": 100,
54-
"imuptation_out_path": "output"
54+
"imputation_out_path": "output"
5555
}

graph_generation/generate_hpf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pathlib
55
import argparse
66

7-
project_dir = "./"
7+
project_dir = ""
88

99
parser = argparse.ArgumentParser()
1010
parser.add_argument(
@@ -32,7 +32,7 @@
3232

3333

3434
# Create output directory if it doesn't exist
35-
pathlib.Path(output_dir).mkdir(parents=False, exist_ok=True)
35+
pathlib.Path(output_dir).mkdir(parents=True, exist_ok=True)
3636

3737
# Display the configurations we are using
3838
print(

graph_generation/generate_neo4j_multi_hpf.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def make_allele_list(haplotype, full_name_index_dict, num_of_alleles):
6262
sorted_h1 = ["0"] * num_of_alleles
6363
for allele in hl:
6464
locus = allele.split("*")[0]
65+
# print(allele, hl)
6566
sorted_h1[full_name_index_dict[locus] - 1] = allele
6667
return sorted_h1
6768

@@ -205,7 +206,10 @@ def loci_order(loc_values):
205206

206207

207208
def generate_graph(
208-
config_file="../conf/minimal-configuration-script.json", em_pop=None, em=False, use_default_path = False
209+
config_file="../conf/minimal-configuration-script.json",
210+
em_pop=None,
211+
em=False,
212+
use_default_path=False,
209213
):
210214
##############################################################################
211215
# Configure
@@ -217,7 +221,7 @@ def generate_graph(
217221
# freq_file = path + freq_file
218222
path = ""
219223
if use_default_path:
220-
path = os.path.dirname(os.path.realpath(__file__)) + "/"
224+
path = os.path.dirname(os.path.realpath(__file__)) + "/"
221225
parser = argparse.ArgumentParser()
222226
parser.add_argument(
223227
"-c",

0 commit comments

Comments
 (0)