Added tests

Author: MaximusMellberg

src/ControlledReduction.jl

@@ -275,7 +275,7 @@ takes single monomial in frobenius and reduces to pole order n, currently only d
 if the reduction hits the end, returns u as the "true" value, otherwise returns it in Costa's format
 (i.e. entries will be multiplies of p in Costa's format)
 """
-function reducechain_costachunks(u,g,m,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed;verbose=false)
+function reducechain_costachunks(u,g,m,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed;verbose=false,fastevaluation)
     #p = Int64(characteristic(parent(f)))
     n = nvars(parent(f)) - 1
     d = degree(f,1)
@@ -329,7 +329,6 @@ function reducechain_costachunks(u,g,m,S,f,pseudoInverseMat,p,Ruvs,termorder,var
 
     #verbose && println("Before reduction chunk: $gMat")
     #verbose && println("Before reduction chunk, I is $I")
-    fastevaluation = false
     if fastevaluation
       gMat = finitediff_prodeval_linear(B,A,0,nend-(d*n-n)-1,gMat)
       i = nend-(d*n-n) + 1
@@ -438,7 +437,7 @@ function reducechain_costachunks(u,g,m,S,f,pseudoInverseMat,p,Ruvs,termorder,var
 
 end
 
-function reducechain_naive(u,g,m,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed,verbose=false)
+function reducechain_naive(u,g,m,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed,verbose=false,fastevaluation)
     n = nvars(parent(f)) - 1
     d = degree(f,1)
     PR = parent(f)
@@ -470,9 +469,13 @@ function reducechain_naive(u,g,m,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reve
         matrices = computeRuv(V,S,f,pseudoInverseMat,Ruvs,termorder,vars_reversed)
         B,A = computeRPoly_LAOneVar2(matrices,reverse(mins),reverse(V),R)
         i = 1
-        while i <= K
-            gMat = (A+B*(K-i))*gMat
-            i = i+1
+        if fastevaluation == false
+            while i <= K
+                gMat = (A+B*(K-i))*gMat
+                i = i+1
+            end
+        else
+            gMat = finitediff_prodeval_linear(B,A,0,K-1,gMat)
         end
         J = J - K*V
         m = m - K
@@ -683,7 +686,7 @@ end
 Implements Costa's algorithm for controlled reduction,
 sweeping down the terms of the series expansion by the pole order.
 """
-function reducepoly_costachunks(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed; verbose=false)
+function reducepoly_costachunks(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed; verbose=false, fastevaluation)
     #p = Int64(characteristic(parent(f)))
     n = nvars(parent(f)) - 1
     d = degree(f,1)
@@ -719,7 +722,7 @@ function reducepoly_costachunks(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_r
         for i in eachindex(ω)
             #ω[i] = reducechain...
             #verbose && println("u is type $(typeof(ω[i][1]))")
-            ω[i] = reducechain_costachunks(ω[i]...,poleorder,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed,verbose=verbose)
+            ω[i] = reducechain_costachunks(ω[i]...,poleorder,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed,verbose=verbose,fastevaluation)
         end
 
         poleorder = poleorder - p
@@ -730,7 +733,7 @@ function reducepoly_costachunks(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_r
     return poly_of_end_costadatas(ω,PR,p,d,n,S,termorder)
 end
 
-function reducepoly_naive(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed)
+function reducepoly_naive(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed,fastevaluation)
     n = nvars(parent(f)) - 1
     d = degree(f,1)
     PR = parent(f)
@@ -739,7 +742,7 @@ function reducepoly_naive(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reverse
     for term in pol
         terms = termsoforder(pol,term[2])
         for t in terms
-            push!(result,reducechain_naive(costadata_of_initial_term(t,n,d,p,termorder)...,t[2],S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed))
+            push!(result,reducechain_naive(costadata_of_initial_term(t,n,d,p,termorder)...,t[2],S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed,fastevaluation))
         end
     end
     return poly_of_end_costadatas(result,PR,p,d,n,S,termorder)
@@ -752,33 +755,33 @@ trying to emulate Costa's controlled reduction, changes the order that polynomia
 
 N_m - the precision
 """
-function reducetransform_costachunks(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed; verbose=false)
+function reducetransform_costachunks(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed; verbose=false, fastevaluation)
     MS1 = matrix_space(coefficient_ring(parent(f)), binomial(d*n,d*n-n), binomial(d*n,d*n-n))
     Ruvs = Dict{Vector{Int64}, Vector{typeof(MS1())}}()
     result = []
     for pol in FT
-        reduction = reducepoly_costachunks(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed, verbose=verbose)
+        reduction = reducepoly_costachunks(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed, verbose=verbose, fastevaluation)
         push!(result, reduction)
     end
     return result
 end
 
-function reducetransform_naive(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed)
+function reducetransform_naive(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed,fastevaluation)
     MS1 = matrix_space(coefficient_ring(parent(f)), binomial(d*n,d*n-n), binomial(d*n,d*n-n))
     Ruvs = Dict{Vector{Int64}, Vector{typeof(MS1())}}()
     result = []
     for pol in FT
-        reduction = reducepoly_naive(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed)
+        reduction = reducepoly_naive(pol,S,f,pseudoInverseMat,p,Ruvs,termorder,vars_reversed,fastevaluation)
         push!(result, reduction)
     end
     return result
 end
 
-function reducetransform(FT,N_m,S,f,pseudoInverseMat,p,termorder,algorithm,vars_reversed;verbose=false)
+function reducetransform(FT,N_m,S,f,pseudoInverseMat,p,termorder,algorithm,vars_reversed;verbose=false,fastevaluation)
     if algorithm == :costachunks
-        reducetransform_costachunks(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed,verbose=verbose)
+        reducetransform_costachunks(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed,verbose=verbose,fastevaluation)
     elseif algorithm == :naive
-        reducetransform_naive(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed)
+        reducetransform_naive(FT,N_m,S,f,pseudoInverseMat,p,termorder,vars_reversed,fastevaluation)
     else
         throw(ArgumentError("Unsupported Algorithm: $algorithm"))
     end

src/ZetaFunction.jl

@@ -155,7 +155,7 @@ vars_reversed -- reverses the order of basis vectors at various places
 >>>if you don't know what this is, ignore it.
 
 """
-function zeta_function(f; verbose=false, givefrobmat=false, algorithm=:costachunks, termorder=:invlex, vars_reversed=true)
+function zeta_function(f; verbose=false, givefrobmat=false, algorithm=:costachunks, termorder=:invlex, vars_reversed=true, fastevaluation=false)
     p = Int64(characteristic(parent(f)))
     q = p
     n = nvars(parent(f)) - 1
@@ -243,7 +243,7 @@ function zeta_function(f; verbose=false, givefrobmat=false, algorithm=:costachun
     #    end
     #end
     #TODO: check which algorithm we're using
-    Reductions = reducetransform(FBasis, N_m, S, fLift, pseudo_inverse_mat, p, termorder,algorithm,vars_reversed,verbose=verbose)
+    Reductions = reducetransform(FBasis, N_m, S, fLift, pseudo_inverse_mat, p, termorder,algorithm,vars_reversed,verbose=verbose,fastevaluation)
     if verbose
         for i in 1:length(Basis)
             basis_elt = Basis[i]

test/Orderings.jl

@@ -66,8 +66,24 @@ function test_naive_algorithm()
     f = y^2*z - x^3 - x*z^2 - z^3
 
     zeta_costa = DeRham.zeta_function(f)
-    zeta_naive = DeRham.zeta_function(f)
+    zeta_naive = DeRham.zeta_function(f,algorithm=:naive)
 
     @test zeta_costa == zeta_naive
 end
-    
+
+function test_fastevaluation()
+    n = 2
+    d = 3
+
+    p = 7
+
+    F = GF(p)
+    R, (x,y,z) = polynomial_ring(F, ["x$i" for i in 0:n])
+
+    f = y^2*z - x^3 - x*z^2 - z^3
+
+    zeta = DeRham.zeta_function(f)
+    zeta_fasteval = DeRham.zeta_function(f,fastevaluation=true)
+
+    @test zeta == zeta_fasteval
+end

test/runtests.jl

@@ -60,6 +60,8 @@ end
 
 @testset "Monomial orderings" begin
     test_supported_monomial_orderings()
+    test_naive_algorithm()
+    test_fastevaluation()
 
     #test_reversing_variables()