Make number of levels accurate

Author: ranjanan

src/aggregation.jl

@@ -31,13 +31,13 @@ function smoothed_aggregation{Tv,Ti}(A::SparseMatrixCSC{Tv,Ti},
     levels = Vector{Level{Tv,Ti}}()
     bsr_flag = false
 
-    while length(levels) < max_levels # && size(A, 1) > max_coarse
+    while length(levels) + 1 < max_levels && size(A, 1) > max_coarse
         A, B, bsr_flag = extend_hierarchy!(levels, strength, aggregate, smooth,
                                 improve_candidates, diagonal_dominance,
                                 keep, A, B, symmetry, bsr_flag)
-        if size(A, 1) <= max_coarse
+        #=if size(A, 1) <= max_coarse
             break
-        end
+        end=#
     end
     #=A, B = extend_hierarchy!(levels, strength, aggregate, smooth,
                             improve_candidates, diagonal_dominance,

src/classical.jl

@@ -20,11 +20,11 @@ function ruge_stuben{Ti,Tv}(A::SparseMatrixCSC{Ti,Tv};
 
     levels = Vector{Level{Ti,Tv}}()
 
-    while length(levels) < max_levels #&& size(A, 1) < max_coarse
+    while length(levels) + 1 < max_levels && size(A, 1) < max_coarse
         A = extend_heirarchy!(levels, strength, CF, A)
-        if size(A, 1) <= max_coarse
-            break
-        end
+        #if size(A, 1) <= max_coarse
+        #    break
+        #end
     end
     MultiLevel(levels, A, presmoother, postsmoother)
 end

src/multilevel.jl

@@ -68,7 +68,7 @@ function solve{T}(ml::MultiLevel, b::Vector{T},
                                     log = false)
     x = zeros(T, size(b))
     residuals = Vector{T}()
-    A = ml.levels[1].A
+    A = length(ml) == 1 ? ml.final_A : ml.levels[1].A
     normb = norm(b)
     if normb != 0
         tol *= normb

test/runtests.jl

@@ -97,6 +97,11 @@ end
 @test round(AMG.operator_complexity(ml), 3) ≈ 1.142
 @test round(AMG.grid_complexity(ml), 3) ≈ 1.190
 
+include("gmg.jl")
+
+A = float.(poisson(10^6))
+ml = multigrid(A)
+@test length(ml) == 10
 
 end
 
@@ -210,4 +215,5 @@ diff = x - [0.775725, -0.571202, -0.290989, -0.157001, -0.106981, 0.622652,
 
 
 end
+
 end