diff --git a/makeResultsWebsite.py b/makeResultsWebsite.py index e58591e..715b4a9 100644 --- a/makeResultsWebsite.py +++ b/makeResultsWebsite.py @@ -27,8 +27,8 @@ def parse_args(raw_args): return args def run(args): - index_file = '%s/viz_files/%s' % (hotnet.__file__.rsplit('/', 1)[0], VIZ_INDEX) - subnetworks_file = '%s/viz_files/%s' % (hotnet.__file__.rsplit('/', 1)[0], VIZ_SUBNETWORKS) + index_file = '%s/viz_files/%s' % (hotnet2.__file__.rsplit('/', 1)[0], VIZ_INDEX) + subnetworks_file = '%s/viz_files/%s' % (hotnet2.__file__.rsplit('/', 1)[0], VIZ_SUBNETWORKS) # create output directory if doesn't exist; warn if it exists and is not empty outdir = args.output_directory diff --git a/simpleRun.py b/simpleRun.py index 1e712c7..e8a6d9d 100644 --- a/simpleRun.py +++ b/simpleRun.py @@ -80,7 +80,7 @@ def run(args): # find smallest delta deltas = ft.get_deltas_for_network(args.permuted_networks_path, heat, INFMAT_NAME, infmat_index, MAX_CC_SIZES, - args.num_permutations, args.parallel) + args.num_permutations, args.parallel) # and run HotNet with the median delta for each size run_deltas = [np.median(deltas[size]) for size in deltas] @@ -92,7 +92,7 @@ def run(args): edges = hnio.load_ppi_edges(args.edge_file) if args.edge_file else None index_file = '%s/viz_files/%s' % (hotnet2.__file__.rsplit('/', 1)[0], VIZ_INDEX) subnetworks_file = '%s/viz_files/%s' % (hotnet2.__file__.rsplit('/', 1)[0], VIZ_SUBNETWORKS) - gene2index = dict([(gene, index) for index, gene in gene_index.iteritems()]) + gene2index = dict([(gene, index) for index, gene in infmat_index.iteritems()]) for delta in run_deltas: # create output directory