got rid of unnecessary grow methods and commented-out lines

Author: evgueni-ovtchinnikov

src/include/stir/Array.h

@@ -569,16 +569,6 @@ class Array<1, elemT> : public NumericVectorWithOffset<elemT, elemT>
 
   inline const elemT& at(const BasicCoordinate<1, int>& c) const;
   //@}
-  /*
-    void set_initialise_with_zeros(bool iwz)
-    {
-      init_with_zeros_ = iwz;
-    }
-    bool get_initialise_with_zeros() const
-    {
-      return init_with_zeros_;
-    }
-  */
 private:
   // Make sure we can call init() recursively.
   template <int num_dimensions2, class elemT2>
@@ -589,8 +579,6 @@ class Array<1, elemT> : public NumericVectorWithOffset<elemT, elemT>
     \arg data_ptr should start to a contiguous block of correct size
   */
   inline void init(const IndexRange<1>& range, elemT* const data_ptr, bool copy_data);
-
-  // bool init_with_zeros_ = true;
 };
 
 END_NAMESPACE_STIR

src/include/stir/Array.inl

@@ -582,9 +582,8 @@ Array<1, elemT>::resize(const int min_index, const int max_index, bool initialis
   const int oldstart = this->get_min_index();
   const size_type oldlength = this->size();
 
-  base_type::resize(min_index, max_index, initialise_with_0);
+  base_type::resize(min_index, max_index);
 
-  // if (!get_initialise_with_zeros())
   if (!initialise_with_0)
     {
       this->check_state();

src/include/stir/VectorWithOffset.h

@@ -194,7 +194,6 @@ class VectorWithOffset
       resize() in a derived class, it is probably safest to overload
       grow() as well.
   */
-  inline virtual void grow(const int min_index, const int max_index, bool initialise_with_0);
   inline virtual void grow(const int min_index, const int max_index);
 
   //! grow the range of the vector from 0 to new_size-1, new elements are set to \c T()
@@ -208,7 +207,6 @@ class VectorWithOffset
       \todo in principle reallocation could be avoided when the new range would fit in the
       old one by shifting.
     */
-  inline virtual void resize(const int min_index, const int max_index, bool initialise_with_0);
   inline virtual void resize(const int min_index, const int max_index);
 
   //! change the range of the vector from 0 to new_size-1, new elements are set to \c T()

src/include/stir/VectorWithOffset.inl

@@ -416,7 +416,7 @@ VectorWithOffset<T>::reserve(const unsigned int new_size)
 // the new members will be initialised with the default constructor for T
 template <class T>
 void
-VectorWithOffset<T>::resize(const int min_index, const int max_index, bool initialise_with_0)
+VectorWithOffset<T>::resize(const int min_index, const int max_index)
 {
   this->check_state();
   if (min_index > max_index)
@@ -465,13 +465,6 @@ VectorWithOffset<T>::resize(const int min_index, const int max_index, bool initi
   this->check_state();
 }
 
-template <class T>
-void
-VectorWithOffset<T>::resize(const int min_index, const int max_index)
-{
-  resize(min_index, max_index, true);
-}
-
 template <class T>
 void
 VectorWithOffset<T>::resize(const unsigned new_size)
@@ -486,21 +479,11 @@ VectorWithOffset<T>::resize(const unsigned new_size)
     this->resize(0, static_cast<int>(new_size - 1));
 }
 
-// the new members will be initialised with the default constructor for T
-template <class T>
-void
-VectorWithOffset<T>::grow(const int min_index, const int max_index, bool initialise_with_0)
-{
-  // allow grow arbitrary when it's zero length
-  assert(length == 0 || (min_index <= this->get_min_index() && max_index >= this->get_max_index()));
-  this->resize(min_index, max_index, initialise_with_0);
-}
-
 template <class T>
 void
 VectorWithOffset<T>::grow(const int min_index, const int max_index)
 {
-  this->grow(min_index, max_index, true);
+  this->resize(min_index, max_index);
 }
 
 template <class T>