From 6391f8bbda4d28159e1808b3adcabaeef7d7904d Mon Sep 17 00:00:00 2001 From: "Brian M. Adams" Date: Thu, 28 Sep 2017 12:08:56 -0600 Subject: [PATCH] Revert quotes in input files that can foil Boost prog opts Partially addresses libqueso/queso#642 by partially reverting "Make boost po opt-in, convert all test input files to getpot format" This reverts the input files modified in commit 00477bdb79b3588999ef1298c69884fa0f42146e. Conflicts: configure.ac --- test/t01_valid_cycle/tgaCycle.inp | 54 +++++++++---------- test/t02_sip_sfp/example.inp | 14 ++--- test/t04_bimodal/example_1chain.inp | 6 +-- test/test_Environment/input_test_serialEnv | 4 +- .../test_options_good.txt | 8 +-- .../queso_input.txt | 6 +-- .../GaussianMean1DRegression_options | 2 +- test/test_Regression/adaptedcov_input.txt | 6 +-- test/test_Regression/gpmsa_cobra_input.txt | 6 +-- test/test_Regression/jeffreys_input.txt | 8 +-- .../both_input.txt | 4 +- .../llhdout_input.txt | 4 +- .../neither_input.txt | 4 +- .../targetout_input.txt | 4 +- test/test_algorithms/input_test_mala.txt | 2 +- .../gaussian_consistency_input.txt | 2 +- .../test_gaussian_likelihoods/queso_input.txt | 6 +-- test/test_gpmsa/gpmsa_autoscaled_input.txt | 6 +-- test/test_gpmsa/gpmsa_vector_input.txt | 6 +-- test/test_intercomm0/gravity_1proc.txt | 20 +++---- test/test_intercomm0/gravity_2proc.txt | 20 +++---- .../input_test_optimizer_input_parameters | 4 +- .../input_test_optimizer_options | 4 +- 23 files changed, 100 insertions(+), 100 deletions(-) diff --git a/test/t01_valid_cycle/tgaCycle.inp b/test/t01_valid_cycle/tgaCycle.inp index 82923bd51..5e2a4b3fa 100644 --- a/test/t01_valid_cycle/tgaCycle.inp +++ b/test/t01_valid_cycle/tgaCycle.inp @@ -5,7 +5,7 @@ env_numSubEnvironments = 1 env_subDisplayFileName = output_test_TgaValidationCycle_gsl/screen env_subDisplayAllowAll = 0 -env_subDisplayAllowedSet = '0 1' +env_subDisplayAllowedSet = 0 1 env_displayVerbosity = 2 env_syncVerbosity = 0 @@ -19,7 +19,7 @@ env_seed = 0 cycle_cal_ip_help = anything cycle_cal_ip_computeSolution = 1 cycle_cal_ip_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaCalOutput -cycle_cal_ip_dataOutputAllowedSet = '0 1' +cycle_cal_ip_dataOutputAllowedSet = 0 1 ############################################### # 'cal_ip_': information for Metropolis-Hastings algorithm @@ -29,7 +29,7 @@ cycle_cal_ip_dataOutputAllowedSet = '0 1' ############################################### cycle_cal_ip_mh_help = anything cycle_cal_ip_mh_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaCalOutput -cycle_cal_ip_mh_dataOutputAllowedSet = '0 1' +cycle_cal_ip_mh_dataOutputAllowedSet = 0 1 cycle_cal_ip_mh_rawChain_dataInputFileName = . # output_test_TgaValidationCycle_gsl/file_cal_ip_raw1 cycle_cal_ip_mh_rawChain_size = 16384 @@ -37,7 +37,7 @@ cycle_cal_ip_mh_rawChain_generateExtra = 0 cycle_cal_ip_mh_rawChain_displayPeriod = 20000 cycle_cal_ip_mh_rawChain_measureRunTimes = 1 cycle_cal_ip_mh_rawChain_dataOutputFileName = output_test_TgaValidationCycle_gsl/file_cal_ip_raw2 -cycle_cal_ip_mh_rawChain_dataOutputAllowedSet = '0 1' +cycle_cal_ip_mh_rawChain_dataOutputAllowedSet = 0 1 cycle_cal_ip_mh_rawChain_computeStats = 1 cycle_cal_ip_mh_displayCandidates = 0 @@ -45,7 +45,7 @@ cycle_cal_ip_mh_putOutOfBoundsInChain = 1 cycle_cal_ip_mh_tk_useLocalHessian = 0 cycle_cal_ip_mh_tk_useNewtonComponent = 1 cycle_cal_ip_mh_dr_maxNumExtraStages = 1 -cycle_cal_ip_mh_dr_listOfScalesForExtraStages = '5. 4. 3.' +cycle_cal_ip_mh_dr_listOfScalesForExtraStages = 5. 4. 3. cycle_cal_ip_mh_am_initialNonAdaptInterval = 0 cycle_cal_ip_mh_am_adaptInterval = 100 cycle_cal_ip_mh_am_eta = 1.92 @@ -55,13 +55,13 @@ cycle_cal_ip_mh_filteredChain_generate = 1 cycle_cal_ip_mh_filteredChain_discardedPortion = 0. cycle_cal_ip_mh_filteredChain_lag = 20 cycle_cal_ip_mh_filteredChain_dataOutputFileName = . -cycle_cal_ip_mh_filteredChain_dataOutputAllowedSet = '0 1' +cycle_cal_ip_mh_filteredChain_dataOutputAllowedSet = 0 1 cycle_cal_ip_mh_filteredChain_computeStats = 1 #cycle_cal_ip_mh_rawChain_stats_help = anything -cycle_cal_ip_mh_rawChain_stats_initialDiscardedPortions = '0. .05 .10 .15 .20 .25 .30 .35 .40' +cycle_cal_ip_mh_rawChain_stats_initialDiscardedPortions = 0. .05 .10 .15 .20 .25 .30 .35 .40 cycle_cal_ip_mh_rawChain_stats_bmm_run = 0 -cycle_cal_ip_mh_rawChain_stats_bmm_lengths = '50 100 200 250' +cycle_cal_ip_mh_rawChain_stats_bmm_lengths = 50 100 200 250 cycle_cal_ip_mh_rawChain_stats_fft_compute = 0 cycle_cal_ip_mh_rawChain_stats_fft_paramId = 0 cycle_cal_ip_mh_rawChain_stats_fft_size = 2048 @@ -102,7 +102,7 @@ cycle_cal_ip_mh_rawChain_stats_corrMatrix_compute = 1 #cycle_cal_ip_mh_filteredChain_stats_help = anything cycle_cal_ip_mh_filteredChain_stats_initialDiscardedPortions = 0. cycle_cal_ip_mh_filteredChain_stats_bmm_run = 0 -cycle_cal_ip_mh_filteredChain_stats_bmm_lengths = '50 100 200 250' +cycle_cal_ip_mh_filteredChain_stats_bmm_lengths = 50 100 200 250 cycle_cal_ip_mh_filteredChain_stats_fft_compute = 0 cycle_cal_ip_mh_filteredChain_stats_fft_paramId = 0 cycle_cal_ip_mh_filteredChain_stats_fft_size = 2048 @@ -148,7 +148,7 @@ cycle_cal_fp_computeSolution = 1 cycle_cal_fp_computeCovariances = 1 cycle_cal_fp_computeCorrelations = 1 cycle_cal_fp_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaCalOutput -cycle_cal_fp_dataOutputAllowedSet = '0 1' +cycle_cal_fp_dataOutputAllowedSet = 0 1 ############################################### # 'cal_fp_': information for Monte Carlo algorithm @@ -158,10 +158,10 @@ cycle_cal_fp_dataOutputAllowedSet = '0 1' ############################################### cycle_cal_fp_mc_help = anything cycle_cal_fp_mc_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaCalOutput -cycle_cal_fp_mc_dataOutputAllowedSet = '0 1' +cycle_cal_fp_mc_dataOutputAllowedSet = 0 1 cycle_cal_fp_mc_pseq_dataOutputFileName = . -cycle_cal_fp_mc_pseq_dataOutputAllowedSet = '0 1' +cycle_cal_fp_mc_pseq_dataOutputAllowedSet = 0 1 cycle_cal_fp_mc_pseq_computeStats = 1 #cycle_cal_fp_mc_pseq_stats_help = anything @@ -181,13 +181,13 @@ cycle_cal_fp_mc_qseq_size = 1048576 cycle_cal_fp_mc_qseq_displayPeriod = 20000 cycle_cal_fp_mc_qseq_measureRunTimes = 1 cycle_cal_fp_mc_qseq_dataOutputFileName = output_test_TgaValidationCycle_gsl/file_cal_fp_qoi2 -cycle_cal_fp_mc_qseq_dataOutputAllowedSet = '0 1' +cycle_cal_fp_mc_qseq_dataOutputAllowedSet = 0 1 cycle_cal_fp_mc_qseq_computeStats = 1 #cycle_cal_fp_mc_qseq_stats_help = anything cycle_cal_fp_mc_qseq_stats_initialDiscardedPortions = 0. cycle_cal_fp_mc_qseq_stats_bmm_run = 0 -cycle_cal_fp_mc_qseq_stats_bmm_lengths = '50 100 200 250' +cycle_cal_fp_mc_qseq_stats_bmm_lengths = 50 100 200 250 cycle_cal_fp_mc_qseq_stats_fft_compute = 0 cycle_cal_fp_mc_qseq_stats_fft_paramId = 0 cycle_cal_fp_mc_qseq_stats_fft_size = 2048 @@ -231,7 +231,7 @@ cycle_cal_fp_mc_qseq_stats_corrMatrix_compute = 1 cycle_val_ip_help = anything cycle_val_ip_computeSolution = 1 cycle_val_ip_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaValOutput -cycle_val_ip_dataOutputAllowedSet = '0 1' +cycle_val_ip_dataOutputAllowedSet = 0 1 ############################################### # 'val_ip_': information for Metropolis-Hastings algorithm @@ -241,7 +241,7 @@ cycle_val_ip_dataOutputAllowedSet = '0 1' ############################################### cycle_val_ip_mh_help = anything cycle_val_ip_mh_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaValOutput -cycle_val_ip_mh_dataOutputAllowedSet = '0 1' +cycle_val_ip_mh_dataOutputAllowedSet = 0 1 cycle_val_ip_mh_rawChain_dataInputFileName = . # output_test_TgaValidationCycle_gsl/file_val_ip_raw1 cycle_val_ip_mh_rawChain_size = 16384 @@ -249,7 +249,7 @@ cycle_val_ip_mh_rawChain_generateExtra = 0 cycle_val_ip_mh_rawChain_displayPeriod = 20000 cycle_val_ip_mh_rawChain_measureRunTimes = 1 cycle_val_ip_mh_rawChain_dataOutputFileName = output_test_TgaValidationCycle_gsl/file_val_ip_raw2 -cycle_val_ip_mh_rawChain_dataOutputAllowedSet = '0 1' +cycle_val_ip_mh_rawChain_dataOutputAllowedSet = 0 1 cycle_val_ip_mh_rawChain_computeStats = 1 cycle_val_ip_mh_displayCandidates = 0 @@ -257,7 +257,7 @@ cycle_val_ip_mh_putOutOfBoundsInChain = 1 cycle_val_ip_mh_tk_useLocalHessian = 0 cycle_val_ip_mh_tk_useNewtonComponent = 1 cycle_val_ip_mh_dr_maxNumExtraStages = 1 -cycle_val_ip_mh_dr_listOfScalesForExtraStages = '5. 4. 3.' +cycle_val_ip_mh_dr_listOfScalesForExtraStages = 5. 4. 3. cycle_val_ip_mh_am_initialNonAdaptInterval = 0 cycle_val_ip_mh_am_adaptInterval = 100 cycle_val_ip_mh_am_eta = 1.92 @@ -267,13 +267,13 @@ cycle_val_ip_mh_filteredChain_generate = 1 cycle_val_ip_mh_filteredChain_discardedPortion = 0. cycle_val_ip_mh_filteredChain_lag = 20 cycle_val_ip_mh_filteredChain_dataOutputFileName = . -cycle_val_ip_mh_filteredChain_dataOutputAllowedSet = '0 1' +cycle_val_ip_mh_filteredChain_dataOutputAllowedSet = 0 1 cycle_val_ip_mh_filteredChain_computeStats = 1 #cycle_val_ip_mh_rawChain_stats_help = anything -cycle_val_ip_mh_rawChain_stats_initialDiscardedPortions = '0. .05 .10 .15 .20 .25 .30 .35 .40' +cycle_val_ip_mh_rawChain_stats_initialDiscardedPortions = 0. .05 .10 .15 .20 .25 .30 .35 .40 cycle_val_ip_mh_rawChain_stats_bmm_run = 0 -cycle_val_ip_mh_rawChain_stats_bmm_lengths = '50 100 200 250' +cycle_val_ip_mh_rawChain_stats_bmm_lengths = 50 100 200 250 cycle_val_ip_mh_rawChain_stats_fft_compute = 0 cycle_val_ip_mh_rawChain_stats_fft_paramId = 0 cycle_val_ip_mh_rawChain_stats_fft_size = 2048 @@ -314,7 +314,7 @@ cycle_val_ip_mh_rawChain_stats_corrMatrix_compute = 1 #cycle_val_ip_mh_filteredChain_stats_help = anything cycle_val_ip_mh_filteredChain_stats_initialDiscardedPortions = 0. cycle_val_ip_mh_filteredChain_stats_bmm_run = 0 -cycle_val_ip_mh_filteredChain_stats_bmm_lengths = '50 100 200 250' +cycle_val_ip_mh_filteredChain_stats_bmm_lengths = 50 100 200 250 cycle_val_ip_mh_filteredChain_stats_fft_compute = 0 cycle_val_ip_mh_filteredChain_stats_fft_paramId = 0 cycle_val_ip_mh_filteredChain_stats_fft_size = 2048 @@ -360,7 +360,7 @@ cycle_val_fp_computeSolution = 1 cycle_val_fp_computeCovariances = 1 cycle_val_fp_computeCorrelations = 1 cycle_val_fp_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaValOutput -cycle_val_fp_dataOutputAllowedSet = '0 1' +cycle_val_fp_dataOutputAllowedSet = 0 1 ############################################### # 'val_fp_': information for Monte Carlo algorithm @@ -370,10 +370,10 @@ cycle_val_fp_dataOutputAllowedSet = '0 1' ############################################### cycle_val_fp_mc_help = anything cycle_val_fp_mc_dataOutputFileName = output_test_TgaValidationCycle_gsl/tgaValOutput -cycle_val_fp_mc_dataOutputAllowedSet = '0 1' +cycle_val_fp_mc_dataOutputAllowedSet = 0 1 cycle_val_fp_mc_pseq_dataOutputFileName = . -cycle_val_fp_mc_pseq_dataOutputAllowedSet = '0 1' +cycle_val_fp_mc_pseq_dataOutputAllowedSet = 0 1 cycle_val_fp_mc_pseq_computeStats = 1 #cycle_val_fp_mc_pseq_stats_help = anything @@ -393,13 +393,13 @@ cycle_val_fp_mc_qseq_size = 1048576 cycle_val_fp_mc_qseq_displayPeriod = 20000 cycle_val_fp_mc_qseq_measureRunTimes = 1 cycle_val_fp_mc_qseq_dataOutputFileName = output_test_TgaValidationCycle_gsl/file_val_fp_qoi2 -cycle_val_fp_mc_qseq_dataOutputAllowedSet = '0 1' +cycle_val_fp_mc_qseq_dataOutputAllowedSet = 0 1 cycle_val_fp_mc_qseq_computeStats = 1 #cycle_val_fp_mc_qseq_stats_help = anything cycle_val_fp_mc_qseq_stats_initialDiscardedPortions = 0. cycle_val_fp_mc_qseq_stats_bmm_run = 0 -cycle_val_fp_mc_qseq_stats_bmm_lengths = '50 100 200 250' +cycle_val_fp_mc_qseq_stats_bmm_lengths = 50 100 200 250 cycle_val_fp_mc_qseq_stats_fft_compute = 0 cycle_val_fp_mc_qseq_stats_fft_paramId = 0 cycle_val_fp_mc_qseq_stats_fft_size = 2048 diff --git a/test/t02_sip_sfp/example.inp b/test/t02_sip_sfp/example.inp index ae5b723f5..df706029b 100644 --- a/test/t02_sip_sfp/example.inp +++ b/test/t02_sip_sfp/example.inp @@ -26,7 +26,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = output_test_SipSfpExample_gsl/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 32768 @@ -34,7 +34,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = output_test_SipSfpExample_gsl/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 @@ -52,7 +52,7 @@ ip_mh_filteredChain_generate = 1 ip_mh_filteredChain_discardedPortion = 0. ip_mh_filteredChain_lag = 16 ip_mh_filteredChain_dataOutputFileName = output_test_SipSfpExample_gsl/ip_filt_chain -ip_mh_filteredChain_dataOutputAllowedSet = '0 1' +ip_mh_filteredChain_dataOutputAllowedSet = 0 1 ############################################### # Statistical forward problem (fp) @@ -62,21 +62,21 @@ fp_computeSolution = 1 fp_computeCovariances = 1 fp_computeCorrelations = 1 fp_dataOutputFileName = output_test_SipSfpExample_gsl/sfpOutput -fp_dataOutputAllowedSet = '0 1' +fp_dataOutputAllowedSet = 0 1 ############################################### # 'fp_': information for Monte Carlo algorithm ############################################### #fp_mc_help = anything fp_mc_dataOutputFileName = output_test_SipSfpExample_gsl/sfpOutput -fp_mc_dataOutputAllowedSet = '0 1' +fp_mc_dataOutputAllowedSet = 0 1 fp_mc_pseq_dataOutputFileName = output_test_SipSfpExample_gsl/fp_p_seq -fp_mc_pseq_dataOutputAllowedSet = '0 1' +fp_mc_pseq_dataOutputAllowedSet = 0 1 fp_mc_qseq_size = 1048576 fp_mc_qseq_displayPeriod = 20000 fp_mc_qseq_measureRunTimes = 1 fp_mc_qseq_dataOutputFileName = output_test_SipSfpExample_gsl/fp_q_seq -fp_mc_qseq_dataOutputAllowedSet = '0 1' +fp_mc_qseq_dataOutputAllowedSet = 0 1 diff --git a/test/t04_bimodal/example_1chain.inp b/test/t04_bimodal/example_1chain.inp index 632fd8230..05da15033 100644 --- a/test/t04_bimodal/example_1chain.inp +++ b/test/t04_bimodal/example_1chain.inp @@ -5,7 +5,7 @@ env_numSubEnvironments = 1 env_subDisplayFileName = outputData/display env_subDisplayAllowAll = 0 -env_subDisplayAllowedSet = '0 1' +env_subDisplayAllowedSet = 0 1 env_displayVerbosity = 2 env_syncVerbosity = 0 @@ -28,7 +28,7 @@ ip_dataOutputAllowedSet = 0 #ip_ml_restartInputFileName = outputData/rawChain_ml_input #ip_ml_restartChainSize = 10000 ip_ml_dataOutputFileName = outputData/sipOutput_ml -ip_ml_dataOutputAllowedSet = '0 1' +ip_ml_dataOutputAllowedSet = 0 1 ############################################### # All levels, unless otherwise specified @@ -57,7 +57,7 @@ ip_ml_6_putOutOfBoundsInChain = 0 # Last level (level 4 for 'example_gsl' executable) ############################################### ip_ml_last_dataOutputFileName = outputData/sipOutput_ml -ip_ml_last_dataOutputAllowedSet = '0 1' +ip_ml_last_dataOutputAllowedSet = 0 1 #ip_ml_last_loadBalance = 0 ip_ml_last_rawChain_size = 10000 diff --git a/test/test_Environment/input_test_serialEnv b/test/test_Environment/input_test_serialEnv index 87aa9cc69..0e42c025e 100644 --- a/test/test_Environment/input_test_serialEnv +++ b/test/test_Environment/input_test_serialEnv @@ -23,7 +23,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = output_test_serialEnv/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 10 @@ -31,7 +31,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = output_test_serialEnv/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 diff --git a/test/test_InputOptionsParser/test_options_good.txt b/test/test_InputOptionsParser/test_options_good.txt index 2e7f5cca4..ba36119a9 100644 --- a/test/test_InputOptionsParser/test_options_good.txt +++ b/test/test_InputOptionsParser/test_options_good.txt @@ -1,7 +1,7 @@ int = -2 unsigned_int = 2 double = -2.0 -bool = 'false' -std_string = 'hello' -set_unsigned_int = '2 3 4' -vector_double = '-2.0 3.0 4.0' +bool = false +std_string = hello +set_unsigned_int = 2 3 4 +vector_double = -2.0 3.0 4.0 diff --git a/test/test_InterpolationSurrogate/queso_input.txt b/test/test_InterpolationSurrogate/queso_input.txt index a4d014ae6..779e15570 100644 --- a/test/test_InterpolationSurrogate/queso_input.txt +++ b/test/test_InterpolationSurrogate/queso_input.txt @@ -23,7 +23,7 @@ ip_dataOutputAllowedSet = 0 ############################################### ip_mh_help = anything ip_mh_dataOutputFileName = test_output_interp_surrogates/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 1 @@ -31,7 +31,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_output_interp_surrogates/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 @@ -39,7 +39,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 0 ip_mh_dr_maxNumExtraStages = 0 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 10 ip_mh_am_adaptInterval = 1 ip_mh_am_eta = 0.384 diff --git a/test/test_Regression/GaussianMean1DRegression_options b/test/test_Regression/GaussianMean1DRegression_options index 82dff6d21..cf4a76840 100644 --- a/test/test_Regression/GaussianMean1DRegression_options +++ b/test/test_Regression/GaussianMean1DRegression_options @@ -47,5 +47,5 @@ ip_ml_last_filteredChain_lag = 5 GaussianMean1DRegression_priorMean = 5.0 GaussianMean1DRegression_priorVar = 1.0 GaussianMean1DRegression_samplingVar = 1.0 -GaussianMean1DRegression_dataSet = '-0.1437 -0.0982 -1.3616 -0.0171 -1.0290 0.7133 -0.5496 -0.2415 -0.0933 -0.0669 -0.2311 -1.5371 -0.7418 -0.2220 0.0209 1.6905 -0.8379 0.4233 1.7065 1.5676 0.1265 1.0728 1.8126 2.7186 -0.6680 0.5251 -0.4768 0.6027 -1.9304 -2.1159 1.8698 0.3908 -1.2513 1.2597 0.1426 -0.6527 -0.5948 -0.6698 0.3874 0.3455 -0.1988 -0.4574 0.6930 1.3184 -0.2715 -0.9510 0.3593 -0.4184 0.5243 0.2846 -0.3556 -1.4877 -0.8829 1.0829 -0.7700 -0.1138 0.6430 -0.7929 -1.6493 0.1000' +GaussianMean1DRegression_dataSet = -0.1437 -0.0982 -1.3616 -0.0171 -1.0290 0.7133 -0.5496 -0.2415 -0.0933 -0.0669 -0.2311 -1.5371 -0.7418 -0.2220 0.0209 1.6905 -0.8379 0.4233 1.7065 1.5676 0.1265 1.0728 1.8126 2.7186 -0.6680 0.5251 -0.4768 0.6027 -1.9304 -2.1159 1.8698 0.3908 -1.2513 1.2597 0.1426 -0.6527 -0.5948 -0.6698 0.3874 0.3455 -0.1988 -0.4574 0.6930 1.3184 -0.2715 -0.9510 0.3593 -0.4184 0.5243 0.2846 -0.3556 -1.4877 -0.8829 1.0829 -0.7700 -0.1138 0.6430 -0.7929 -1.6493 0.1000 diff --git a/test/test_Regression/adaptedcov_input.txt b/test/test_Regression/adaptedcov_input.txt index b0406f53f..3b08a430b 100644 --- a/test/test_Regression/adaptedcov_input.txt +++ b/test/test_Regression/adaptedcov_input.txt @@ -26,7 +26,7 @@ ip_dataOutputAllowedSet = 0 ############################################### ip_mh_help = anything ip_mh_dataOutputFileName = test_adaptedcov_output/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 100000 @@ -34,7 +34,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_adaptedcov_output/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 @@ -42,7 +42,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 0 ip_mh_dr_maxNumExtraStages = 0 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 10000 ip_mh_am_adaptInterval = 1000 ip_mh_am_eta = 0.384 diff --git a/test/test_Regression/gpmsa_cobra_input.txt b/test/test_Regression/gpmsa_cobra_input.txt index bbd280f2d..347a5a4ef 100644 --- a/test/test_Regression/gpmsa_cobra_input.txt +++ b/test/test_Regression/gpmsa_cobra_input.txt @@ -26,7 +26,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = test_gpmsa_cobra_output/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 1000 @@ -34,7 +34,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_gpmsa_cobra_output/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 @@ -42,7 +42,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 0 ip_mh_dr_maxNumExtraStages = 0 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 1000 ip_mh_am_adaptInterval = 100000 ip_mh_am_eta = 0.384 diff --git a/test/test_Regression/jeffreys_input.txt b/test/test_Regression/jeffreys_input.txt index 9d2133497..25eaac28d 100644 --- a/test/test_Regression/jeffreys_input.txt +++ b/test/test_Regression/jeffreys_input.txt @@ -20,21 +20,21 @@ fp_computeSolution = 1 fp_computeCovariances = 1 fp_computeCorrelations = 1 fp_dataOutputFileName = test_jeffreys_output/sfpOutput -fp_dataOutputAllowedSet = '0 1' +fp_dataOutputAllowedSet = 0 1 ############################################### # 'fp_': information for Monte Carlo algorithm ############################################### fp_mc_help = 1 fp_mc_dataOutputFileName = test_jeffreys_output/sfpOutput -fp_mc_dataOutputAllowedSet = '0 1' +fp_mc_dataOutputAllowedSet = 0 1 fp_mc_pseq_dataOutputFileName = test_jeffreys_output/fp_p_seq -fp_mc_pseq_dataOutputAllowedSet = '0 1' +fp_mc_pseq_dataOutputAllowedSet = 0 1 fp_mc_qseq_size = 10 # 20000 fp_mc_qseq_displayPeriod = 1 #2000 fp_mc_qseq_measureRunTimes = 1 fp_mc_qseq_dataOutputFileName = test_jeffreys_output/fp_q_seq -fp_mc_qseq_dataOutputAllowedSet = '0 1' +fp_mc_qseq_dataOutputAllowedSet = 0 1 diff --git a/test/test_StatisticalInverseProblem/both_input.txt b/test/test_StatisticalInverseProblem/both_input.txt index 9d805700a..058700abd 100644 --- a/test/test_StatisticalInverseProblem/both_input.txt +++ b/test/test_StatisticalInverseProblem/both_input.txt @@ -23,7 +23,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = test_outputBoth/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 10 @@ -31,7 +31,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_outputBoth/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 diff --git a/test/test_StatisticalInverseProblem/llhdout_input.txt b/test/test_StatisticalInverseProblem/llhdout_input.txt index 331f7f0e6..86c2434fb 100644 --- a/test/test_StatisticalInverseProblem/llhdout_input.txt +++ b/test/test_StatisticalInverseProblem/llhdout_input.txt @@ -23,7 +23,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = test_outputLlhd/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 10 @@ -31,7 +31,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_outputLlhd/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 diff --git a/test/test_StatisticalInverseProblem/neither_input.txt b/test/test_StatisticalInverseProblem/neither_input.txt index 063c45314..c8a443714 100644 --- a/test/test_StatisticalInverseProblem/neither_input.txt +++ b/test/test_StatisticalInverseProblem/neither_input.txt @@ -23,7 +23,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = test_outputNeither/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 10 @@ -31,7 +31,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_outputNeither/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 diff --git a/test/test_StatisticalInverseProblem/targetout_input.txt b/test/test_StatisticalInverseProblem/targetout_input.txt index 428526499..9877973a3 100644 --- a/test/test_StatisticalInverseProblem/targetout_input.txt +++ b/test/test_StatisticalInverseProblem/targetout_input.txt @@ -23,7 +23,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = test_outputTarget/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 10 @@ -31,7 +31,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_outputTarget/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 diff --git a/test/test_algorithms/input_test_mala.txt b/test/test_algorithms/input_test_mala.txt index e802df564..460404fbf 100644 --- a/test/test_algorithms/input_test_mala.txt +++ b/test/test_algorithms/input_test_mala.txt @@ -43,7 +43,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 1 ip_mh_dr_maxNumExtraStages = 3 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 0 ip_mh_am_adaptInterval = 0 ip_mh_am_eta = 1.92 diff --git a/test/test_gaussian_likelihoods/gaussian_consistency_input.txt b/test/test_gaussian_likelihoods/gaussian_consistency_input.txt index 4065d0e9d..7778d9bca 100644 --- a/test/test_gaussian_likelihoods/gaussian_consistency_input.txt +++ b/test/test_gaussian_likelihoods/gaussian_consistency_input.txt @@ -35,7 +35,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 0 ip_mh_dr_maxNumExtraStages = 0 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 10 ip_mh_am_adaptInterval = 1 ip_mh_am_eta = 0.384 diff --git a/test/test_gaussian_likelihoods/queso_input.txt b/test/test_gaussian_likelihoods/queso_input.txt index 57bbcec3d..2aea16d49 100644 --- a/test/test_gaussian_likelihoods/queso_input.txt +++ b/test/test_gaussian_likelihoods/queso_input.txt @@ -23,7 +23,7 @@ ip_dataOutputAllowedSet = 0 ############################################### ip_mh_help = anything ip_mh_dataOutputFileName = test_output_gaussian_likelihoods/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 1 @@ -31,7 +31,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_output_gaussian_likelihoods/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 @@ -39,7 +39,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 0 ip_mh_dr_maxNumExtraStages = 0 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 10 ip_mh_am_adaptInterval = 1 ip_mh_am_eta = 0.384 diff --git a/test/test_gpmsa/gpmsa_autoscaled_input.txt b/test/test_gpmsa/gpmsa_autoscaled_input.txt index 1973abc49..bdad9742f 100644 --- a/test/test_gpmsa/gpmsa_autoscaled_input.txt +++ b/test/test_gpmsa/gpmsa_autoscaled_input.txt @@ -26,7 +26,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = test_gpmsa_autoscaled_output/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 1000 @@ -34,7 +34,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_gpmsa_autoscaled_output/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 @@ -42,7 +42,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 0 ip_mh_dr_maxNumExtraStages = 0 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 1000 ip_mh_am_adaptInterval = 100000 ip_mh_am_eta = 0.384 diff --git a/test/test_gpmsa/gpmsa_vector_input.txt b/test/test_gpmsa/gpmsa_vector_input.txt index 7a94a5699..6ae39b548 100644 --- a/test/test_gpmsa/gpmsa_vector_input.txt +++ b/test/test_gpmsa/gpmsa_vector_input.txt @@ -26,7 +26,7 @@ ip_dataOutputAllowedSet = 0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = test_gpmsa_vector_output/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 1000 @@ -34,7 +34,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = test_gpmsa_vector_output/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 @@ -42,7 +42,7 @@ ip_mh_putOutOfBoundsInChain = 0 ip_mh_tk_useLocalHessian = 0 ip_mh_tk_useNewtonComponent = 0 ip_mh_dr_maxNumExtraStages = 0 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 1000 ip_mh_am_adaptInterval = 100000 ip_mh_am_eta = 0.384 diff --git a/test/test_intercomm0/gravity_1proc.txt b/test/test_intercomm0/gravity_1proc.txt index 91ca24d8e..d9fc7612f 100644 --- a/test/test_intercomm0/gravity_1proc.txt +++ b/test/test_intercomm0/gravity_1proc.txt @@ -4,7 +4,7 @@ env_numSubEnvironments = 1 env_subDisplayFileName = output_test_intercomm0_gravity_1/display_env env_subDisplayAllowAll = 0 -env_subDisplayAllowedSet = '0 1 2 3 4 5 6 7' +env_subDisplayAllowedSet = 0 1 2 3 4 5 6 7 env_displayVerbosity = 2 env_seed = -1 @@ -13,13 +13,13 @@ env_seed = -1 ############################################### ip_computeSolution = 1 ip_dataOutputFileName = output_test_intercomm0_gravity_1/sip_gravity -ip_dataOutputAllowedSet = '0 1' +ip_dataOutputAllowedSet = 0 1 ############################################### # Information for Metropolis-Hastings algorithm ############################################### ip_mh_dataOutputFileName = output_test_intercomm0_gravity_1/sip_gravity -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 20000 @@ -27,12 +27,12 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = output_test_intercomm0_gravity_1/sip_gravity_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1 2 3 4 5 6 7' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 2 3 4 5 6 7 ip_mh_displayCandidates = 0 ip_mh_putOutOfBoundsInChain = 0 ip_mh_dr_maxNumExtraStages = 3 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 0 ip_mh_am_adaptInterval = 100 ip_mh_am_eta = 1.98 #(2.4^2)/d, d is the dimension of the problem @@ -42,7 +42,7 @@ ip_mh_filteredChain_generate = 1 ip_mh_filteredChain_discardedPortion = 0. ip_mh_filteredChain_lag = 20 ip_mh_filteredChain_dataOutputFileName = output_test_intercomm0_gravity_1/sip_gravity_filtered_chain -ip_mh_filteredChain_dataOutputAllowedSet = '0 1' +ip_mh_filteredChain_dataOutputAllowedSet = 0 1 ############################################### # Statistical forward problem (fp) @@ -52,22 +52,22 @@ fp_computeSolution = 1 fp_computeCovariances = 1 fp_computeCorrelations = 1 fp_dataOutputFileName = output_test_intercomm0_gravity_1/sfp_gravity -fp_dataOutputAllowedSet = '0 1' +fp_dataOutputAllowedSet = 0 1 ############################################### # 'fp_': information for Monte Carlo algorithm ############################################### fp_mc_help = anything fp_mc_dataOutputFileName = output_test_intercomm0_gravity_1/sfp_gravity -fp_mc_dataOutputAllowedSet = '0 1' +fp_mc_dataOutputAllowedSet = 0 1 fp_mc_pseq_dataOutputFileName = output_test_intercomm0_gravity_1/sfp_gravity_p_seq -fp_mc_pseq_dataOutputAllowedSet = '0 1' +fp_mc_pseq_dataOutputAllowedSet = 0 1 fp_mc_qseq_dataInputFileName = . fp_mc_qseq_size = 16384 fp_mc_qseq_displayPeriod = 20000 fp_mc_qseq_measureRunTimes = 1 fp_mc_qseq_dataOutputFileName = output_test_intercomm0_gravity_1/sfp_gravity_qoi_seq -fp_mc_qseq_dataOutputAllowedSet = '0 1' +fp_mc_qseq_dataOutputAllowedSet = 0 1 diff --git a/test/test_intercomm0/gravity_2proc.txt b/test/test_intercomm0/gravity_2proc.txt index 11473c717..93c019c1d 100644 --- a/test/test_intercomm0/gravity_2proc.txt +++ b/test/test_intercomm0/gravity_2proc.txt @@ -4,7 +4,7 @@ env_numSubEnvironments = 1 env_subDisplayFileName = output_test_intercomm0_gravity_2/display_env env_subDisplayAllowAll = 0 -env_subDisplayAllowedSet = '0 1 2 3 4 5 6 7' +env_subDisplayAllowedSet = 0 1 2 3 4 5 6 7 env_displayVerbosity = 2 env_seed = -1 @@ -13,13 +13,13 @@ env_seed = -1 ############################################### ip_computeSolution = 1 ip_dataOutputFileName = output_test_intercomm0_gravity_2/sip_gravity -ip_dataOutputAllowedSet = '0 1' +ip_dataOutputAllowedSet = 0 1 ############################################### # Information for Metropolis-Hastings algorithm ############################################### ip_mh_dataOutputFileName = output_test_intercomm0_gravity_2/sip_gravity -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 20000 @@ -27,12 +27,12 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 2000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = output_test_intercomm0_gravity_2/sip_gravity_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1 2 3 4 5 6 7' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 2 3 4 5 6 7 ip_mh_displayCandidates = 0 ip_mh_putOutOfBoundsInChain = 0 ip_mh_dr_maxNumExtraStages = 3 -ip_mh_dr_listOfScalesForExtraStages = '5. 10. 20.' +ip_mh_dr_listOfScalesForExtraStages = 5. 10. 20. ip_mh_am_initialNonAdaptInterval = 0 ip_mh_am_adaptInterval = 100 ip_mh_am_eta = 1.98 #(2.4^2)/d, d is the dimension of the problem @@ -42,7 +42,7 @@ ip_mh_filteredChain_generate = 1 ip_mh_filteredChain_discardedPortion = 0. ip_mh_filteredChain_lag = 20 ip_mh_filteredChain_dataOutputFileName = output_test_intercomm0_gravity_2/sip_gravity_filtered_chain -ip_mh_filteredChain_dataOutputAllowedSet = '0 1' +ip_mh_filteredChain_dataOutputAllowedSet = 0 1 ############################################### # Statistical forward problem (fp) @@ -52,22 +52,22 @@ fp_computeSolution = 1 fp_computeCovariances = 1 fp_computeCorrelations = 1 fp_dataOutputFileName = output_test_intercomm0_gravity_2/sfp_gravity -fp_dataOutputAllowedSet = '0 1' +fp_dataOutputAllowedSet = 0 1 ############################################### # 'fp_': information for Monte Carlo algorithm ############################################### fp_mc_help = anything fp_mc_dataOutputFileName = output_test_intercomm0_gravity_2/sfp_gravity -fp_mc_dataOutputAllowedSet = '0 1' +fp_mc_dataOutputAllowedSet = 0 1 fp_mc_pseq_dataOutputFileName = output_test_intercomm0_gravity_2/sfp_gravity_p_seq -fp_mc_pseq_dataOutputAllowedSet = '0 1' +fp_mc_pseq_dataOutputAllowedSet = 0 1 fp_mc_qseq_dataInputFileName = . fp_mc_qseq_size = 16384 fp_mc_qseq_displayPeriod = 20000 fp_mc_qseq_measureRunTimes = 1 fp_mc_qseq_dataOutputFileName = output_test_intercomm0_gravity_2/sfp_gravity_qoi_seq -fp_mc_qseq_dataOutputAllowedSet = '0 1' +fp_mc_qseq_dataOutputAllowedSet = 0 1 diff --git a/test/test_optimizer/input_test_optimizer_input_parameters b/test/test_optimizer/input_test_optimizer_input_parameters index 523b88098..52bb4f945 100644 --- a/test/test_optimizer/input_test_optimizer_input_parameters +++ b/test/test_optimizer/input_test_optimizer_input_parameters @@ -30,7 +30,7 @@ optimizer_tolerance = 3.0 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = output_test_optimizer_options/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 10 @@ -38,7 +38,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = output_test_optimizer_options/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0 diff --git a/test/test_optimizer/input_test_optimizer_options b/test/test_optimizer/input_test_optimizer_options index 8e34d0a25..361e7620a 100644 --- a/test/test_optimizer/input_test_optimizer_options +++ b/test/test_optimizer/input_test_optimizer_options @@ -25,7 +25,7 @@ ip_useOptimizerMonitor = 1 ############################################### #ip_mh_help = anything ip_mh_dataOutputFileName = output_test_optimizer_options/sipOutput -ip_mh_dataOutputAllowedSet = '0 1' +ip_mh_dataOutputAllowedSet = 0 1 ip_mh_rawChain_dataInputFileName = . ip_mh_rawChain_size = 10 @@ -33,7 +33,7 @@ ip_mh_rawChain_generateExtra = 0 ip_mh_rawChain_displayPeriod = 50000 ip_mh_rawChain_measureRunTimes = 1 ip_mh_rawChain_dataOutputFileName = output_test_optimizer_options/ip_raw_chain -ip_mh_rawChain_dataOutputAllowedSet = '0 1' +ip_mh_rawChain_dataOutputAllowedSet = 0 1 ip_mh_rawChain_computeStats = 1 ip_mh_displayCandidates = 0