max3 configs

Author: GiggleLiu

src/arithematics.jl

@@ -191,8 +191,8 @@ end
 # convert from counting type to bitstring type
 for (F,TP) in [(:set_type, :ConfigEnumerator), (:sampler_type, :ConfigSampler)]
     @eval begin
-        function $F(::Type{T}, n::Int, nflavor::Int) where {OT, T<:Max2Poly{C,OT} where C}
-            Max2Poly{$F(n,nflavor),OT}
+        function $F(::Type{T}, n::Int, nflavor::Int) where {OT, K, T<:TruncatedPoly{K,C,OT} where C}
+            TruncatedPoly{K, $F(n,nflavor),OT}
         end
         function $F(::Type{T}, n::Int, nflavor::Int) where {TX, T<:Polynomial{C,TX} where C}
             Polynomial{$F(n,nflavor),:x}
@@ -212,8 +212,8 @@ end
 function onehotv(::Type{Polynomial{BS,X}}, x, v) where {BS,X}
     Polynomial{BS,X}([zero(BS), onehotv(BS, x, v)])
 end
-function onehotv(::Type{Max2Poly{BS,OS}}, x, v) where {BS,OS}
-    Max2Poly{BS,OS}(zero(BS), onehotv(BS, x, v),one(OS))
+function onehotv(::Type{TruncatedPoly{K,BS,OS}}, x, v) where {K,BS,OS}
+    TruncatedPoly{K,BS,OS}(ntuple(i->i<K ? zero(BS) : onehotv(BS, x, v), K),one(OS))
 end
 function onehotv(::Type{CountingTropical{TV,BS}}, x, v) where {TV,BS}
     CountingTropical{TV,BS}(one(TV), onehotv(BS, x, v))

src/interfaces.jl

@@ -28,6 +28,8 @@ function solve(gp::GraphProblem, task; usecuda=false, kwargs...)
         return contractx(gp, CountingTropical(1.0); usecuda=usecuda)
     elseif task == "counting max2"
         return contractx(gp, Max2Poly(0.0, 1.0, 1.0); usecuda=usecuda)
+    elseif task == "counting max3"
+        return contractx(gp, TruncatedPoly((0.0, 0.0, 1.0), 1.0); usecuda=usecuda)
     elseif task == "counting all"
         return graph_polynomial(gp, Val(:polynomial); usecuda=usecuda)
     elseif task == "config max"
@@ -36,6 +38,8 @@ function solve(gp::GraphProblem, task; usecuda=false, kwargs...)
         return solutions(gp, CountingTropical{Float64,Float64}; all=true, usecuda=usecuda)
     elseif task == "configs max2"
         return solutions(gp, Max2Poly{Float64,Float64}; all=true, usecuda=usecuda)
+    elseif task == "configs max3"
+        return solutions(gp, TruncatedPoly{3,Float64,Float64}; all=true, usecuda=usecuda)
     elseif task == "configs all"
         return solutions(gp, Polynomial{Float64,:x}; all=true, usecuda=usecuda)
     # extra methods

test/interfaces.jl

@@ -17,6 +17,8 @@ using LightGraphs, Test
     res11 = solve(gp, "counting all (finitefield)")[]
     res12 = solve(gp, "config max (bounded)")[]
     res13 = solve(gp, "configs max (bounded)")[]
+    res14 = solve(gp, "counting max3")[]
+    res15 = solve(gp, "configs max3")[]
     @test res1.n == 4
     @test res2 == 76
     @test res3.n == 4 && res3.c == 5
@@ -30,6 +32,9 @@ using LightGraphs, Test
     @test res11 == res5
     @test res12.c.data ∈ res13.c.data
     @test res13.c.data == res7.c.data
+    @test res14.maxorder == 4 && res14.coeffs[1]==30 && res14.coeffs[2] == 30 && res14.coeffs[3]==5
+    @test all(x->sum(x) == 2, res15.coeffs[1].data) && all(x->sum(x) == 3, res15.coeffs[2].data) && all(x->sum(x) == 4, res15.coeffs[3].data) &&
+            length(res15.coeffs[1].data) == 30 && length(res15.coeffs[2].data) == 30 && length(res15.coeffs[3].data) == 5
 end
 
 @testset "save load" begin