Skip to content

Commit 59f3393

Browse files
metab0tmetab0t
committed
Use prek to setup pre-commit check and reformat all the files
1 parent 3fcafdf commit 59f3393

File tree

6 files changed

+48
-40
lines changed

6 files changed

+48
-40
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
repos:
2+
# C++ 格式化 - clang-format
3+
- repo: https://github.com/pre-commit/mirrors-clang-format
4+
rev: v21.1.7
5+
hooks:
6+
- id: clang-format
7+
types_or: [c++, c]
8+
files: \.(cpp|hpp|c|h|cc|cxx|hxx)$
9+
exclude: ^thirdparty/
10+
11+
# Python 格式化 - black
12+
- repo: https://github.com/psf/black
13+
rev: 25.12.0
14+
hooks:
15+
- id: black
16+
language_version: python3

‎include/pyoptinterface/cache_model.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,3 @@ struct QuadraticExpressionCache
5454
lin_column_ptr.push_back(lin_variables.size());
5555
}
5656
};
57-

‎include/pyoptinterface/core.hpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,18 @@ auto operator+(const ScalarAffineFunction &a, CoeffT b) -> ScalarAffineFunction;
173173
auto operator+(CoeffT a, const ScalarAffineFunction &b) -> ScalarAffineFunction;
174174
auto operator+(const ScalarAffineFunction &a, const VariableIndex &b) -> ScalarAffineFunction;
175175
auto operator+(const VariableIndex &a, const ScalarAffineFunction &b) -> ScalarAffineFunction;
176-
auto operator+(const ScalarAffineFunction &a,
177-
const ScalarAffineFunction &b) -> ScalarAffineFunction;
176+
auto operator+(const ScalarAffineFunction &a, const ScalarAffineFunction &b)
177+
-> ScalarAffineFunction;
178178
auto operator+(const ScalarQuadraticFunction &a, CoeffT b) -> ScalarQuadraticFunction;
179179
auto operator+(CoeffT a, const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
180180
auto operator+(const ScalarQuadraticFunction &a, const VariableIndex &b) -> ScalarQuadraticFunction;
181181
auto operator+(const VariableIndex &a, const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
182-
auto operator+(const ScalarQuadraticFunction &a,
183-
const ScalarAffineFunction &b) -> ScalarQuadraticFunction;
184-
auto operator+(const ScalarAffineFunction &a,
185-
const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
186-
auto operator+(const ScalarQuadraticFunction &a,
187-
const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
182+
auto operator+(const ScalarQuadraticFunction &a, const ScalarAffineFunction &b)
183+
-> ScalarQuadraticFunction;
184+
auto operator+(const ScalarAffineFunction &a, const ScalarQuadraticFunction &b)
185+
-> ScalarQuadraticFunction;
186+
auto operator+(const ScalarQuadraticFunction &a, const ScalarQuadraticFunction &b)
187+
-> ScalarQuadraticFunction;
188188

189189
auto operator-(const VariableIndex &a, CoeffT b) -> ScalarAffineFunction;
190190
auto operator-(CoeffT a, const VariableIndex &b) -> ScalarAffineFunction;
@@ -193,18 +193,18 @@ auto operator-(const ScalarAffineFunction &a, CoeffT b) -> ScalarAffineFunction;
193193
auto operator-(CoeffT a, const ScalarAffineFunction &b) -> ScalarAffineFunction;
194194
auto operator-(const ScalarAffineFunction &a, const VariableIndex &b) -> ScalarAffineFunction;
195195
auto operator-(const VariableIndex &a, const ScalarAffineFunction &b) -> ScalarAffineFunction;
196-
auto operator-(const ScalarAffineFunction &a,
197-
const ScalarAffineFunction &b) -> ScalarAffineFunction;
196+
auto operator-(const ScalarAffineFunction &a, const ScalarAffineFunction &b)
197+
-> ScalarAffineFunction;
198198
auto operator-(const ScalarQuadraticFunction &a, CoeffT b) -> ScalarQuadraticFunction;
199199
auto operator-(CoeffT a, const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
200200
auto operator-(const ScalarQuadraticFunction &a, const VariableIndex &b) -> ScalarQuadraticFunction;
201201
auto operator-(const VariableIndex &a, const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
202-
auto operator-(const ScalarQuadraticFunction &a,
203-
const ScalarAffineFunction &b) -> ScalarQuadraticFunction;
204-
auto operator-(const ScalarAffineFunction &a,
205-
const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
206-
auto operator-(const ScalarQuadraticFunction &a,
207-
const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
202+
auto operator-(const ScalarQuadraticFunction &a, const ScalarAffineFunction &b)
203+
-> ScalarQuadraticFunction;
204+
auto operator-(const ScalarAffineFunction &a, const ScalarQuadraticFunction &b)
205+
-> ScalarQuadraticFunction;
206+
auto operator-(const ScalarQuadraticFunction &a, const ScalarQuadraticFunction &b)
207+
-> ScalarQuadraticFunction;
208208

209209
auto operator*(const VariableIndex &a, CoeffT b) -> ScalarAffineFunction;
210210
auto operator*(CoeffT a, const VariableIndex &b) -> ScalarAffineFunction;
@@ -213,8 +213,8 @@ auto operator*(const ScalarAffineFunction &a, CoeffT b) -> ScalarAffineFunction;
213213
auto operator*(CoeffT a, const ScalarAffineFunction &b) -> ScalarAffineFunction;
214214
auto operator*(const ScalarAffineFunction &a, const VariableIndex &b) -> ScalarQuadraticFunction;
215215
auto operator*(const VariableIndex &a, const ScalarAffineFunction &b) -> ScalarQuadraticFunction;
216-
auto operator*(const ScalarAffineFunction &a,
217-
const ScalarAffineFunction &b) -> ScalarQuadraticFunction;
216+
auto operator*(const ScalarAffineFunction &a, const ScalarAffineFunction &b)
217+
-> ScalarQuadraticFunction;
218218
auto operator*(const ScalarQuadraticFunction &a, CoeffT b) -> ScalarQuadraticFunction;
219219
auto operator*(CoeffT a, const ScalarQuadraticFunction &b) -> ScalarQuadraticFunction;
220220

‎include/pyoptinterface/cppad_interface.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ ADFunDouble sparse_hessian(const ADFunDouble &f, const sparsity_pattern_t &patte
3535
ADFunDouble cppad_trace_graph_constraints(const ExpressionGraph &graph);
3636
ADFunDouble cppad_trace_graph_objective(const ExpressionGraph &graph);
3737

38-
3938
struct CppADAutodiffGraph
4039
{
4140
CppAD::cpp_graph f_graph, jacobian_graph, hessian_graph;

‎lib/core_ext.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ NB_MODULE(core_ext, m)
103103

104104
return expr;
105105
},
106-
nb::arg("coefficients"), nb::arg("variables"),
107-
nb::rv_policy::take_ownership)
106+
nb::arg("coefficients"), nb::arg("variables"), nb::rv_policy::take_ownership)
108107
.def_static(
109108
"from_numpy",
110109
[](CoeffNdarrayT coefficients, IndexNdarrayT variables, CoeffT constant) {

‎lib/highs_model_ext.cpp‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,22 @@ NB_MODULE(highs_model_ext, m)
5757
.def("set_variable_bounds", &HighsModel::set_variable_bounds, nb::arg("variable"),
5858
nb::arg("lb"), nb::arg("ub"))
5959

60+
.def("get_value", nb::overload_cast<const VariableIndex &>(&HighsModel::get_variable_value))
6061
.def("get_value",
61-
nb::overload_cast<const VariableIndex &>(&HighsModel::get_variable_value))
62-
.def("get_value", nb::overload_cast<const ScalarAffineFunction &>(
63-
&HighsModel::get_expression_value))
64-
.def("get_value", nb::overload_cast<const ScalarQuadraticFunction &>(
65-
&HighsModel::get_expression_value))
62+
nb::overload_cast<const ScalarAffineFunction &>(&HighsModel::get_expression_value))
6663
.def("get_value",
67-
nb::overload_cast<const ExprBuilder &>(&HighsModel::get_expression_value))
64+
nb::overload_cast<const ScalarQuadraticFunction &>(&HighsModel::get_expression_value))
65+
.def("get_value", nb::overload_cast<const ExprBuilder &>(&HighsModel::get_expression_value))
6866

6967
.def("pprint", &HighsModel::pprint_variable)
7068
.def("pprint",
71-
nb::overload_cast<const ScalarAffineFunction &, int>(
72-
&HighsModel::pprint_expression),
69+
nb::overload_cast<const ScalarAffineFunction &, int>(&HighsModel::pprint_expression),
7370
nb::arg("expr"), nb::arg("precision") = 4)
74-
.def("pprint",
75-
nb::overload_cast<const ScalarQuadraticFunction &, int>(
76-
&HighsModel::pprint_expression),
77-
nb::arg("expr"), nb::arg("precision") = 4)
78-
.def("pprint",
79-
nb::overload_cast<const ExprBuilder &, int>(&HighsModel::pprint_expression),
71+
.def(
72+
"pprint",
73+
nb::overload_cast<const ScalarQuadraticFunction &, int>(&HighsModel::pprint_expression),
74+
nb::arg("expr"), nb::arg("precision") = 4)
75+
.def("pprint", nb::overload_cast<const ExprBuilder &, int>(&HighsModel::pprint_expression),
8076
nb::arg("expr"), nb::arg("precision") = 4)
8177

8278
.def("_add_linear_constraint",
@@ -107,10 +103,9 @@ NB_MODULE(highs_model_ext, m)
107103
nb::overload_cast<const ScalarAffineFunction &, ObjectiveSense>(
108104
&HighsModel::set_objective),
109105
nb::arg("expr"), nb::arg("sense") = ObjectiveSense::Minimize)
110-
.def(
111-
"set_objective",
112-
nb::overload_cast<const ExprBuilder &, ObjectiveSense>(&HighsModel::set_objective),
113-
nb::arg("expr"), nb::arg("sense") = ObjectiveSense::Minimize)
106+
.def("set_objective",
107+
nb::overload_cast<const ExprBuilder &, ObjectiveSense>(&HighsModel::set_objective),
108+
nb::arg("expr"), nb::arg("sense") = ObjectiveSense::Minimize)
114109
.def("set_objective",
115110
nb::overload_cast<const VariableIndex &, ObjectiveSense>(
116111
&HighsModel::set_objective_as_variable),

0 commit comments

Comments
 (0)