Update tests and test data

JuliaEarth · Oct 20, 2017 · f6c9670 · f6c9670
1 parent 8ffee38
commit f6c9670
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/test/data/GeoStatsAPI.png b/test/data/GeoStatsAPI.png
diff --git a/test/data/RealsStoneWall.png b/test/data/RealsStoneWall.png
diff --git a/test/data/RealsStrebelle.png b/test/data/RealsStrebelle.png
diff --git a/test/data/VoxelStoneWall.png b/test/data/VoxelStoneWall.png
diff --git a/test/data/VoxelWalkerLake.png b/test/data/VoxelWalkerLake.png
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -165,24 +165,14 @@ if ismaintainer || istravislinux
   end
 end
 
-if ImageQuilting.cl ≠ nothing && ImageQuilting.clfft ≠ nothing
-  @testset "GPU" begin
-    # CPU and GPU give same results
-    TI = ones(20,20,20)
-    TI[10:end,:,:] = 2
-    srand(0); realscpu = iqsim(TI, 10, 10, 10, size(TI)..., gpu=false)
-    srand(0); realsgpu = iqsim(TI, 10, 10, 10, size(TI)..., gpu=true)
-    @test realscpu[1] == realsgpu[1]
-  end
-end
-
 @testset "GeoStats.jl API" begin
   geodata = GeoDataFrame(DataFrames.DataFrame(x=[25.,50.,75.], y=[25.,75.,50.], variable=[1.,0.,1.]), [:x,:y])
   grid = RegularGrid{Float64}(100,100)
   problem = SimulationProblem(geodata, grid, :variable, 3)
 
   TI = training_image("Strebelle")
-  solver = ImgQuilt(:variable => @NT(TI=TI, template=(30,30,1)))
+  inactive = [(i,j,1) for i in 1:30 for j in 1:30]
+  solver = ImgQuilt(:variable => @NT(TI=TI, template=(30,30,1), inactive=inactive))
 
   srand(2017)
   solution = solve(problem, solver)
@@ -201,3 +191,14 @@ end
     @test test_images(VisualTest(plot_solution, refimg), popup=!istravislinux) |> success
   end
 end
+
+if ImageQuilting.cl ≠ nothing && ImageQuilting.clfft ≠ nothing
+  @testset "GPU" begin
+    # CPU and GPU give same results
+    TI = ones(20,20,20)
+    TI[10:end,:,:] = 2
+    srand(0); realscpu = iqsim(TI, 10, 10, 10, size(TI)..., gpu=false)
+    srand(0); realsgpu = iqsim(TI, 10, 10, 10, size(TI)..., gpu=true)
+    @test realscpu[1] == realsgpu[1]
+  end
+end