Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
6451a04e
Commit
6451a04e
authored
2 years ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Patches
Plain Diff
MinimizerContainerItem: add ordered list
parent
87b1a19e
No related branches found
No related tags found
1 merge request
!1004
Fit: catalogize algorithms, not minimizers
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
GUI/Model/Job/MinimizerItem.cpp
+32
-10
32 additions, 10 deletions
GUI/Model/Job/MinimizerItem.cpp
with
32 additions
and
10 deletions
GUI/Model/Job/MinimizerItem.cpp
+
32
−
10
View file @
6451a04e
...
@@ -33,21 +33,38 @@ const QMap<QString, QString> minimizer_names_map = {
...
@@ -33,21 +33,38 @@ const QMap<QString, QString> minimizer_names_map = {
const
QString
default_minimizer
=
minimizer_names_map
.
key
(
MinuitMinimizerItem
::
M_TYPE
);
const
QString
default_minimizer
=
minimizer_names_map
.
key
(
MinuitMinimizerItem
::
M_TYPE
);
QMap
<
QString
/*algorithm*/
,
QString
/*minimizer*/
>
algorithm_minimizer_map
;
QMap
<
QString
/*algorithm*/
,
QString
/*minimizer*/
>
algorithm_minimizer_map
;
QStringList
common_algorithms_list
;
void
create_algorithm_minimizer_map
()
void
create_algorithm_minimizer_map
()
{
{
QStringList
minuit2Algorithms
=
MinimizerItemCatalog
::
algorithmNames
(
MinuitMinimizerItem
::
M_TYPE
);
QString
name
=
"_wrong_name_"
;
for
(
QString
algorithm
:
minuit2Algorithms
)
algorithm_minimizer_map
.
insert
(
algorithm
+
" (ROOT Minuit2)"
,
GSLMultiMinimizerItem
::
M_TYPE
);
QStringList
minuit2Algorithms
=
MinimizerItemCatalog
::
algorithmNames
(
MinuitMinimizerItem
::
M_TYPE
);
for
(
QString
algorithm
:
minuit2Algorithms
)
{
name
=
algorithm
+
" (ROOT Minuit2)"
;
common_algorithms_list
.
append
(
name
);
algorithm_minimizer_map
.
insert
(
name
,
MinuitMinimizerItem
::
M_TYPE
);
}
QStringList
multiMinAlgorithms
=
MinimizerItemCatalog
::
algorithmNames
(
GSLMultiMinimizerItem
::
M_TYPE
);
QStringList
multiMinAlgorithms
=
MinimizerItemCatalog
::
algorithmNames
(
GSLMultiMinimizerItem
::
M_TYPE
);
for
(
QString
algorithm
:
multiMinAlgorithms
)
for
(
QString
algorithm
:
multiMinAlgorithms
)
{
algorithm_minimizer_map
.
insert
(
algorithm
+
" (GSL)"
,
GSLMultiMinimizerItem
::
M_TYPE
);
name
=
algorithm
+
" (GSL)"
;
common_algorithms_list
.
append
(
name
);
algorithm_minimizer_map
.
insert
(
name
,
GSLMultiMinimizerItem
::
M_TYPE
);
}
name
=
"Genetic (ROOT TMVA)"
;
common_algorithms_list
.
append
(
name
);
algorithm_minimizer_map
.
insert
(
name
,
GeneticMinimizerItem
::
M_TYPE
);
name
=
"Simulated Annealing (GSL)"
;
common_algorithms_list
.
append
(
name
);
algorithm_minimizer_map
.
insert
(
name
,
SimAnMinimizerItem
::
M_TYPE
);
algorithm_minimizer_map
.
insert
(
"Genetic (ROOT TMVA)"
,
GeneticMinimizerItem
::
M_TYPE
)
;
name
=
"Levenberg-Marquardt (GSL)"
;
algorithm
_minimizer_map
.
insert
(
"Simulated Annealing (GSL)"
,
SimAnMinimizerItem
::
M_TYPE
);
common_
algorithm
s_list
.
append
(
name
);
algorithm_minimizer_map
.
insert
(
"Levenberg-Marquardt (GSL)"
,
GSLLMAMinimizerItem
::
M_TYPE
);
algorithm_minimizer_map
.
insert
(
name
,
GSLLMAMinimizerItem
::
M_TYPE
);
}
}
const
QString
default_common_algorithm
=
MinimizerItemCatalog
::
algorithmNames
(
MinuitMinimizerItem
::
M_TYPE
)
.
first
();
const
QString
default_common_algorithm
=
common_algorithms_list
.
first
();
}
// namespace
}
// namespace
...
@@ -69,9 +86,14 @@ MinimizerContainerItem::MinimizerContainerItem()
...
@@ -69,9 +86,14 @@ MinimizerContainerItem::MinimizerContainerItem()
addProperty
<
GSLLMAMinimizerItem
>
(
GSLLMAMinimizerItem
::
M_TYPE
);
addProperty
<
GSLLMAMinimizerItem
>
(
GSLLMAMinimizerItem
::
M_TYPE
);
#ifdef ALGORITHM_LIST
#ifdef ALGORITHM_LIST
qInfo
()
<<
algorithm_minimizer_map
.
keys
();
qInfo
()
<<
algorithm_minimizer_map
.
values
();
qInfo
()
<<
"----
\n
init
\n
---"
;
create_algorithm_minimizer_map
();
create_algorithm_minimizer_map
();
qInfo
()
<<
algorithm_minimizer_map
.
keys
();
qInfo
()
<<
algorithm_minimizer_map
.
values
();
ComboProperty
common_algorithm_combo
=
ComboProperty
common_algorithm_combo
=
ComboProperty
::
fromList
(
algorithm
_minimizer_map
.
keys
()
,
default_common_algorithm
);
ComboProperty
::
fromList
(
common_
algorithm
s_list
,
default_common_algorithm
);
addProperty
(
P_COMMON_ALGORITHMS
,
common_algorithm_combo
.
variant
());
addProperty
(
P_COMMON_ALGORITHMS
,
common_algorithm_combo
.
variant
());
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment