From bd45cb34a99ca3b8578fbd6f74650516e4f1b123 Mon Sep 17 00:00:00 2001
From: XavierAdriaens <xavier.adriaens@doct.uliege.be>
Date: Mon, 17 Oct 2022 18:46:07 +0200
Subject: [PATCH] New reg param for TC2 part 3
---
.../cluster/df_tv/cluster_inversion_df_lbfgs_ls_snrm3_tv.sh | 6 +++---
.../ssm_tik/cluster_inversion_ssm_lbfgs_ls_snrm2_tik.sh | 6 +++---
.../cluster/tv/cluster_inversion_sst_lbfgs_ls_snrm2_tv.sh | 6 +++---
input/paper3/concrete3/localminimum_classic.txt | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/input/paper3/concrete3/cluster/df_tv/cluster_inversion_df_lbfgs_ls_snrm3_tv.sh b/input/paper3/concrete3/cluster/df_tv/cluster_inversion_df_lbfgs_ls_snrm3_tv.sh
index 45e6715..e0fd22d 100644
--- a/input/paper3/concrete3/cluster/df_tv/cluster_inversion_df_lbfgs_ls_snrm3_tv.sh
+++ b/input/paper3/concrete3/cluster/df_tv/cluster_inversion_df_lbfgs_ls_snrm3_tv.sh
@@ -5,10 +5,10 @@
#SBATCH --ntasks=1
#SBATCH --time=1000:00
-#SBATCH --mem-per-cpu=16000
+#SBATCH --mem-per-cpu=12000
#
-#SBATCH --array=0-4
+#SBATCH --array=5-8
-ARGS_R=( 1e2 1.5e2 2.5e2 3.75e2 5e2 )
+ARGS_R=( 1e2 1.5e2 2.5e2 3.75e2 5e2 1. 10. 1e3 1e4)
time ./inversion ../input/paper3/concrete3/common.txt ../input/paper3/concrete3/inversion.txt ../input/paper3/concrete3/innerproduct_df.txt ../input/paper3/concrete3/localminimum_classic.txt ../input/paper3/concrete3/descentsearch_lbfgs_ls.txt ../input/paper3/concrete3/linesearch_unit.txt ../input/paper3/concrete3/data_snrm3.txt ../input/paper3/concrete3/regularization_totalvariation.txt -verbose 2 -maxThreads 1 -regularization_lambda ${ARGS_R[$SLURM_ARRAY_TASK_ID]} -scale0 0.005 -name df_lbfgs_ls_snrm3_tv$SLURM_ARRAY_TASK_ID
diff --git a/input/paper3/concrete3/cluster/ssm_tik/cluster_inversion_ssm_lbfgs_ls_snrm2_tik.sh b/input/paper3/concrete3/cluster/ssm_tik/cluster_inversion_ssm_lbfgs_ls_snrm2_tik.sh
index 16ff897..8635760 100644
--- a/input/paper3/concrete3/cluster/ssm_tik/cluster_inversion_ssm_lbfgs_ls_snrm2_tik.sh
+++ b/input/paper3/concrete3/cluster/ssm_tik/cluster_inversion_ssm_lbfgs_ls_snrm2_tik.sh
@@ -5,10 +5,10 @@
#SBATCH --ntasks=1
#SBATCH --time=1000:00
-#SBATCH --mem-per-cpu=16000
+#SBATCH --mem-per-cpu=12000
#
-#SBATCH --array=0-7
+#SBATCH --array=8-9
-ARGS_R=( 1e-4 1e-3 0.005 0.025 0.05 0.1 0.25 0.5 )
+ARGS_R=( 1e-4 1e-3 0.005 0.025 0.05 0.1 0.25 0.5 1e-5 1e-6)
time ./inversion ../input/paper3/concrete3/common.txt ../input/paper3/concrete3/inversion.txt ../input/paper3/concrete3/innerproduct_ssm.txt ../input/paper3/concrete3/localminimum_classic.txt ../input/paper3/concrete3/descentsearch_lbfgs_ls.txt ../input/paper3/concrete3/linesearch_unit.txt ../input/paper3/concrete3/data_snrm3.txt ../input/paper3/concrete3/regularization_tikhonov.txt -verbose 2 -maxThreads 1 -regularization_lambda ${ARGS_R[$SLURM_ARRAY_TASK_ID]} -scale0 0.005 -name ssm_lbfgs_ls_snrm3_tik$SLURM_ARRAY_TASK_ID
diff --git a/input/paper3/concrete3/cluster/tv/cluster_inversion_sst_lbfgs_ls_snrm2_tv.sh b/input/paper3/concrete3/cluster/tv/cluster_inversion_sst_lbfgs_ls_snrm2_tv.sh
index a9d8604..876d15e 100644
--- a/input/paper3/concrete3/cluster/tv/cluster_inversion_sst_lbfgs_ls_snrm2_tv.sh
+++ b/input/paper3/concrete3/cluster/tv/cluster_inversion_sst_lbfgs_ls_snrm2_tv.sh
@@ -5,10 +5,10 @@
#SBATCH --ntasks=1
#SBATCH --time=1000:00
-#SBATCH --mem-per-cpu=16000
+#SBATCH --mem-per-cpu=12000
#
-#SBATCH --array=0-4
+#SBATCH --array=5-6
-ARGS_R=( 1e2 1.5e2 2.5e2 3.75e2 5e2 )
+ARGS_R=( 1e2 1.5e2 2.5e2 3.75e2 5e2 1e3 1e4)
time ./inversion ../input/paper3/concrete3/common.txt ../input/paper3/concrete3/inversion.txt ../input/paper3/concrete3/innerproduct_sst.txt ../input/paper3/concrete3/localminimum_classic.txt ../input/paper3/concrete3/descentsearch_lbfgs_ls.txt ../input/paper3/concrete3/linesearch_unit.txt ../input/paper3/concrete3/data_snrm3.txt ../input/paper3/concrete3/regularization_totalvariation.txt -verbose 2 -maxThreads 1 -regularization_lambda ${ARGS_R[$SLURM_ARRAY_TASK_ID]} -name sst_lbfgs_ls_snrm3_tv$SLURM_ARRAY_TASK_ID
diff --git a/input/paper3/concrete3/localminimum_classic.txt b/input/paper3/concrete3/localminimum_classic.txt
index 82492d5..6dc819f 100644
--- a/input/paper3/concrete3/localminimum_classic.txt
+++ b/input/paper3/concrete3/localminimum_classic.txt
@@ -1,3 +1,3 @@
#Local minimum search
localminimumsearch = classic
-localminimum_writeInterval = 1
+localminimum_writeInterval = 10
--
GitLab