Revert "Fix ArraySlice for dim reduction if size(dim) is 1"

This reverts commit d4f4681.
OpenModelica · Mar 28, 2016 · bb4bdc2 · bb4bdc2
1 parent 630d4b6
commit bb4bdc2
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/SimulationRuntime/cpp/Include/Core/Math/ArraySlice.h b/SimulationRuntime/cpp/Include/Core/Math/ArraySlice.h
@@ -126,14 +126,17 @@ class ArraySliceConst: public BaseArray<T> {
         if (start > maxIndex || stop > maxIndex || step == 0)
           throw ModelicaSimulationError(MODEL_ARRAY_FUNCTION,
                                         "Wrong slice exceeding array size");
-        size = std::max(0, (stop - start) / step + 1);
-        // avoid trivial fill of _idxs if slice accesses all indices
-        if (start > 1 || step != 1 || stop < maxIndex || size == 1)
-          for (size_t i = 0; i < size; i++)
+        if (start == 1 && step == 1 && stop == maxIndex)
+          // all indices; avoid trivial fill of _idxs
+          size = _baseArray.getDim(dim);
+        else {
+          size = std::max(0, (stop - start) / step + 1);
+          for (int i = 0; i < size; i++)
             dit->push_back(start + i * step);
+        }
       }
       if (size == 1)
-        // preset constant _baseIdx in case of reduction
+        // prefill constant _baseIdx in case of reduction
         _baseIdx[dim - 1] = sit->iset != NULL? (*_isets[dim - 1])(1): (*dit)[0];
       else
         // store dimension of array slice