Skip to content

Commit e9792ab

Browse files
committed
wip
1 parent 05a8d95 commit e9792ab

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

highs/pdlp/cupdlp/cupdlp_utils.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,7 @@ void writeSol(const char *fout, cupdlp_int nCols, cupdlp_int nRows,
17831783
}
17841784

17851785
void debugPdlpIterHeaderLog(FILE* file) {
1786-
fprintf(file, " Iter ||Ax|| ||Aty|| ||Ax_Avg|| ||Aty_Avg|| beta\n");
1786+
fprintf(file, " Iter ||Ax|| ||Aty|| ||Ax_Avg|| ||Aty_Avg|| beta PrimalStep DualStep \n");
17871787
}
17881788

17891789
void debugPdlpDataInitialise(struct DebugPdlpData* debug_pdlp) {
@@ -1793,14 +1793,16 @@ void debugPdlpDataInitialise(struct DebugPdlpData* debug_pdlp) {
17931793
debug_pdlp->aty_average_norm = 0;
17941794
}
17951795

1796-
void debugPdlpIterLog(FILE* file, const int iter_num, const struct DebugPdlpData* debug_pdlp, const double beta) {
1797-
fprintf(file, "%6d %11.4g %11.4g %11.4g %11.4g %11.4g\n",
1796+
void debugPdlpIterLog(FILE* file, const int iter_num, const struct DebugPdlpData* debug_pdlp, const double beta, const double primal_step, const double dual_step) {
1797+
fprintf(file, "%6d %11.4g %11.4g %11.4g %11.4g %11.4g %11.4g %11.4g\n",
17981798
iter_num,
17991799
debug_pdlp->ax_norm,
18001800
debug_pdlp->aty_norm,
18011801
debug_pdlp->ax_average_norm,
18021802
debug_pdlp->aty_average_norm,
1803-
beta);
1803+
beta,
1804+
primal_step,
1805+
dual_step);
18041806
}
18051807

18061808
void debugPdlpFeasOptLog(FILE* file,

highs/pdlp/hipdlp/restart.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
struct RestartInfo {
2525
bool should_restart = false;
2626
bool restart_to_average =
27-
false; // If true, restart to average; otherwise, to current
27+
true; // If true, restart to average; otherwise, to current
2828
};
2929

3030
class RestartScheme {

0 commit comments

Comments
 (0)