Skip to content

Commit

Permalink
Updated notation according to CDC paper.
Browse files Browse the repository at this point in the history
  • Loading branch information
olof3 committed Oct 29, 2018
1 parent 50b196c commit 96ae85e
Show file tree
Hide file tree
Showing 6 changed files with 126 additions and 122 deletions.
2 changes: 1 addition & 1 deletion examples/example10.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ M = 10
@time Λ = pwq_dp_constrained(ℓ, V_N, M)


unique_polys(Λ) = length(unique([λ.π for λ in Λ]))
unique_polys(Λ) = length(unique([λ.p for λ in Λ]))

sizes = [(isassigned(Λ,i,j) ? unique_polys(Λ[i,j]) : 0) for i = 1:size(Λ,1), j = 1:size(Λ,2)]
sizes = [(isassigned(Λ,i,j) ? length(Λ[i,j]) : 0) for i = 1:size(Λ,1), j = 1:size(Λ,2)]
Expand Down
2 changes: 1 addition & 1 deletion examples/example2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cost_last = QuadraticPolynomial(1.0, -2*data[end], data[end]^2)

start_time = time()

@time Λ = pwq_dp_constrained(ℓ, cost_last, 10, 1.65)
Λ = pwq_dp_constrained(ℓ, cost_last, 10, 1.65)
println("Time: ", time()-start_time)

for k=3:10
Expand Down
Loading

0 comments on commit 96ae85e

Please sign in to comment.