diff --git a/kalman/graphics/figure3.py b/kalman/graphics/figure3.py index 9f76045..4e2b411 100644 --- a/kalman/graphics/figure3.py +++ b/kalman/graphics/figure3.py @@ -146,6 +146,17 @@ def plot_parameters(dat, input_file, deparameterize=False, ref=None): for i in range(len(ids)): + + cur_key = ids[i] + rec_value = np.round(2**theta[-1, idx]*current_val[i],2) + curve = 2**theta[:, idx]*current_val[i] + std_down = 2**(-np.sqrt(P[:, idx, idx]))*curve + std_up = 2**np.sqrt(P[:, idx, idx])*curve + dash_curve = true_values[ids[i]] + t*0 + + + + if ids_type[i] == 'dirichlet': fig3, axes3 = plt.subplots(1,1,figsize=(12,5)) axes3.plot(t, curve , '-', color=col_,label= legends_ + '= ' + str(rec_value) + '/' + str(true_values[cur_key]) + '$', linewidth = 4) @@ -159,17 +170,9 @@ def plot_parameters(dat, input_file, deparameterize=False, ref=None): axes3.set_box_aspect(1/4) plt.xticks(fontsize=28) plt.yticks(fontsize=28) - plt.savefig('U.png') - plt.close(fig3) + plt.savefig('results/' + name_file + '/U.png') else: - cur_key = ids[i] - rec_value = np.round(2**theta[-1, idx]*current_val[i],2) - curve = 2**theta[:, idx]*current_val[i] - std_down = 2**(-np.sqrt(P[:, idx, idx]))*curve - std_up = 2**np.sqrt(P[:, idx, idx])*curve - dash_curve = true_values[ids[i]] + t*0 - axes1.plot(t, curve , '-', color=col_,label= legends_ + '= ' + str(rec_value) + '/' + str(true_values[cur_key]) + '$', linewidth = 3) axes1.fill_between(t, std_down, std_up, alpha=0.3, color=col_) axes1.plot(t, dash_curve , color=col_,ls='--',linewidth = 3) @@ -202,7 +205,7 @@ def plot_parameters(dat, input_file, deparameterize=False, ref=None): axes1.set_ylabel(r'$R_d$',fontsize=36) axes1.legend(fontsize=36,loc='upper right') axes1.set_xlim([-0.01,0.81]) - axes1.set_ylim([1700,45000]) + axes1.set_ylim([1700,55000]) axes1.set_box_aspect(1/2) plt.xticks(fontsize=28) plt.yticks(fontsize=28) @@ -220,7 +223,7 @@ def plot_parameters(dat, input_file, deparameterize=False, ref=None): axes2.set_xlabel(r'$t (s)$',fontsize=36) fig2.savefig('C.png') - fig1.savefig('Rd.png') + fig1.savefig('results/' + name_file + '/Rd.png') if not is_ipython(): plt.show() diff --git a/kalman/graphics/figure_func.py b/kalman/graphics/figure_func.py index d6f06de..5f5bd0b 100644 --- a/kalman/graphics/figure_func.py +++ b/kalman/graphics/figure_func.py @@ -33,5 +33,7 @@ ax1.legend(fontsize=20, loc= 'upper right') ax1.tick_params(axis='both', which='major', labelsize=22) ax1.set_yticks([]) ax1.set_xlabel('$u$',fontsize=font_size) +ax1.set_ylabel('$J(u)$',fontsize=font_size) + plt.show() fig1.savefig('functionals.png', dpi=500, bbox_inches='tight') \ No newline at end of file diff --git a/kalman/graphics/figure_func2.py b/kalman/graphics/figure_func2.py index 9afcd10..f30fa4a 100644 --- a/kalman/graphics/figure_func2.py +++ b/kalman/graphics/figure_func2.py @@ -10,9 +10,6 @@ from matplotlib import rc rc('font',**{'family':'sans-serif','sans-serif':['Helvetica']}) rc('text', usetex=True) - -fig1, ax1 = plt.subplots(1,1,figsize=(8, 5)) -lwidth = 2 font_size = 28 ################ Flow Parameters @@ -23,148 +20,150 @@ mu = 0.5 fac = 1 nr = 50 VENC = 0.6 +VENC2 = 0.4 gamma = 267.513e6 # rad/Tesla/sec Gyromagnetic ratio for H nuclei Bo = 1.5 # Tesla Magnetic Field Strenght TE = 5e-3 # Echo-time -M = np.ones(nr) # Magnetization phi0 = gamma*Bo*TE # Reference phase phi02 = phi0%3.14 -M1 = np.pi/(gamma*VENC) -ff = np.pi/(1000*gamma*M1) -uv = np.arange(-4*VENC,4*VENC,ff) - - r = np.linspace(-Rd, Rd, nr) dr = r[2]-r[1] vmax = 1 v = vmax/Rt**2*( Rt**2 - r**2 )*(np.abs(r)0.8) + (t<1.6)*(0.8+Th1.6) + (t<2.4)*(1.6+Th