Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
preprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
preprocessor
Merge requests
!25
Fix faulty logic in checks for mh_tune_jscale
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Fix faulty logic in checks for mh_tune_jscale
JohannesPfeifer/preprocessor:tune_jscale
into
master
Overview
5
Commits
1
Pipelines
2
Changes
1
Merged
Fix faulty logic in checks for mh_tune_jscale
Johannes Pfeifer
requested to merge
JohannesPfeifer/preprocessor:tune_jscale
into
master
Jul 17, 2020
Overview
5
Commits
1
Pipelines
2
Changes
1
Closes
#46 (closed)
0
0
Merge request reports
Compare
master
version 1
64356107
Jul 17, 2020
master (base)
and
latest version
latest version
eb464665
1 commit,
Jul 21, 2020
version 1
64356107
1 commit,
Jul 17, 2020
1 file
+
9
−
7
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/ComputingTasks.cc
+
9
−
7
View file @ eb464665
Edit in single-file editor
Open in Web IDE
Show full file
@@ -1219,19 +1219,21 @@ EstimationStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsoli
exit
(
EXIT_FAILURE
);
}
if
(
options_list
.
num_options
.
find
(
"mh_tune_jscale.ta
rget"
)
!=
options_list
.
num_options
.
end
()
&&
options_list
.
num_options
.
fi
nd
(
"mh_jscale"
)
!=
options_list
.
num_options
.
end
()
)
if
(
auto
it
=
options_list
.
num_options
.
find
(
"mh_tune_jscale.
s
ta
tus"
);
it
!=
options_list
.
num_options
.
e
nd
(
)
&&
it
->
second
==
"true"
)
{
cerr
<<
"ERROR: The mh_tune_jscale and mh_jscale options of the estimation statement are incompatible."
<<
endl
;
exit
(
EXIT_FAILURE
);
if
(
options_list
.
num_options
.
find
(
"mh_jscale"
)
!=
options_list
.
num_options
.
end
())
{
cerr
<<
"ERROR: The mh_tune_jscale and mh_jscale options of the estimation statement are incompatible."
<<
endl
;
exit
(
EXIT_FAILURE
);
}
}
if
(
options_list
.
num_options
.
find
(
"mh_tune_jscale.guess"
)
!=
options_list
.
num_options
.
end
()
&&
options_list
.
num_options
.
find
(
"mh_tune_jscale.target"
)
==
options_list
.
num_options
.
end
())
else
if
(
options_list
.
num_options
.
find
(
"mh_tune_jscale.guess"
)
!=
options_list
.
num_options
.
end
())
{
cerr
<<
"ERROR: The option mh_tune_guess in estimation statement cannot be used without option mh_tune_jscale."
<<
endl
;
exit
(
EXIT_FAILURE
);
}
/* Check that we are not trying to estimate a parameter appearing in the
planner discount factor (see dynare#1173) */
Loading