From 2233dd81a164d95fb583b4f1c42ec553349011c3 Mon Sep 17 00:00:00 2001
From: houpc <houpc96@gmail.com>
Date: Sat, 27 Jan 2024 22:53:27 +0800
Subject: [PATCH] bugfix in updateKT

---
 src/frontend/parquet/operation.jl | 34 ++++++++++++++++++++++++++-----
 src/frontend/parquet/vertex4.jl   | 17 ++++++++++++++++
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/frontend/parquet/operation.jl b/src/frontend/parquet/operation.jl
index 5735eb18..b009266f 100644
--- a/src/frontend/parquet/operation.jl
+++ b/src/frontend/parquet/operation.jl
@@ -156,13 +156,20 @@ function update_extKT!(diags::Vector{Graph}, para::DiagPara, legK::Vector{Vector
     # num_extK = len_extK - para.innerLoopNum
     # extK = [k[1:len_extK] for k in legK[1:num_extK]]
     len_extK = length(legK[1])
-    num_extK = length(legK) - 1
     extK = legK[1:end-1]
+    indices = collect(1:len_extK)
 
     sumK = zeros(len_extK)
     _K = zeros(len_extK)
-
+    # extK0 = [getK(len_extK, 1), getK(len_extK, 2), getK(len_extK, 3)]
+    # flag = false
+    # if extK0 != legK
+    #     flag = true
+    # end
+    # println(legK)
     for graph in diags
+        # println("Graph:")
+        # println(graph.properties.extT, tauIdx)
         tau_shift = tauIdx - graph.properties.extT[1]
         for node in PreOrderDFS(graph)
             node.id in visited && continue
@@ -174,6 +181,9 @@ function update_extKT!(diags::Vector{Graph}, para::DiagPara, legK::Vector{Vector
             end
             K = prop.extK
             T = prop.extT
+            # if flag && isleaf(node)
+            #     println(node.properties)
+            # end
             if prop isa Ver4Id || prop isa Ver3Id
                 for i in eachindex(K)
                     resize!(K[i], len_extK)
@@ -192,17 +202,31 @@ function update_extKT!(diags::Vector{Graph}, para::DiagPara, legK::Vector{Vector
                 else
                     resize!(K, len_extK)
                 end
+                for (i, k) in enumerate(extK)
+                    sumK .+= K[i] * k
+                end
 
-                _K[num_extK+1:end] .= K[num_extK+1:end]
-                for i in eachindex(extK)
-                    sumK .+= K[i] * extK[i]
+                permu = sortperm(length.([filter(!iszero, k) for k in extK]))
+                idx_independent_extK = Int[]
+                for i in permu
+                    j = findfirst(idx -> idx ∉ idx_independent_extK && extK[i][idx] != 0, indices)
+                    push!(idx_independent_extK, j)
+                    K[i], K[j] = K[j], K[i]
                 end
+
+                idx_innerL = setdiff(indices, idx_independent_extK)
+                _K[idx_innerL] .= K[idx_innerL]
                 K .= sumK .+ _K
+
                 fill!(sumK, 0.0)
+                fill!(_K, 0.0)
                 if tau_shift != 0
                     node.properties = FrontEnds.reconstruct(prop, :extT => Tuple(t + tau_shift for t in T))
                 end
             end
+            # if flag && isleaf(node)
+            #     println(node.id, " ", node.properties)
+            # end
         end
     end
 end
diff --git a/src/frontend/parquet/vertex4.jl b/src/frontend/parquet/vertex4.jl
index a21495eb..dea58075 100644
--- a/src/frontend/parquet/vertex4.jl
+++ b/src/frontend/parquet/vertex4.jl
@@ -72,6 +72,7 @@ function vertex4(para::DiagPara,
     else # loopNum>0
         for c in channels
             if c == Alli
+                # continue
                 if 3 ≤ loopNum ≤ 4
                     addAlli!(ver4df, para, legK)
                 else
@@ -97,6 +98,10 @@ function vertex4(para::DiagPara,
     end
     ver4df = merge_vertex4(para, ver4df, name, legK)
     @assert all(x -> x[1] == para.firstTauIdx, ver4df.extT) "not all extT[1] are equal to the first Tau index $(para.firstTauIdx)! $ver4df"
+    # if any(x -> length(unique(x)) == 4, ver4df.extT)
+    #     println(para)
+    #     println(ver4df)
+    # end
     return ver4df
 end
 
@@ -175,6 +180,18 @@ function bubble!(ver4df::DataFrame, para::DiagPara, legK, chan::TwoBodyChannel,
 
     ver8 = Dict{Any,Any}()
 
+    # if lPara.innerLoopNum == 3
+    #     println("Lver:")
+    #     println(lPara)
+    #     println(Lver)
+    #     println(Rver)
+    # end
+    # if rPara.innerLoopNum == 3
+    #     println("Rver:")
+    #     println(rPara)
+    #     println(Lver)
+    #     println(Rver)
+    # end
     for ldiag in Lver.diagram
         for rdiag in Rver.diagram
             extT, G0T, GxT = tauBasis(chan, ldiag.properties.extT, rdiag.properties.extT)