BUGFIX: seq.begin can now use negative offsets just like seq.end

pavanky · pavanky · commit 714cdc0f5bec · 2015-09-11T14:32:02.000-04:00
diff --git a/src/api/cpp/array.cpp b/src/api/cpp/array.cpp
@@ -374,8 +374,7 @@ namespace af
 
     const array::array_proxy array::row(int index) const
     {
-        seq idx(index, index, 1);
-        return this->operator()(idx, span, span, span);
+        return this->operator()(index, span, span, span);
     }
 
     array::array_proxy array::row(int index)
@@ -385,8 +384,7 @@ namespace af
 
     const array::array_proxy array::col(int index) const
     {
-        seq idx(index, index, 1);
-        return this->operator()(span, idx, span, span);
+        return this->operator()(span, index, span, span);
     }
 
     array::array_proxy array::col(int index)
@@ -396,8 +394,7 @@ namespace af
 
     const array::array_proxy array::slice(int index) const
     {
-        seq idx(index, index, 1);
-        return this->operator()(span, span, idx, span);
+        return this->operator()(span, span, index, span);
     }
 
     array::array_proxy array::slice(int index)
diff --git a/src/api/cpp/index.cpp b/src/api/cpp/index.cpp
@@ -75,7 +75,7 @@ index::index(const af::array& idx0) {
     impl.isBatch = false;
 }
 
-index::index(const af::index& idx0) {  
+index::index(const af::index& idx0) {
     *this = idx0;
 }
 
diff --git a/src/api/cpp/seq.cpp b/src/api/cpp/seq.cpp
@@ -46,7 +46,7 @@ seq::~seq()
 seq::seq(double n): m_gfor(false)
 {
     if (n < 0) {
-        init(n + 1, 0, 1);  // seq(-4) = -3, -2, -1, 0
+        init(0, n, 1);
     } else {
         init(0, n - 1, 1);
     }
diff --git a/src/backend/dim4.cpp b/src/backend/dim4.cpp
@@ -176,7 +176,7 @@ dim4 operator*(const dim4& first, const dim4& second)
 
 
 bool
-isEnd(const af_seq &seq)    { return (seq.end <= -1); }
+hasEnd(const af_seq &seq)    { return (seq.begin <= -1 || seq.end <= -1); }
 
 bool
 isSpan(const af_seq &seq)   { return (seq.step == 0 && seq.begin == 1 && seq.end == 1); }
@@ -196,18 +196,11 @@ dim_t calcDim(const af_seq &seq, const dim_t &parentDim)
     dim_t outDim = 1;
     if  (isSpan(seq)) {
         outDim = parentDim;
-    } else if (isEnd(seq)) {
-        if(seq.begin == -1) {   // only end is passed as seq
-            outDim = 1;
-        } else if (seq.begin < 0) {
-            af_seq temp = {parentDim + seq.begin,
-                           parentDim + seq.end,
-                           seq.step};
-            outDim = seqElements(temp);
-        } else {    // end is passed as a part of seq
-            af_seq temp = {seq.begin, parentDim + seq.end, seq.step};
-            outDim = seqElements(temp);
-        }
+    } else if (hasEnd(seq)) {
+        af_seq temp = {seq.begin, seq.end, seq.step};
+        if (seq.begin < 0) temp.begin += parentDim;
+        if (seq.end   < 0) temp.end   += parentDim;
+        outDim = seqElements(temp);
     } else {
         DIM_ASSERT(1, seq.begin >= -DBL_MIN && seq.begin < parentDim);
         DIM_ASSERT(1, seq.end < parentDim);
@@ -216,7 +209,8 @@ dim_t calcDim(const af_seq &seq, const dim_t &parentDim)
 
     return outDim;
 }
-}
+
+} // end namespace af
 
 using af::dim4;
 using std::vector;

Original file line number	Diff line number	Diff line change
`@@ -374,8 +374,7 @@ namespace af`
`374`	`374`
`375`	`375`	`const array::array_proxy array::row(int index) const`
`376`	`376`	`{`
`377`		`- seq idx(index, index, 1);`
`378`		`- return this->operator()(idx, span, span, span);`
	`377`	`+ return this->operator()(index, span, span, span);`
`379`	`378`	`}`
`380`	`379`
`381`	`380`	`array::array_proxy array::row(int index)`
`@@ -385,8 +384,7 @@ namespace af`
`385`	`384`
`386`	`385`	`const array::array_proxy array::col(int index) const`
`387`	`386`	`{`
`388`		`- seq idx(index, index, 1);`
`389`		`- return this->operator()(span, idx, span, span);`
	`387`	`+ return this->operator()(span, index, span, span);`
`390`	`388`	`}`
`391`	`389`
`392`	`390`	`array::array_proxy array::col(int index)`
`@@ -396,8 +394,7 @@ namespace af`
`396`	`394`
`397`	`395`	`const array::array_proxy array::slice(int index) const`
`398`	`396`	`{`
`399`		`- seq idx(index, index, 1);`
`400`		`- return this->operator()(span, span, idx, span);`
	`397`	`+ return this->operator()(span, span, index, span);`
`401`	`398`	`}`
`402`	`399`
`403`	`400`	`array::array_proxy array::slice(int index)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ index::index(const af::array& idx0) {`
`75`	`75`	`impl.isBatch = false;`
`76`	`76`	`}`
`77`	`77`
`78`		`-index::index(const af::index& idx0) {`
	`78`	`+index::index(const af::index& idx0) {`
`79`	`79`	`*this = idx0;`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ seq::~seq()`
`46`	`46`	`seq::seq(double n): m_gfor(false)`
`47`	`47`	`{`
`48`	`48`	`if (n < 0) {`
`49`		`- init(n + 1, 0, 1); // seq(-4) = -3, -2, -1, 0`
	`49`	`+ init(0, n, 1);`
`50`	`50`	`} else {`
`51`	`51`	`init(0, n - 1, 1);`
`52`	`52`	`}`