diff --git a/input/paper2/cluster_inversion_nscg.sh b/input/paper2/cluster_inversion_nscg.sh deleted file mode 100644 index 34a3810a712241649d94fb83ce904bc929018cf0..0000000000000000000000000000000000000000 --- a/input/paper2/cluster_inversion_nscg.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -#SBATCH --job-name=paper2_inversion_nscg -#SBATCH --output=paper2_inversion_nscg.log - -#SBATCH --ntasks=1 -#SBATCH --time=2400:00 -#SBATCH --mem-per-cpu=48000 - -time ./inversion ../input/paper2/common.txt ../input/paper2/inversion.txt ../input/paper2/inversion_nscg.txt -verbose 1 -maxThreads 1 diff --git a/input/paper2/cluster_inversion_nscgA.sh b/input/paper2/cluster_inversion_nscgA.sh new file mode 100644 index 0000000000000000000000000000000000000000..d758a3d9a17d47a09325d0203703e6f6f3254d48 --- /dev/null +++ b/input/paper2/cluster_inversion_nscgA.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +#SBATCH --job-name=paper2_inversion_nscgA +#SBATCH --output=paper2_inversion_nscgA.log + +#SBATCH --ntasks=1 +#SBATCH --time=2400:00 +#SBATCH --mem-per-cpu=48000 + +time ./inversion ../input/paper2/common.txt ../input/paper2/inversion.txt ../input/paper2/inversion_nscgA.txt -verbose 1 -maxThreads 1 diff --git a/input/paper2/inversion.txt b/input/paper2/inversion.txt index 4b1bb70401cede71b886a6c35f6643d075b6caff..969c091fc5403f7a35f92fa71d7330818869f92f 100644 --- a/input/paper2/inversion.txt +++ b/input/paper2/inversion.txt @@ -14,7 +14,7 @@ scale00 = 0.8 # scale10 = 0.5 # -scale20 = 0.4 +scale20 = 0.35 # n_group=3 #Data @@ -38,7 +38,7 @@ model_FunctionSpaceDegree2 = 1 globalminimumsearch = sequentialscale globalminimum_relDecreaseThreshold = 0.0 #Local minimum search -localminimum_absDecreaseThreshold = 1e-3 +localminimum_absDecreaseThreshold = 3e-3 # #Objective objective = l2distance diff --git a/input/paper2/inversion_gd.txt b/input/paper2/inversion_gd.txt index e19b69e935a7102bb794c1256e5177b2d0758963..c41658d1f2958a7a98d379f6b372c94889818c2b 100644 --- a/input/paper2/inversion_gd.txt +++ b/input/paper2/inversion_gd.txt @@ -3,7 +3,7 @@ name = inversion_gd #Local minimum search localminimumsearch = classic localminimum_writeInterval = 30 -localminimum_maxIteration = 300 +localminimum_maxIteration = 400 # #Descent search descentsearch = gradientdescent diff --git a/input/paper2/inversion_nscg.txt b/input/paper2/inversion_nscgA.txt similarity index 83% rename from input/paper2/inversion_nscg.txt rename to input/paper2/inversion_nscgA.txt index 1f155bb39c2b747b0de397c52a226de06fe4e2bf..96d993258b2af328e340aa7b9ab10031bf110add 100644 --- a/input/paper2/inversion_nscg.txt +++ b/input/paper2/inversion_nscgA.txt @@ -1,4 +1,4 @@ -name = inversion_nscg +name = inversion_nscgA # #Local minimum search localminimumsearch = yuanfan @@ -6,8 +6,8 @@ localminimum_initMu = 1 localminimum_c0 = 0.0001 localminimum_c1 = 0.25 localminimum_c2 = 0.25 -localminimum_c3 = 0.25 -localminimum_c4 = 4. +localminimum_c3 = 0.2 +localminimum_c4 = 5. localminimum_writeInterval = 5 localminimum_maxIteration = 50 # diff --git a/input/paper2/inversion_nscgB.txt b/input/paper2/inversion_nscgB.txt index 92df92e889e5eb13a3d5674c82b24e8683e29c35..8bade48b353827a806de54f446df0bf95522ebbe 100644 --- a/input/paper2/inversion_nscgB.txt +++ b/input/paper2/inversion_nscgB.txt @@ -6,7 +6,7 @@ localminimum_initMu = 1 localminimum_c0 = 0.0001 localminimum_c1 = 0.75 localminimum_c2 = 0.75 -localminimum_c3 = 0.5 +localminimum_c3 = 0.25 localminimum_c4 = 2. localminimum_writeInterval = 5 localminimum_maxIteration = 50 diff --git a/input/paper2/inversion_nscgC.txt b/input/paper2/inversion_nscgC.txt index b476f97d4d8c8e6b5670e10e9cb8fa717bff6ee8..9473119ce3e90e2e464411211585fbbedaa094eb 100644 --- a/input/paper2/inversion_nscgC.txt +++ b/input/paper2/inversion_nscgC.txt @@ -1,4 +1,4 @@ -name = inversion_nscgB +name = inversion_nscgC # #Local minimum search localminimumsearch = yuanfan diff --git a/inversion_plot_comp.py b/inversion_plot_comp.py index a87a880bfb0130a515a7d3a4adf7afb0085406fe..8fbb2186c0758bfc28ec08e07d5f6d24e71b007e 100644 --- a/inversion_plot_comp.py +++ b/inversion_plot_comp.py @@ -15,18 +15,17 @@ rc('text', usetex=True) H = 1.5; L = 4.5; -n_comp = 2 -path = ['../Presentation2/PS_NCG_BND/','../Presentation2/PS_NSCG/'] -filename = ['paper2_inversion_ncg','paper2_inversion_nscg'] -glob = ['linesearch','trust-region'] -order = [ 2 , 2 ] -col = ['k','k'] -lin = [':','--'] -max_it = 26 -max_forward = 225 +n_comp = 3 +path = ['EisenstatChoiceA/','YuanFanChoiceA/','YuanFanChoiceB/'] +filename = ['paper2_inversion_ncg','paper2_inversion_nscg','paper2_inversion_nscgB'] +glob = ['linesearch','trust-region','trust-region'] +order = [ 2 , 2, 2 ] +col = ['k','k', 'k'] +lin = [':','--','-'] +max_forward = 300 freqf = np.array([4.,6.,9.]) -n_freq = 3#np.size(freqf) +n_freq = 2#np.size(freqf) jcfs = [] n_itcf = [] n_scalecf = []