mirror of
https://github.com/ceres-solver/ceres-solver.git
synced 2026-08-29 16:40:38 +08:00
Adding Wolfe line search algorithm and full BFGS search direction options.
Change-Id: I9d3fb117805bdfa5bc33613368f45ae8f10e0d79
This commit is contained in:
committed by
Keir Mierle
parent
51c772c843
commit
9aa0e3cf72
@@ -165,6 +165,7 @@ const char* LineSearchDirectionTypeToString(LineSearchDirectionType type) {
|
||||
CASESTR(STEEPEST_DESCENT);
|
||||
CASESTR(NONLINEAR_CONJUGATE_GRADIENT);
|
||||
CASESTR(LBFGS);
|
||||
CASESTR(BFGS);
|
||||
default:
|
||||
return "UNKNOWN";
|
||||
}
|
||||
@@ -176,12 +177,14 @@ bool StringToLineSearchDirectionType(string value,
|
||||
STRENUM(STEEPEST_DESCENT);
|
||||
STRENUM(NONLINEAR_CONJUGATE_GRADIENT);
|
||||
STRENUM(LBFGS);
|
||||
STRENUM(BFGS);
|
||||
return false;
|
||||
}
|
||||
|
||||
const char* LineSearchTypeToString(LineSearchType type) {
|
||||
switch (type) {
|
||||
CASESTR(ARMIJO);
|
||||
CASESTR(WOLFE);
|
||||
default:
|
||||
return "UNKNOWN";
|
||||
}
|
||||
@@ -190,6 +193,7 @@ const char* LineSearchTypeToString(LineSearchType type) {
|
||||
bool StringToLineSearchType(string value, LineSearchType* type) {
|
||||
UpperCase(&value);
|
||||
STRENUM(ARMIJO);
|
||||
STRENUM(WOLFE);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user