diff --git a/analysis.py b/analysis.py index 3fbe4f5..8621610 100644 --- a/analysis.py +++ b/analysis.py @@ -17,7 +17,7 @@ def main(): # parser.add_argument("dir", help="folder containing the cell folders with the fit results") # args = parser.parse_args() - dir_path = "results/final_1/" # args.dir + dir_path = "results/final_2/" # args.dir # if not os.path.isdir(dir_path): # print("Argument dir is not a directory.") @@ -42,7 +42,7 @@ def main(): # labels, corr_values, corrected_p_values = parameter_correlations(fits_info) # create_correlation_plot(labels, corr_values, corrected_p_values) - create_parameter_distributions(get_parameter_values(fits_info)) + # create_parameter_distributions(get_parameter_values(fits_info)) cell_b, model_b = get_behaviour_values(fits_info) create_behaviour_distributions(cell_b, model_b) pass diff --git a/glm_prediction.py b/glm_prediction.py index 69f7696..5d8e3e4 100644 --- a/glm_prediction.py +++ b/glm_prediction.py @@ -16,6 +16,7 @@ def main(): 'f_inf_slope', 'f_zero_slope', 'serial_correlation', 'vector_strength'] behaviour, error = get_variables(folder, variable_order) + df_behaviour = pandas.DataFrame(behaviour, columns=variable_order) # print(df) gamma_glm = sm.GLM(error, df_behaviour, sm.families.Gamma()) diff --git a/run_Fitter.py b/run_Fitter.py index df10e12..2afa107 100644 --- a/run_Fitter.py +++ b/run_Fitter.py @@ -14,13 +14,10 @@ from helperFunctions import plot_errors import multiprocessing as mp - -# SAVE_DIRECTORY = "./results/invivo_results/" SAVE_DIRECTORY = "./results/final_2/" -# SAVE_DIRECTORY_BEST = "./results/invivo_best/" SAVE_DIRECTORY_BEST = "./results/final_2_best/" -# [bf, vs, sc, cv, isi_hist, bursty, f_inf, f_inf_slope, f_zero, f_zero_slope, f0_curve] -ERROR_WEIGHTS = (2, 2, 1, 1, 0, 1, 1, 1, 0, 1) +# [vs, sc, cv, isi_hist, bursty, f_inf, f_inf_slope, f_zero, f_zero_slope, f0_curve] +ERROR_WEIGHTS = (1, 1, 1, 1, 1, 1, 1, 1, 0, 1) def main(): @@ -34,7 +31,7 @@ def main(): quit() # test_single_cell("data/invivo/2010-11-08-al-invivo-1/") - test_single_cell("data/invivo_bursty/2014-03-19-ae-invivo-1/") + test_single_cell("data/invivo_bursty/2013-04-09-ac-invivo-1/") # start_parameters = [p for p in iget_start_parameters()] # cell_data = CellData("data/invivo_bursty/2014-03-19-ae-invivo-1/")