Commit 5e0551e3 authored by Andrei-Claudiu Roibu's avatar Andrei-Claudiu Roibu 🖥
Browse files

Merge branch 'master' into 'CrossDomain_autoencoder'

# Conflicts:
#   run.py
#   settings.ini
#   utils/data_evaluation_utils.py
#   utils/hdf5_settings.ini
#   utils/preprocessor.py
parents 38498d69 aa74b23e
......@@ -321,7 +321,7 @@ def load_datasets(subjects, data_directory, input_file, output_target, mean_regr
print("\r Processed {:.3f}%: {}/{} inputs, {}/{} targets".format(index/len_subjects * 100.0, len(input_volumes), len_subjects, len(target_volumes), len_subjects), end='')
return input_volumes, target_volumes
return input_volumes, target_volume
def load_and_preprocess(subject, data_directory, input_file, output_target, mean_regression_flag, mean_regression_all_flag, regression_weights_path,
dMRI_mean_mask_path, rsfMRI_mean_mask_path, mean_subtraction_flag, scale_volumes_flag, normalize_flag, minus_one_scaling_flag, negative_flag,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment