kalmar/PropertyT.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-11-19 15:25:29 +01:00
Code Issues Releases Wiki Activity

add keyword for twisted product_matrix

Browse Source
This commit is contained in:
kalmar 2017-04-17 15:23:36 +02:00
parent c0da44754d
commit e93ec0c422
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sdps.jl
View File

@ -1,14 +1,18 @@
using JuMP using JuMP
import MathProgBase: AbstractMathProgSolver import MathProgBase: AbstractMathProgSolver
function create_product_matrix{T}(basis::Vector{T}, limit) function create_product_matrix{T}(basis::Vector{T}, limit; twisted=true)
product_matrix = zeros(Int, (limit,limit)) product_matrix = zeros(Int, (limit,limit))
basis_dict = Dict{T, Int}(x => i basis_dict = Dict{T, Int}(x => i
for (i,x) in enumerate(basis)) for (i,x) in enumerate(basis))
for i in 1:limit for i in 1:limit
x_inv::eltype(basis) = inv(basis[i]) if twisted
x = inv(basis[i])
else
x = basis[i]
end
for j in 1:limit for j in 1:limit
w = x_inv*basis[j] w = x*basis[j]
product_matrix[i,j] = basis_dict[w] product_matrix[i,j] = basis_dict[w]
# index = findfirst(basis, w) # index = findfirst(basis, w)
# index ≠ 0 || throw(ArgumentError("Product is not supported on basis: $w")) # index ≠ 0 || throw(ArgumentError("Product is not supported on basis: $w"))
@ -18,6 +22,8 @@ function create_product_matrix{T}(basis::Vector{T}, limit)
return product_matrix return product_matrix
end end
create_product_matrix{T}(basis::Vector{T}; twisted=twisted) = create_product_matrix(basis, length(basis); twisted=twisted)
function constraints_from_pm(pm, total_length) function constraints_from_pm(pm, total_length)
n = size(pm,1) n = size(pm,1)
constraints = constraints = [Array{Int,1}[] for x in 1:total_length] constraints = constraints = [Array{Int,1}[] for x in 1:total_length]