aboutsummaryrefslogtreecommitdiff
path: root/src/steps.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/steps.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/steps.c b/src/steps.c
index 2517d16..ae3f9fd 100644
--- a/src/steps.c
+++ b/src/steps.c
@@ -35,7 +35,7 @@ static int estimate_dr_eofb(DfsArg *arg);
35static int estimate_drudfin_drud(DfsArg *arg); 35static int estimate_drudfin_drud(DfsArg *arg);
36static int estimate_htr_drud(DfsArg *arg); 36static int estimate_htr_drud(DfsArg *arg);
37static int estimate_htrfin_htr(DfsArg *arg); 37static int estimate_htrfin_htr(DfsArg *arg);
38static int estimate_optimal_HTM(DfsArg *arg); 38/*static int estimate_khuge_HTM(DfsArg *arg);*/
39static int estimate_nxopt31_HTM(DfsArg *arg); 39static int estimate_nxopt31_HTM(DfsArg *arg);
40static int estimate_light_HTM(DfsArg *arg); 40static int estimate_light_HTM(DfsArg *arg);
41 41
@@ -60,14 +60,17 @@ static char check_drany_msg[100] = "DR must be solved on at least one axis";
60/* Steps *********************************************************************/ 60/* Steps *********************************************************************/
61 61
62/* Optimal solvers *******************/ 62/* Optimal solvers *******************/
63
64/* This is not used anymore, I'll keep it just in case */
65/*
63Step 66Step
64optimal_HTM = { 67optimal_khuge_HTM = {
65 .shortname = "optimal", 68 .shortname = "khuge",
66 .name = "Optimal solve (in HTM)", 69 .name = "Optimal solve (in HTM) using khuge table",
67 70
68 .final = true, 71 .final = true,
69 .is_done = is_solved, 72 .is_done = is_solved,
70 .estimate = estimate_optimal_HTM, 73 .estimate = estimate_khuge_HTM,
71 .ready = check_centers, 74 .ready = check_centers,
72 .ready_msg = check_centers_msg, 75 .ready_msg = check_centers_msg,
73 .is_valid = always_valid, 76 .is_valid = always_valid,
@@ -78,11 +81,12 @@ optimal_HTM = {
78 .tables = {&pd_khuge_HTM, &pd_corners_HTM}, 81 .tables = {&pd_khuge_HTM, &pd_corners_HTM},
79 .ntables = 2, 82 .ntables = 2,
80}; 83};
84*/
81 85
82Step 86Step
83optimal_nxopt31_HTM = { 87optimal_HTM = {
84 .shortname = "nxopt31", 88 .shortname = "optimal",
85 .name = "Optimal solve (in HTM), nxopt31 table", 89 .name = "Optimal solve (in HTM)",
86 90
87 .final = true, 91 .final = true,
88 .is_done = is_solved, 92 .is_done = is_solved,
@@ -856,7 +860,6 @@ htrfin_htr = {
856 860
857Step *steps[NSTEPS] = { 861Step *steps[NSTEPS] = {
858 &optimal_HTM, /* first is default */ 862 &optimal_HTM, /* first is default */
859 &optimal_nxopt31_HTM,
860 &optimal_light_HTM, 863 &optimal_light_HTM,
861 864
862 &eoany_HTM, 865 &eoany_HTM,
@@ -1203,11 +1206,13 @@ estimate_htrfin_htr(DfsArg *arg)
1203 return ptableval(&pd_htrfin_htr, arg->cube); 1206 return ptableval(&pd_htrfin_htr, arg->cube);
1204} 1207}
1205 1208
1209/*
1206static int 1210static int
1207estimate_optimal_HTM(DfsArg *arg) 1211estimate_khuge_HTM(DfsArg *arg)
1208{ 1212{
1209 return estimate_nxoptlike(arg, &pd_khuge_HTM); 1213 return estimate_nxoptlike(arg, &pd_khuge_HTM);
1210} 1214}
1215*/
1211 1216
1212static int 1217static int
1213estimate_nxopt31_HTM(DfsArg *arg) 1218estimate_nxopt31_HTM(DfsArg *arg)

Generated with cgit - Back to sebastiano.tronto.net