Fix splitting, add a test

Author: ranjanan

src/splitting.jl

@@ -54,11 +54,6 @@ function RS_CF_splitting(S::SparseMatrixCSC)
             splitting[i] = F_NODE
 		end
     end
-	@show lambda
-	@show interval_ptr
-	@show interval_count
-	@show node_to_index
-	@show index_to_node
 
 	for top_index = n_nodes:-1:1
 		i = index_to_node[top_index]
@@ -69,24 +64,19 @@ function RS_CF_splitting(S::SparseMatrixCSC)
 		else
 			@assert splitting[i] == U_NODE
 			splitting[i] = C_NODE
-			for j in nzrange(T, i)
-				row = T.rowval[j]
+			for j in nzrange(S, i)
+				row = S.rowval[j]
 				if splitting[row] == U_NODE
 					splitting[row] = F_NODE
 
-					for k in nzrange(S, row)
-						rowk = S.rowval[k]
-						@show rowk
-						if rowk == 83
-							@show S[:, row]
-							@show T[:, row]
-						end
+					for k in nzrange(T, row)
+						rowk = T.rowval[k]
+
 						if splitting[rowk] == U_NODE
 							lambda[rowk] >= n_nodes - 1 && continue
 							lambda_k = lambda[rowk] + 1
 						  	old_pos  = node_to_index[rowk]
 						  	new_pos  = interval_ptr[lambda_k] + interval_count[lambda_k]# - 1
-							@show new_pos
 
 						  	node_to_index[index_to_node[old_pos]] = new_pos
 						  	node_to_index[index_to_node[new_pos]] = old_pos
@@ -103,8 +93,9 @@ function RS_CF_splitting(S::SparseMatrixCSC)
 					end
 				end
 			end
-			for j in nzrange(S, i)
-				row = S.rowval[j]
+
+			for j in nzrange(T, i)
+				row = T.rowval[j]
 				if splitting[row] == U_NODE
 
 					lambda[row] == 0 && continue

test/ref_S_test.jld

@@ -0,0 +1,100 @@
+0
+0
+1
+0
+0
+1
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+0
+1
+1
+0
+1
+0
+0
+1
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+0
+0
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+0
+1
+0
+1
+0
+0
+0
+0
+1
+0

test/ref_split_test.txt

@@ -2,16 +2,23 @@ using AMG
 using Base.Test
 using JLD
 
+graph = load("test.jld")["G"]
+ref_S = load("ref_S_test.jld")["G"]
+ref_split = readdlm("ref_split_test.txt")
+
 @testset "Strength of connection" begin
 
 # classical strength of connection
 A = poisson(5)
-X = strength_of_connection(Classical(0.2), A)
-@test full(X) == [ 1.0  0.5  0.0  0.0  0.0
+S = strength_of_connection(Classical(0.2), A)
+@test full(S) == [ 1.0  0.5  0.0  0.0  0.0
                    0.5  1.0  0.5  0.0  0.0
                    0.0  0.5  1.0  0.5  0.0
                    0.0  0.0  0.5  1.0  0.5
                    0.0  0.0  0.0  0.5  1.0 ]
+S = strength_of_connection(Classical(0.25), graph)
+diff = S - ref_S
+@test maximum(diff) < 1e-10
 
 end
 
@@ -31,6 +38,8 @@ S = 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) == Int.(vec(ref_split))
+
 end
 
 @testset "Interpolation" begin