Skip to content

Commit 7067ba9

Browse files
metab0tmetab0t
committed
Make autocomplete happy
1 parent f038dfa commit 7067ba9

File tree

9 files changed

+35
-36
lines changed

9 files changed

+35
-36
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010

1111
# Python 格式化 - black
1212
- repo: https://github.com/psf/black
13-
rev: 25.12.0
13+
rev: 26.1.0
1414
hooks:
1515
- id: black
1616
language_version: python3

‎src/pyoptinterface/_src/aml.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
from .core_ext import ExprBuilder
1+
from .core_ext import ExprBuilder, VariableDomain
22
from .tupledict import make_tupledict
33

44
from collections.abc import Collection
5-
from typing import Tuple, Union
5+
from typing import Tuple, Union, Optional
66

77

88
def make_variable_ndarray(
99
model,
1010
shape: Union[Tuple[int, ...], int],
11-
domain=None,
12-
lb=None,
13-
ub=None,
14-
name=None,
15-
start=None,
11+
domain: Optional[VariableDomain] = None,
12+
lb: Optional[float] = None,
13+
ub: Optional[float] = None,
14+
name: Optional[str] = None,
15+
start: Optional[float] = None,
1616
):
1717
import numpy as np
1818

@@ -41,7 +41,13 @@ def make_variable_ndarray(
4141

4242

4343
def make_variable_tupledict(
44-
model, *coords: Collection, domain=None, lb=None, ub=None, name=None, start=None
44+
model,
45+
*coords: Collection,
46+
domain: Optional[VariableDomain] = None,
47+
lb: Optional[float] = None,
48+
ub: Optional[float] = None,
49+
name: Optional[str] = None,
50+
start: Optional[float] = None,
4551
):
4652
kw_args = dict()
4753
if domain is not None:

‎src/pyoptinterface/_src/copt.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,6 @@ def add_nl_objective(self, expr):
677677
)
678678
self._add_single_nl_objective(graph, expr)
679679

680-
681-
Model.add_variables = make_variable_tupledict
682-
Model.add_m_variables = make_variable_ndarray
683-
Model.add_m_linear_constraints = add_matrix_constraints
680+
add_variables = make_variable_tupledict
681+
add_m_variables = make_variable_ndarray
682+
add_m_linear_constraints = add_matrix_constraints

‎src/pyoptinterface/_src/gurobi.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -867,8 +867,7 @@ def add_nl_objective(self, expr):
867867
)
868868
self._add_single_nl_objective(graph, expr)
869869

870-
871-
Model.add_variables = make_variable_tupledict
872-
Model.add_m_variables = make_variable_ndarray
873-
Model.add_m_linear_constraints = add_matrix_constraints
874-
Model.add_second_order_cone_constraint = bridge_soc_quadratic_constraint
870+
add_variables = make_variable_tupledict
871+
add_m_variables = make_variable_ndarray
872+
add_m_linear_constraints = add_matrix_constraints
873+
add_second_order_cone_constraint = bridge_soc_quadratic_constraint

‎src/pyoptinterface/_src/highs.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ def add_linear_constraint(self, arg, *args, **kwargs):
470470
else:
471471
return self._add_linear_constraint(arg, *args, **kwargs)
472472

473-
474-
Model.add_variables = make_variable_tupledict
475-
Model.add_m_variables = make_variable_ndarray
476-
Model.add_m_linear_constraints = add_matrix_constraints
473+
add_variables = make_variable_tupledict
474+
add_m_variables = make_variable_ndarray
475+
add_m_linear_constraints = add_matrix_constraints

‎src/pyoptinterface/_src/ipopt.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,7 @@ def _codegen_llvm(self):
933933
)
934934
self._assign_nl_objective_group_autodiff_evaluator(group_index, evaluator)
935935

936-
937-
Model.add_variables = make_variable_tupledict
938-
Model.add_m_variables = make_variable_ndarray
939-
Model.add_m_linear_constraints = add_matrix_constraints
940-
Model.add_second_order_cone_constraint = bridge_soc_quadratic_constraint
936+
add_variables = make_variable_tupledict
937+
add_m_variables = make_variable_ndarray
938+
add_m_linear_constraints = add_matrix_constraints
939+
add_second_order_cone_constraint = bridge_soc_quadratic_constraint

‎src/pyoptinterface/_src/mosek.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ def add_quadratic_constraint(self, arg, *args, **kwargs):
556556
else:
557557
return self._add_quadratic_constraint(arg, *args, **kwargs)
558558

559-
560-
Model.add_variables = make_variable_tupledict
561-
Model.add_m_variables = make_variable_ndarray
562-
Model.add_m_linear_constraints = add_matrix_constraints
559+
add_variables = make_variable_tupledict
560+
add_m_variables = make_variable_ndarray
561+
add_m_linear_constraints = add_matrix_constraints

‎src/pyoptinterface/_src/tupledict.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from typing import Iterable
22
from itertools import product
33

4-
54
WILDCARD = "*"
65

76

‎src/pyoptinterface/_src/xpress.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,6 @@ def cb_wrapper(raw_model, ctx):
645645

646646
super().set_callback(cb_wrapper, where)
647647

648-
649-
Model.add_variables = make_variable_tupledict
650-
Model.add_m_variables = make_variable_ndarray
651-
Model.add_m_linear_constraints = add_matrix_constraints
648+
add_variables = make_variable_tupledict
649+
add_m_variables = make_variable_ndarray
650+
add_m_linear_constraints = add_matrix_constraints

0 commit comments

Comments
 (0)