From 66f10612defc63539eeade360b534e2139341433 Mon Sep 17 00:00:00 2001
From: Marek Kaluba <kalmar@amu.edu.pl>
Date: Mon, 22 May 2023 22:40:32 +0200
Subject: [PATCH] streamline constraints generation

and make it a bit less dependent on the ordering of elements in basis
---
 src/constraint_matrix.jl | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/constraint_matrix.jl b/src/constraint_matrix.jl
index 997a037..54be3af 100644
--- a/src/constraint_matrix.jl
+++ b/src/constraint_matrix.jl
@@ -156,12 +156,8 @@ function constraints(
     mstr::StarAlgebras.MultiplicativeStructure;
     augmented = false,
 )
-    cnstrs = _constraints(
-        mstr;
-        augmented = augmented,
-        num_constraints = length(basis),
-        id = basis[one(first(basis))],
-    )
+    id = basis[one(first(basis))]
+    cnstrs = _constraints(mstr; augmented = augmented, id = mstr[id, id])
 
     return Dict(
         basis[i] => ConstraintMatrix(c, size(mstr)..., 1) for
@@ -172,11 +168,11 @@ end
 function _constraints(
     mstr::StarAlgebras.MultiplicativeStructure;
     augmented::Bool = false,
-    num_constraints = maximum(mstr),
     id,
 )
-    cnstrs = [signed(eltype(mstr))[] for _ in 1:num_constraints]
+    cnstrs = [signed(eltype(mstr))[] for _ in 1:maximum(mstr)]
     LI = LinearIndices(size(mstr))
+    id_ = mstr[id, id]
 
     for ci in CartesianIndices(size(mstr))
         k = LI[ci]
@@ -185,8 +181,8 @@ function _constraints(
         push!(cnstrs[a_star_b], k)
         if augmented
             # (1-a)'(1-b) = 1 - a' - b + a'b
-            push!(cnstrs[id], k)
-            a_star, b = mstr[-i, id], j
+            push!(cnstrs[id_], k)
+            a_star, b = mstr[-i, id], mstr[j, id]
             push!(cnstrs[a_star], -k)
             push!(cnstrs[b], -k)
         end