diff --git a/__pycache__/Setting.cpython-36.pyc b/__pycache__/Setting.cpython-36.pyc index 70370b3..764dd1a 100644 Binary files a/__pycache__/Setting.cpython-36.pyc and b/__pycache__/Setting.cpython-36.pyc differ diff --git a/data.h5 b/data.h5 index 18414fc..853d2b7 100644 Binary files a/data.h5 and b/data.h5 differ diff --git a/figs/Scale_obj_E.png b/figs/Scale_obj_E.png index 41ccc8c..658361a 100644 Binary files a/figs/Scale_obj_E.png and b/figs/Scale_obj_E.png differ diff --git a/figs/Scale_obj_T.png b/figs/Scale_obj_T.png index 728462c..2df07b5 100644 Binary files a/figs/Scale_obj_T.png and b/figs/Scale_obj_T.png differ diff --git a/figs/Sub1_N.png b/figs/Sub1_N.png index 345a5c2..64d93e4 100644 Binary files a/figs/Sub1_N.png and b/figs/Sub1_N.png differ diff --git a/figs/Sub1_T.png b/figs/Sub1_T.png index f1f70c6..c01a2a8 100644 Binary files a/figs/Sub1_T.png and b/figs/Sub1_T.png differ diff --git a/figs/Sub2_Tau.png b/figs/Sub2_Tau.png index 86b45d4..3856a41 100644 Binary files a/figs/Sub2_Tau.png and b/figs/Sub2_Tau.png differ diff --git a/figs/Sub2_p.png b/figs/Sub2_p.png index 72b0a76..ef435c2 100644 Binary files a/figs/Sub2_p.png and b/figs/Sub2_p.png differ diff --git a/figs/Sub3_eq.png b/figs/Sub3_eq.png index ca0e00c..2c18e6f 100644 Binary files a/figs/Sub3_eq.png and b/figs/Sub3_eq.png differ diff --git a/figs/Sub3_obj.png b/figs/Sub3_obj.png index 9929d01..91b21fe 100644 Binary files a/figs/Sub3_obj.png and b/figs/Sub3_obj.png differ diff --git a/julia/Main.jl b/julia/Main.jl index 2f5253f..c66b23c 100644 --- a/julia/Main.jl +++ b/julia/Main.jl @@ -106,5 +106,10 @@ function main1() end end -# main() -plot_scale_result() +# for numb in Numb_devs +# global NumbDevs = numb +# main() +# end + +main() +# plot_scale_result() diff --git a/julia/Plots_Figs.jl b/julia/Plots_Figs.jl index 98ea3ea..1b6b0ce 100644 --- a/julia/Plots_Figs.jl +++ b/julia/Plots_Figs.jl @@ -178,7 +178,7 @@ end function plot_scale_result() Numb_kaps = size(kaps)[1] - Sims = 5 + Sims = size(Numb_devs)[1] Thetas = zeros(Sims, Numb_kaps) Objs = zeros(Sims, Numb_kaps) Objs_E = zeros(Sims, Numb_kaps) diff --git a/julia/Setting.jl b/julia/Setting.jl index f19a616..c91b735 100644 --- a/julia/Setting.jl +++ b/julia/Setting.jl @@ -1,8 +1,9 @@ using Distributions using HDF5 -NumbDevs = 20 #1, 5, 10, 15, 20 -Numb_devs = [1, 5, 10, 15, 20] #[1, 3, 5, 7, 10, 13, 15, 17, 20] +NumbDevs = 5 #1, 5, 10, 15, 20 +# Numb_devs = [1, 5, 10, 15, 20] +# Numb_devs = collect(1:15) ### PROGRAM SETTING ### Numb_SIMs = 1 #Number of simulations diff --git a/result1.h5 b/result1.h5 index 9f586d4..110f223 100644 Binary files a/result1.h5 and b/result1.h5 differ diff --git a/result11.h5 b/result11.h5 new file mode 100644 index 0000000..92ecfc4 Binary files /dev/null and b/result11.h5 differ diff --git a/result12.h5 b/result12.h5 new file mode 100644 index 0000000..0edf11f Binary files /dev/null and b/result12.h5 differ diff --git a/result13.h5 b/result13.h5 new file mode 100644 index 0000000..22f48db Binary files /dev/null and b/result13.h5 differ diff --git a/result14.h5 b/result14.h5 new file mode 100644 index 0000000..e39be30 Binary files /dev/null and b/result14.h5 differ diff --git a/result2.h5 b/result2.h5 new file mode 100644 index 0000000..81049e4 Binary files /dev/null and b/result2.h5 differ diff --git a/result3.h5 b/result3.h5 new file mode 100644 index 0000000..171da0b Binary files /dev/null and b/result3.h5 differ diff --git a/result4.h5 b/result4.h5 new file mode 100644 index 0000000..ea0c826 Binary files /dev/null and b/result4.h5 differ diff --git a/result5.h5 b/result5.h5 index f780418..9e0d24e 100644 Binary files a/result5.h5 and b/result5.h5 differ diff --git a/result6.h5 b/result6.h5 new file mode 100644 index 0000000..0824ffa Binary files /dev/null and b/result6.h5 differ diff --git a/result7.h5 b/result7.h5 new file mode 100644 index 0000000..d0ad642 Binary files /dev/null and b/result7.h5 differ diff --git a/result8.h5 b/result8.h5 new file mode 100644 index 0000000..0066138 Binary files /dev/null and b/result8.h5 differ diff --git a/result9.h5 b/result9.h5 new file mode 100644 index 0000000..79804d9 Binary files /dev/null and b/result9.h5 differ diff --git a/scaleRS/result1.h5 b/scaleRS/result1.h5 index 9f586d4..110f223 100644 Binary files a/scaleRS/result1.h5 and b/scaleRS/result1.h5 differ diff --git a/scaleRS/result11.h5 b/scaleRS/result11.h5 new file mode 100644 index 0000000..92ecfc4 Binary files /dev/null and b/scaleRS/result11.h5 differ diff --git a/scaleRS/result12.h5 b/scaleRS/result12.h5 new file mode 100644 index 0000000..0edf11f Binary files /dev/null and b/scaleRS/result12.h5 differ diff --git a/scaleRS/result13.h5 b/scaleRS/result13.h5 new file mode 100644 index 0000000..22f48db Binary files /dev/null and b/scaleRS/result13.h5 differ diff --git a/scaleRS/result14.h5 b/scaleRS/result14.h5 new file mode 100644 index 0000000..e39be30 Binary files /dev/null and b/scaleRS/result14.h5 differ diff --git a/scaleRS/result2.h5 b/scaleRS/result2.h5 new file mode 100644 index 0000000..81049e4 Binary files /dev/null and b/scaleRS/result2.h5 differ diff --git a/scaleRS/result3.h5 b/scaleRS/result3.h5 new file mode 100644 index 0000000..171da0b Binary files /dev/null and b/scaleRS/result3.h5 differ diff --git a/scaleRS/result4.h5 b/scaleRS/result4.h5 new file mode 100644 index 0000000..ea0c826 Binary files /dev/null and b/scaleRS/result4.h5 differ diff --git a/scaleRS/result5.h5 b/scaleRS/result5.h5 index f780418..9e0d24e 100644 Binary files a/scaleRS/result5.h5 and b/scaleRS/result5.h5 differ diff --git a/scaleRS/result6.h5 b/scaleRS/result6.h5 new file mode 100644 index 0000000..0824ffa Binary files /dev/null and b/scaleRS/result6.h5 differ diff --git a/scaleRS/result7.h5 b/scaleRS/result7.h5 new file mode 100644 index 0000000..d0ad642 Binary files /dev/null and b/scaleRS/result7.h5 differ diff --git a/scaleRS/result8.h5 b/scaleRS/result8.h5 new file mode 100644 index 0000000..0066138 Binary files /dev/null and b/scaleRS/result8.h5 differ diff --git a/scaleRS/result9.h5 b/scaleRS/result9.h5 new file mode 100644 index 0000000..79804d9 Binary files /dev/null and b/scaleRS/result9.h5 differ diff --git a/setting.h5 b/setting.h5 index 72f5594..00eb114 100644 Binary files a/setting.h5 and b/setting.h5 differ diff --git a/temp.py b/temp.py new file mode 100644 index 0000000..3bc1730 --- /dev/null +++ b/temp.py @@ -0,0 +1,43 @@ +import numpy as np +from mpl_toolkits.mplot3d import Axes3D +import matplotlib.pyplot as plt +from matplotlib import cm + +result=[['122', '109', '2343', '220', '19'], + ['15', '407', '37', '10', '102'], + ['100', '100', '100', '100', '100'], + ['113', '25', '19', '31', '112'], + ['43', '219', '35', '33', '14'], + ['132', '108', '256', '119', '14'], + ['22', '48', '352', '51', '438']] + +result = np.array(result, dtype=np.int) + +fig=plt.figure(figsize=(5, 5), dpi=150) +ax1=fig.add_subplot(111, projection='3d') + +xlabels = np.array(['10/11/2013', '10/12/2013', '10/13/2013', + '10/14/2013', '10/15/2013']) +xpos = np.arange(xlabels.shape[0]) +ylabels = np.array(['A1','C1','G1','M1','M2','M3','P1']) +ypos = np.arange(ylabels.shape[0]) + +xposM, yposM = np.meshgrid(xpos, ypos, copy=False) + +zpos=result +zpos = zpos.ravel() + +dx=0.5 +dy=0.5 +dz=zpos + +ax1.w_xaxis.set_ticks(xpos + dx/2.) +ax1.w_xaxis.set_ticklabels(xlabels) + +ax1.w_yaxis.set_ticks(ypos + dy/2.) +ax1.w_yaxis.set_ticklabels(ylabels) + +values = np.linspace(0.2, 1., xposM.ravel().shape[0]) +colors = cm.rainbow(values) +ax1.bar3d(xposM.ravel(), yposM.ravel(), dz*0, dx, dy, dz, color=colors) +plt.show() \ No newline at end of file