Clean up

Author: ranjanan

src/classical.jl

@@ -31,7 +31,7 @@ end
 
 function extend_heirarchy!(levels::Vector{Level}, strength, CF, A)
     S, T = strength_of_connection(strength, A)
-    splitting = split_nodes(CF, S, T)
+    splitting = split_nodes(CF, S)
     P, R = direct_interpolation(A, T, splitting)
     push!(levels, Level(A, P, R))
     A = R * A * P

src/splitting.jl

@@ -4,8 +4,24 @@ const U_NODE = 2
 
 struct RS
 end
-split_nodes(x, S) = split_nodes(x, S, S')
-split_nodes(::RS, S::SparseMatrixCSC, T::SparseMatrixCSC) = RS_CF_splitting(S - spdiagm(diag(S)), T - spdiagm(diag(T)))
+#=function split_nodes(::RS, S)
+	n = size(S, 1)
+	for i = 1:n
+		for j in nzrange(S, i)
+			row = S.rowval[j]
+			if row == i
+				S.nzval[j] = 0
+			end
+		end
+	end
+	i, j, v = findnz(S)
+	RS_CF_splitting(sparse(i,j,v,n,n), sparse(j,i,v,n,n))
+end=#
+function split_nodes(::RS, S)
+	T = S'
+	RS_CF_splitting(S - spdiagm(diag(S)), T - spdiagm(diag(T)))
+end
+
 function RS_CF_splitting(S::SparseMatrixCSC, T::SparseMatrixCSC)
 
 	m,n = size(S)

test/runtests.jl

@@ -39,7 +39,7 @@ S, T = AMG.strength_of_connection(AMG.Classical(0.25), a)
 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0,
 1, 0]
 
-@test split_nodes(RS(), ref_S, ref_S') == Int.(vec(ref_split))
+@test split_nodes(RS(), ref_S) == Int.(vec(ref_split))
 
 end