Skip to content

Commit 5d2b67e

Browse files
committed
Formatted, and made static const char* Highs_compilationDate(void); const char* Highs_compilationDate(void);
1 parent 556736a commit 5d2b67e

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

check/TestCAPI.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,6 +2300,8 @@ void testUserObjectiveBoundScaling() {
23002300

23012301
double scaled_objective_value = Highs_getObjectiveValue(highs);
23022302
assertDoubleValuesEqual("objective_value", unscaled_objective_value, scaled_objective_value);
2303+
}
2304+
23032305
void testFixedLp() {
23042306
// The use of Highs_getFixedLp is illustrated for the MIP
23052307
//

highs/interfaces/highs_c_api.h

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,32 @@ static const char* const kHighsCallbackDataOutPdlpIterationCountName =
117117
"pdlp_iteration_count";
118118
static const char* const kHighsCallbackDataOutObjectiveFunctionValueName =
119119
"objective_function_value";
120-
static const char* const kHighsCallbackDataOutMipNodeCountName = "mip_node_count";
120+
static const char* const kHighsCallbackDataOutMipNodeCountName =
121+
"mip_node_count";
121122
static const char* const kHighsCallbackDataOutMipTotalLpIterationsName =
122123
"mip_total_lp_iterations";
123-
static const char* const kHighsCallbackDataOutMipPrimalBoundName = "mip_primal_bound";
124-
static const char* const kHighsCallbackDataOutMipDualBoundName = "mip_dual_bound";
124+
static const char* const kHighsCallbackDataOutMipPrimalBoundName =
125+
"mip_primal_bound";
126+
static const char* const kHighsCallbackDataOutMipDualBoundName =
127+
"mip_dual_bound";
125128
static const char* const kHighsCallbackDataOutMipGapName = "mip_gap";
126129
static const char* const kHighsCallbackDataOutMipSolutionName = "mip_solution";
127-
static const char* const kHighsCallbackDataOutCutpoolNumColName = "cutpool_num_col";
128-
static const char* const kHighsCallbackDataOutCutpoolNumCutName = "cutpool_num_cut";
129-
static const char* const kHighsCallbackDataOutCutpoolNumNzName = "cutpool_num_nz";
130-
static const char* const kHighsCallbackDataOutCutpoolStartName = "cutpool_start";
131-
static const char* const kHighsCallbackDataOutCutpoolIndexName = "cutpool_index";
132-
static const char* const kHighsCallbackDataOutCutpoolValueName = "cutpool_value";
133-
static const char* const kHighsCallbackDataOutCutpoolLowerName = "cutpool_lower";
134-
static const char* const kHighsCallbackDataOutCutpoolUpperName = "cutpool_upper";
130+
static const char* const kHighsCallbackDataOutCutpoolNumColName =
131+
"cutpool_num_col";
132+
static const char* const kHighsCallbackDataOutCutpoolNumCutName =
133+
"cutpool_num_cut";
134+
static const char* const kHighsCallbackDataOutCutpoolNumNzName =
135+
"cutpool_num_nz";
136+
static const char* const kHighsCallbackDataOutCutpoolStartName =
137+
"cutpool_start";
138+
static const char* const kHighsCallbackDataOutCutpoolIndexName =
139+
"cutpool_index";
140+
static const char* const kHighsCallbackDataOutCutpoolValueName =
141+
"cutpool_value";
142+
static const char* const kHighsCallbackDataOutCutpoolLowerName =
143+
"cutpool_lower";
144+
static const char* const kHighsCallbackDataOutCutpoolUpperName =
145+
"cutpool_upper";
135146

136147
const HighsInt kHighsIisStrategyLight = 0;
137148
const HighsInt kHighsIisStrategyFromLpRowPriority = 1; // WIP
@@ -2553,7 +2564,7 @@ HighsInt Highs_repairCallbackSolution(HighsCallbackDataIn* data_in);
25532564
*
25542565
* @returns Thse HiGHS compilation date.
25552566
*/
2556-
static const char* Highs_compilationDate(void);
2567+
const char* Highs_compilationDate(void);
25572568

25582569
// These are deprecated because they don't follow the style guide. Constants
25592570
// must begin with `k`.

highs/lp_data/HighsOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,8 +490,8 @@ struct HighsOptionsStruct {
490490
objective_bound(0.0),
491491
objective_target(0.0),
492492
threads(0),
493-
user_bound_scale(0),
494493
user_cost_scale(0),
494+
user_bound_scale(0),
495495
highs_debug_level(0),
496496
highs_analysis_level(0),
497497
simplex_strategy(0),

0 commit comments

Comments
 (0)