update project.toml

Author: GiggleLiu

Project.toml

@@ -1,7 +1,7 @@
 name = "GraphTensorNetworks"
 uuid = "0978c8c2-34f6-49c7-9826-ea2cc20dabd2"
 authors = ["GiggleLiu <cacate0129@gmail.com> and contributors"]
-version = "0.1.3"
+version = "0.1.4"
 
 [deps]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"

src/graph_polynomials.jl

@@ -64,33 +64,39 @@ end
 
 function graph_polynomial(gp::GraphProblem, ::Val{:finitefield}; usecuda=false,
         maxorder=max_size(gp; usecuda=usecuda), max_iter=100)
-    TI = Int32  # Int 32 is faster
+    return map(Polynomial, big_integer_solve(T->_polynomial_single(gp, T; usecuda=usecuda, maxorder=maxorder), Int32, max_iter))
+end
+
+function big_integer_solve(f, ::Type{TI}, max_iter::Int=100) where TI
     N = typemax(TI)
-    YS = fill(Any[], (fill(bondsize(gp), length(getiyv(gp.code)))...,))
-    local res, respre
+    local res, respre, YS
     for k = 1:max_iter
 	    N = prevprime(N-TI(1))
-        @debug "iteration $k, computing on GP$(N) ..."
+        @debug "iteration $k, computing on GP($(N)) ..."
         T = Mods.Mod{N,TI}
-        rk = _polynomial_single(gp, T; usecuda=usecuda, maxorder=maxorder)
-        push!.(YS, rk)
+        rk = f(T)
         if max_iter==1
-            return map(Polynomial, map(x->BigInt.(Mods.value.(x)), YS[1]))
-        elseif k != 1
-            res = map(improved_counting, YS)
-            all(respre .== res) && return map(Polynomial, res)
+            return map(x->BigInt.(Mods.value.(x)), rk)  # needs test
+        end
+        if k != 1
+            push!.(YS, rk)
+            res = map(x->improved_counting(x...), YS)
+            all(respre .== res) && return res
             respre = res
-        else
-            respre = map(x->BigInt.(value.(x)), YS[1])
+        else  # k=1
+            YS = reshape([Any[] for i=1:length(rk)], size(rk))
+            push!.(YS, rk)
+            respre = map(x->BigInt.(value.(x)), rk)
         end
     end
     @warn "result is potentially inconsistent."
-    return map(Polynomial, res)
+    return res
 end
 
-function improved_counting(sequences)
-    map(yi->Mods.CRT(yi...), zip(sequences...))
+function improved_counting(ys::AbstractArray...)
+    map(yi->improved_counting(yi...), zip(ys...))
 end
+improved_counting(ys::Mod...) = Mods.CRT(ys...)
 
 contractx(gp::GraphProblem, x; usecuda=false) = contractf(_->x, gp; usecuda=usecuda)
 function contractf(f, gp::GraphProblem; usecuda=false)

test/graph_polynomials.jl

@@ -23,9 +23,18 @@ end
     p2 = graph_polynomial(Independence(g), Val(:polynomial))[]
     p3 = graph_polynomial(Independence(g), Val(:fft))[]
     p4 = graph_polynomial(Independence(g), Val(:finitefield))[]
+    p5 = graph_polynomial(Independence(g), Val(:finitefield); max_iter=1)[]
     @test p1 ≈ p2
     @test p1 ≈ p3
     @test p1 ≈ p4
+    @test p1 ≈ p5
+
+    # test overflow
+    g = random_regular_graph(120, 3)
+    gp = Independence(g, optimizer=TreeSA(; ntrials=1); simplifier=MergeGreedy())
+    p6 = graph_polynomial(gp, Val(:polynomial))[]
+    p7 = graph_polynomial(gp, Val(:finitefield))[]
+    @test p6 ≈ p7
 end
 
 @testset "counting maximal IS" begin