Some more updates

Author: Will Kimmerer

examples/BFSParentsMultiSource.jl

@@ -12,7 +12,7 @@ using LinearAlgebra
 function insert(P, R, s, n)
     for i = 1:s
         for j = 1:n
-            if(P[i, j]!=nothing && R[i, j]==nothing) #*
+            if(P[i, j] !== nothing && R[i, j] === nothing) #*
                 R[i, j] = P[i, j]
             end
         end
@@ -51,10 +51,8 @@ function ms_bfsp(A, S, n, s)
             end
         end
     end
-
-
-    for i = 1:n-1
-            F = mul(F, A, Semirings.MIN_FIRST, mask=P, desc=Descriptors.RC)
+    for _ ∈ 1:n-1
+            F = mul(F, A, (min, first), mask=P, desc=Descriptors.RC)
             P = F[:, :, mask=F, desc=Descriptors.S]
             F = index[:, :, mask=F, desc=Descriptors.S]
             R = insert(P, R, s, n)

examples/BasicPrim.jl

@@ -36,7 +36,7 @@ function b_prim(A, n, m)
         u = argmin(m'+d)
         m[u[2]] = Inf
         weight = weight + d[u[2]]
-        d = emul(d, A[u[1],:],  BinaryOps.MIN)
+        d = min.(d, A[u[1],:])
     end
 
     return weight

examples/BellmanFord.jl

@@ -18,8 +18,8 @@ function bellmanford(A, s, n)
         end
 
     d[s]=0.0
-    for i = 1:n
-           d = mul(d, A, Semirings.MIN_PLUS, mask=d, desc=Descriptors.S)
+    for _ ∈ 1:n
+           d = mul(d, A, (min, +), mask=d, desc=Descriptors.S)
     end
 
     return d

examples/CDLP.jl

@@ -68,15 +68,13 @@ function cdlp(A, n, t)
     end
 
     for k = 1:t
-            F = mul(A, lab, Semirings.PLUS_TIMES)
+            F = A * lab
             for i = 1:n
             r = F[i,:]
             r = sort(r, dims=2)
             lab[i, i] = minMode(r)
         end
-
     end
-
     return lab
 
 end

examples/CMU.jl

@@ -11,23 +11,16 @@ using LinearAlgebra
 
 #A is the input matrix, n is the number of nodes in the original matrix, Output: Triangle Count
 function cmu(A, n)
-
-        t = 0
-
-        for i = 2:n-1
-
-            #rpva
-            A20 = A[i+1:n,begin:i]
-            a10 = A[begin:i, i]
-            a12 = A[i, i+1:n]
-
-            partial1 = mul(a10', A20', Semirings.PLUS_TIMES)
-            partial2 = mul(partial1, a12', Semirings.PLUS_TIMES)
-
-            t = t + partial2[1]
+    t = 0
+    for i ∈ 2:n-1
+        #rpva
+        A20 = A[i+1:n,begin:i]
+        a10 = A[begin:i, i]
+        a12 = A[i, i+1:n]
+
+        partial1 = a10' * A20'
+        partial2 = partial1 * a12'
+        t += partial2[1]
     end
-
-    print(t)
-
     return t
 end

examples/Cohen.jl

@@ -11,19 +11,7 @@ using LinearAlgebra
 
 ##A is the input matrix, Output: Triangle Count
 function cohen(A)
-
-    #extracting lower matrix from input matrix
-    L = tril(A)
-
-
-    #extracting upper matrix from input matrix
-    U = triu(A')
-
-    B = mul(L, U, Semirings.PLUS_TIMES)
-    C = emul(B, A,  BinaryOps.TIMES)
-    result = reduce(Monoids.PLUS_MONOID[Float64], C, dims=:)
-    result = result /2
-
-    return result
-
+    U = select(TRIU, A)
+    L = select(TRIL, A)
+    return reduce(+, mul(L, U, (+, pair); mask=A)) ÷ 2
 end

examples/FloydWarshall.jl

@@ -15,13 +15,11 @@ function floydwarshall(A, n)
     D = A
     result = GBMatrix{Int64}(n, n)
 
-
     for i = 1:n
-            partial = mul(D[:,i], D[i,:], Semirings.MIN_PLUS)
-            D = emul(D, partial,  BinaryOps.MIN)
+            partial = mul(D[:,i], D[i,:], (min, +))
+            D = emul(D, partial,  min)
             result = partial
     end
-
     return result
 
 end

examples/KTruss.jl

@@ -13,12 +13,11 @@ using LinearAlgebra
 function ktruss(A, k, n)
 
     C = A
-    for i = 1:n-1
+    for _ ∈ 1:n-1
        C = mul(C, C, Semirings.PLUS_LAND, mask=C)
-       C = select(SelectOps.GE, C, k-2)
+       C = select(>=, C, k-2)
        print(C)
     end
-
     return C
 
 end

examples/NodeWiseTriangleCount.jl

@@ -12,9 +12,8 @@ using LinearAlgebra
 #A is the input matrix. Output: triangles originated by each node
 function nodewise_tc(A)
 
-    #extracting lower matrix from input matrix
-    partial = mul(A, A, Semirings.PLUS_TIMES, mask=A)
-    t = reduce(Monoids.PLUS_MONOID[Float64], partial, dims=2)
+    partial = mul(A, A, (+, *), mask=A)
+    t = reduce(+, partial, dims=2)
     return t/2
 
 end