Commit 4722bb58 authored by Leonardo Solis's avatar Leonardo Solis

#52, more typos

parent 222e0a85
// Gradient-based steepest descent minimizer
// Alternative to Solis-Wetts
// Alternative to Solis-Wets
//#define DEBUG_ENERGY_KERNEL5
//#define PRINT_ENERGIES
......
......@@ -145,10 +145,10 @@ void get_commandpars(const int* argc,
mypars->lsearch_rate = 6; // 6%
// unsigned long num_of_ls
strcpy(mypars->ls_method, "sw"); // "sw": Solis-Wetts,
// "sd": Steepest-Descent",
// "fire": FIRE", https://www.math.uni-bielefeld.de/~gaehler/papers/fire.pdf
// "bfgs": Broyden-Fletcher-Goldfarb-Shanno (to be implemented)
strcpy(mypars->ls_method, "sw"); // "sw": Solis-Wets,
// "sd": Steepest-Descent
// "fire": FIRE, https://www.math.uni-bielefeld.de/~gaehler/papers/fire.pdf
// "ad": ADADELTA, https://arxiv.org/abs/1212.5701
mypars->smooth = 0.5f;
mypars->tournament_rate = 60; // 60%
mypars->rho_lower_bound = 0.01; // 0.01
......@@ -291,11 +291,10 @@ void get_commandpars(const int* argc,
}
//Argument: local search method:
// "sw": Solis-Wetts
// "sw": Solis-Wets
// "sd": Steepest-Descent
// "fire": FIRE
// "ad": Ada-Delta
// "bfgs": Broyden-Fletcher-Goldfarb-Shanno (to be implemented)
// "ad": ADADELTA
if (strcmp("-lsmet", argv [i]) == 0)
{
arg_recognized = 1;
......
......@@ -539,10 +539,10 @@ filled with clock() */
printf("Local-search chosen method is: %s\n", (dockpars.lsearch_rate == 0.0f)? "GA" :
(
(strcmp(mypars->ls_method, "sw") == 0)?"Solis-Wets (SW)":
(strcmp(mypars->ls_method, "sd") == 0)?"Steepest-Descent (SD)":
(strcmp(mypars->ls_method, "fire") == 0)?"Fire":
(strcmp(mypars->ls_method, "ad") == 0)?"Ada-Delta (AD)": "Unknown")
(strcmp(mypars->ls_method, "sw") == 0)?"Solis-Wets (sw)":
(strcmp(mypars->ls_method, "sd") == 0)?"Steepest-Descent (sd)":
(strcmp(mypars->ls_method, "fire") == 0)?"FIRE (fire)":
(strcmp(mypars->ls_method, "ad") == 0)?"ADADELTA (ad)": "Unknown")
);
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment