Changes:

1. Edits in agg_recursion.

Author: kwcckw

frame_2D_alg/vectorize_edge_blob/agg_recursion.py

@@ -26,7 +26,7 @@ def cluster_eval(frame, N_, fd):
     cross-comp converted edges, then GGs, GGGs, etc, interlaced with exemplar selection: '''
     iN_ = []
     for N in frame.subG_:
-        iN_ += [N] if N.derH.Et[0] < ave * N.derH.Et[2] else N.subG_  # eval to unpack top N
+        iN_ += [N] if N.derH.Et[0] < ave * N.derH.Et[2] else N.subG_  # eval to unpack top N (if we unpack N.subG_, their rim may not empty and will be used again in der+ fork later )
 
     N_,L_,(m,d,mr,dr) = comp_node_(iN_)  # cross-comp exemplars, extrapolate to exemplar.Rim?
     if m > ave * mr:
@@ -156,15 +156,16 @@ def prune_overlap(N_):  # select Ns with M > ave * Mr
                     N.M -= _m  # Rim is exclusive, vs N.Mr+=1?
                     for _ref in copy(_N.Rim):
                         if _ref[0] is N:  # reciprocal to ref
-                            _N.Rim.remove(ref); N.M-=_m; break
+                            _N.Rim.remove(_ref); _N.M-=_m; break  # should be removing _ref here because ref is in N.rim instead of _N.rim
             if N.M > ave:
                 if N.M > ave*10:
-                    centroid_cluster(N)  # refine N.Rim
-                exemplar_ += [N]
+                    centroid_cluster(N, N_)  # refine N.Rim
+                if N.Rim:  # N.Rim might be empty after the pruning
+                    exemplar_ += [N]
 
         return exemplar_
 
-    def centroid_cluster(N):
+    def centroid_cluster(N, N_):
         _Rim,_perim,_M = N.Rim, N.perim, N.M
 
         dM = ave + 1  # refine Rim to convergence:
@@ -186,9 +187,16 @@ def centroid_cluster(N):
                                     fRim = 1; break
                         if fRim:  # not in exclusive stronger _N.Rim
                             Rim.add(ref); M += m
-            dM = M - _M
-            _node_,_peri_,_M = Rim, perim, M
+                            # remove ref with _N in all other Ns
+                            for __N in N_:
+                                if __N not in [N, _N]:
+                                    for __ref in copy(__N.Rim):
+                                        if __ref[0] is _N:
+                                            __N.Rim.remove(__ref)
+                                            __N.M -= __ref[1]
 
+            dM = M - _M
+            _node_,_perim,_M = Rim, perim, M
         N.Rim, N.perim, N.M = list(Rim),list(perim), M  # final cluster
 
     N_ = frame.subG_  # should be complemented graphs: m-type core + d-type contour

frame_2D_alg/vectorize_edge_blob/trace_edge.py

@@ -217,7 +217,7 @@ def vectorize_root(frame):
                     # init for agg+:
                     if not hasattr(frame, 'derH'):
                         frame.derH = CH(root=frame); frame.root = None; frame.subG_ = []
-                    Y,X,_,_,_,_ = blob.latuple; P_ = blob.P_; lat = np.sum([P.latuple for P in P_])
+                    Y,X,_,_,_,_ = blob.latuple; P_ = blob.P_; lat = np.sum([P.latuple for P in P_],axis=0)  # prevent merging of summed value
                     edge = CG(root_=[frame], node_=blob.node_, latuple=lat, box=[np.inf,np.inf,0,0], yx=[Y,X], n=0)
                     G_ = []
                     for N in edge.node_:  # no comp node_, link_ | PPd_ for now
@@ -227,6 +227,7 @@ def vectorize_root(frame):
                             PP = CG(fd=0, root_=[root_], node_=P_,link_=link_,mdLay=np.array([md_,Et,n],dtype=object),latuple=lat, box=box,yx=[y,x],n=n)
                             y0,x0,yn,xn = box
                             PP.aRad = np.hypot(*np.subtract(PP.yx,(yn,xn)))
+                            edge.n += PP.n; edge.box = extend_box(edge.box, PP.box)  # we need n and box in edge (for agg_cluster later)
                             G_ += [PP]
                     if len(G_) > ave_L:
                         edge.subG_ = G_