Merge pull request #169 from TimZaman/test_warp_fix

Fixes for test_warp.lua

2 files changed, 34 insertions, 34 deletions

diff --git a/test/test_rotate.lua b/test/test_rotate.lua
index fb39ac3..8f7ef91 100644
--- a/test/test_rotate.lua
+++ b/test/test_rotate.lua
@@ -12,50 +12,50 @@ local function test_rotate(src, mode)
       
       -- rotate
       if mode then
-	 d1 = image.rotate(src, theta, mode)
-	 d2 = src.new():resizeAs(src)
-	 image.rotate(d2, src, theta, mode)
+         d1 = image.rotate(src, theta, mode)
+         d2 = src.new():resizeAs(src)
+         image.rotate(d2, src, theta, mode)
       else
-	 d1 = image.rotate(src, theta)
-	 d2 = src.new():resizeAs(src)
-	 image.rotate(d2, src, theta)
+         d1 = image.rotate(src, theta)
+         d2 = src.new():resizeAs(src)
+         image.rotate(d2, src, theta)
       end
+
       -- revert
       local revert = 2 * math.pi - theta
       if mode then
-	 d3 = image.rotate(d1, revert, mode)
-	 d4 = src.new():resizeAs(src)
-	 image.rotate(d4, d2, revert, mode)
+         d3 = image.rotate(d1, revert, mode)
+         d4 = src.new():resizeAs(src)
+         image.rotate(d4, d2, revert, mode)
       else
-	 d3 = image.rotate(d1, revert)
-	 d4 = src.new():resizeAs(src)
-	 image.rotate(d4, d2, revert)
+         d3 = image.rotate(d1, revert)
+         d4 = src.new():resizeAs(src)
+         image.rotate(d4, d2, revert)
       end
       
       -- diff
       if src:dim() == 3 then
-	 local cs = image.crop(src, src:size(2) / 4, src:size(3) / 4, src:size(2) / 4 * 3, src:size(3) / 4 * 3)
-	 local c3 = image.crop(d3, src:size(2) / 4, src:size(3) / 4, src:size(2) / 4 * 3, src:size(3) / 4 * 3)
-	 local c4 = image.crop(d4, src:size(2) / 4, src:size(3) / 4, src:size(2) / 4 * 3, src:size(3) / 4 * 3)
-      
-	 mean_dist = mean_dist + cs:dist(c3)
-	 mean_dist = mean_dist + cs:dist(c4)
+         local cs = image.crop(src, src:size(2) / 4, src:size(3) / 4, src:size(2) / 4 * 3, src:size(3) / 4 * 3)
+         local c3 = image.crop(d3, src:size(2) / 4, src:size(3) / 4, src:size(2) / 4 * 3, src:size(3) / 4 * 3)
+         local c4 = image.crop(d4, src:size(2) / 4, src:size(3) / 4, src:size(2) / 4 * 3, src:size(3) / 4 * 3)
+         mean_dist = mean_dist + cs:dist(c3)
+         mean_dist = mean_dist + cs:dist(c4)
       elseif src:dim() == 2 then
-	 local cs = image.crop(src, src:size(1) / 4, src:size(2) / 4, src:size(1) / 4 * 3, src:size(2) / 4 * 3)
-	 local c3 = image.crop(d3, src:size(1) / 4, src:size(2) / 4, src:size(1) / 4 * 3, src:size(2) / 4 * 3)
-	 local c4 = image.crop(d4, src:size(1) / 4, src:size(2) / 4, src:size(1) / 4 * 3, src:size(2) / 4 * 3)
-	 mean_dist = mean_dist + cs:dist(c3)
-	 mean_dist = mean_dist + cs:dist(c4)
+         local cs = image.crop(src, src:size(1) / 4, src:size(2) / 4, src:size(1) / 4 * 3, src:size(2) / 4 * 3)
+         local c3 = image.crop(d3, src:size(1) / 4, src:size(2) / 4, src:size(1) / 4 * 3, src:size(2) / 4 * 3)
+         local c4 = image.crop(d4, src:size(1) / 4, src:size(2) / 4, src:size(1) / 4 * 3, src:size(2) / 4 * 3)
+         mean_dist = mean_dist + cs:dist(c3)
+         mean_dist = mean_dist + cs:dist(c4)
       end
+      --[[
       if i == 1 then
-	 --[[
-	 image.display(src)
-	 image.display(d1)
-	 image.display(d2)
-	 image.display(d3)
-	 image.display(d4)
-	 --]]
+         image.display(src)
+         image.display(d1)
+         image.display(d2)
+         image.display(d3)
+         image.display(d4)
       end
+      --]]
    end
    if mode then
       print("mode = " .. mode .. ", mean dist: " .. mean_dist / (10 * 2))
diff --git a/test/test_warp.lua b/test/test_warp.lua
index 68a4ac1..5c4a1ed 100644
--- a/test/test_warp.lua
+++ b/test/test_warp.lua
@@ -32,8 +32,8 @@ flow_scale[1] = grid_y
 flow_scale[2] = grid_x
 flow_scale[1]:add(1):mul(0.5) -- 0 to 1
 flow_scale[2]:add(1):mul(0.5) -- 0 to 1
-flow_scale[1]:mul(height)
-flow_scale[2]:mul(width)
+flow_scale[1]:mul(height-1)
+flow_scale[2]:mul(width-1)
 flow:add(flow_scale)
 
 t0 = sys.clock()
@@ -86,8 +86,8 @@ flow_scale[1] = grid_y
 flow_scale[2] = grid_x
 flow_scale[1]:add(1):mul(0.5) -- 0 to 1
 flow_scale[2]:add(1):mul(0.5) -- 0 to 1
-flow_scale[1]:mul(height)
-flow_scale[2]:mul(width)
+flow_scale[1]:mul(height-1)
+flow_scale[2]:mul(width-1)
 flow:add(flow_scale)
 
 flow_rot = torch.FloatTensor()