From 5aa297d25129cf2cf0ed5425e1a337ed6d4e0382 Mon Sep 17 00:00:00 2001
From: XavierAdriaens <xavier.adriaens@doct.uliege.be>
Date: Thu, 18 Mar 2021 08:56:04 +0100
Subject: [PATCH] Paper2 parameters (final?)
---
input/paper2/cluster_inversion_nscg.sh | 10 ----------
input/paper2/cluster_inversion_nscgA.sh | 10 ++++++++++
input/paper2/inversion.txt | 4 ++--
input/paper2/inversion_gd.txt | 2 +-
...inversion_nscg.txt => inversion_nscgA.txt} | 6 +++---
input/paper2/inversion_nscgB.txt | 2 +-
input/paper2/inversion_nscgC.txt | 2 +-
inversion_plot_comp.py | 19 +++++++++----------
8 files changed, 27 insertions(+), 28 deletions(-)
delete mode 100644 input/paper2/cluster_inversion_nscg.sh
create mode 100644 input/paper2/cluster_inversion_nscgA.sh
rename input/paper2/{inversion_nscg.txt => inversion_nscgA.txt} (83%)
diff --git a/input/paper2/cluster_inversion_nscg.sh b/input/paper2/cluster_inversion_nscg.sh
deleted file mode 100644
index 34a3810..0000000
--- 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 0000000..d758a3d
--- /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 4b1bb70..969c091 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 e19b69e..c41658d 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 1f155bb..96d9932 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 92df92e..8bade48 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 b476f97..9473119 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 a87a880..8fbb218 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 = []
--
GitLab