Skip to content

Commit f4b4b3a

Browse files
committed
use python native float and string instead of np._str and np.float for readability
1 parent 0c98d84 commit f4b4b3a

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

inflation/lp/InflationLP.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ def _generate_lp(self) -> None:
13681368
old_num_columns = self.n_columns
13691369
self.n_columns = len(self.monomials)
13701370
self.first_free_idx = first_free_index
1371-
self.monomial_names = np.array([mon.name for mon in monomials_as_list])
1371+
self.monomial_names = np.array([mon.name for mon in monomials_as_list], dtype=object)
13721372
if self.n_columns < old_num_columns:
13731373
if self.verbose > 0:
13741374
eprint("Further variable reduction has been made possible. Number of variables in the LP:",

inflation/lp/lp_utils.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,16 +485,18 @@ def solveLP_sparse(objective: coo_array = blank_coo_array,
485485
snx) = task.getsolution(basic)
486486

487487
# Get objective values, solutions x, dual values y
488+
xx = np.asarray(xx, dtype=object)
489+
yy = np.asarray(yy, dtype=object)
488490
if solve_dual:
489491
primal = task.getdualobj(basic)
490492
dual = task.getprimalobj(basic)
491493
x_values = dict(zip(variables, yy))
492-
y_values = np.asarray(xx)
494+
y_values = xx
493495
else:
494496
primal = task.getprimalobj(basic)
495497
dual = task.getdualobj(basic)
496498
x_values = dict(zip(variables, xx))
497-
y_values = np.asarray(yy)
499+
y_values = yy
498500

499501
if solutionsta == mosek.solsta.optimal:
500502
success = True

inflation/sdp/monomial_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def compute_marginal(prob_array: np.ndarray, atom: np.ndarray) -> float:
4747
outputs = atom[:, -1].astype(int)
4848
indices_to_sum = list(set(range(n_parties)
4949
).difference(participating_parties))
50-
marginal_dist = np.sum(prob_array, axis=tuple(indices_to_sum))
50+
marginal_dist = np.sum(prob_array, axis=tuple(indices_to_sum)).astype(object)
5151
input_list: np.ndarray = np.zeros(n_parties, dtype=int)
5252
input_list[participating_parties] = inputs
5353
outputs_inputs = np.concatenate((outputs, input_list))

inflation/sdp/sdp_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ def constraint_dicts_to_sparse(constraints: List[dict]) -> (coo_array, coo_array
450450
M.acceptedSolutionStatus(AccSolutionStatus.Anything)
451451
M.solve()
452452
if solve_dual:
453-
x_values = {x: -ci_constraints[i].dual()[0]
453+
x_values = {x: float(-ci_constraints[i].dual()[0])
454454
for i, x in enumerate(variables)}
455455
if mask_matrices:
456456
ymat = Z.level().reshape([mat_dim, mat_dim])

0 commit comments

Comments
 (0)