Allow for equal bounds in range

fidlej · Dec 12, 2012 · bbdab55 · bbdab55
1 parent 522f550
commit bbdab55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/TH/generic/THTensorMath.c b/lib/TH/generic/THTensorMath.c
@@ -659,7 +659,7 @@ void THTensor_(range)(THTensor *r_, real xmin, real xmax, real step)
   real i = 0;
 
   THArgCheck(step > 0 || step < 0, 3, "step must be a non-null number");
-  THArgCheck((step > 0) && (xmax > xmin) || (step < 0) && (xmax < xmin), 2, "upper bound and larger bound incoherent with step sign");
+  THArgCheck((step > 0) && (xmax >= xmin) || (step < 0) && (xmax <= xmin), 2, "upper bound and larger bound incoherent with step sign");
 
   size = (long)((xmax-xmin)/step+1);
 

diff --git a/pkg/torch/test/test.lua b/pkg/torch/test/test.lua
@@ -105,6 +105,14 @@ function torchtest.rangenegative()
    torch.range(mxx,1,0,-1)
    mytester:asserteq(maxdiff(mx,mxx),0,'torch.range value for negative step')
 end
+function torchtest.rangeequalbounds()
+   local mx = torch.Tensor({1})
+   local mxx = torch.Tensor()
+   torch.range(mxx,1,1,-1)
+   mytester:asserteq(maxdiff(mx,mxx),0,'torch.range value for equal bounds step')
+   torch.range(mxx,1,1,1)
+   mytester:asserteq(maxdiff(mx,mxx),0,'torch.range value for equal bounds step')
+end
 function torchtest.randperm()
    local t=os.time()
    torch.manualSeed(t)