remove a few signed/unsigned warnings

Where appropriate, test if index is actually positive or at least 1.

Author: KrisThielemans

src/buildblock/TimeFrameDefinitions.cxx

@@ -49,6 +49,9 @@ START_NAMESPACE_STIR
 double
 TimeFrameDefinitions::get_start_time(unsigned int frame_num) const
 {
+  if (frame_num < 1)
+    throw std::runtime_error("TimeFrameDefinitions::get_start_time called for frame " + std::to_string(frame_num)
+                             + ", but it should be at least 1.");
   if (frame_num > frame_times.size())
     throw std::runtime_error("TimeFrameDefinitions: asked for frame " + std::to_string(frame_num) + ", but only "
                              + std::to_string(frame_times.size()) + " frames present.");
@@ -58,6 +61,9 @@ TimeFrameDefinitions::get_start_time(unsigned int frame_num) const
 double
 TimeFrameDefinitions::get_end_time(unsigned int frame_num) const
 {
+  if (frame_num < 1)
+    throw std::runtime_error("TimeFrameDefinitions::get_end_time called for frame " + std::to_string(frame_num)
+                             + ", but it should be at least 1.");
   if (frame_num > frame_times.size())
     throw std::runtime_error("TimeFrameDefinitions: asked for frame " + std::to_string(frame_num) + ", but only "
                              + std::to_string(frame_times.size()) + " frames present.");
@@ -253,8 +259,11 @@ TimeFrameDefinitions::TimeFrameDefinitions(const TimeFrameDefinitions& org_frame
 }
 
 void
-TimeFrameDefinitions::set_time_frame(const int frame_num, const double start, const double end)
+TimeFrameDefinitions::set_time_frame(const unsigned int frame_num, const double start, const double end)
 {
+  if (frame_num < 1)
+    throw std::runtime_error("TimeFrameDefinitions::set_time_frame called for frame " + std::to_string(frame_num)
+                             + ", but it should be at least 1.");
   if (frame_num > frame_times.size())
     throw std::runtime_error("TimeFrameDefinitions::set_time_frame called for frame " + std::to_string(frame_num) + ", but only "
                              + std::to_string(frame_times.size()) + " frames present.");
@@ -265,7 +274,7 @@ TimeFrameDefinitions::set_time_frame(const int frame_num, const double start, co
 bool
 TimeFrameDefinitions::operator==(const TimeFrameDefinitions& t) const
 {
-  for (int frame = 0; frame < frame_times.size(); frame++)
+  for (int frame = 0; static_cast<unsigned>(frame) < frame_times.size(); frame++)
     {
 
       const bool is_identical = (std::abs(frame_times.at(frame).first - t.frame_times.at(frame).first) <= 10e-5)

src/data_buildblock/SinglesRatesFromGEHDF5.cxx

@@ -62,7 +62,7 @@ SinglesRatesFromGEHDF5::read_from_file(const std::string& rdf_filename)
   // GE uses unsigned int, while SinglesRateForTimeSlices uses int, so we need a copy
   Array<2, unsigned int> GE_singles(IndexRange2D(0, _num_time_slices - 1, 0, total_singles_units - 1));
 
-  while (slice < _num_time_slices)
+  while (slice < static_cast<unsigned>(_num_time_slices))
     {
       m_input_sptr->read_singles(GE_singles[slice], slice + 1);
       ++slice;
@@ -73,7 +73,7 @@ SinglesRatesFromGEHDF5::read_from_file(const std::string& rdf_filename)
   std::copy(GE_singles.begin_all(), GE_singles.end_all(), _singles.begin_all());
 
   // PW Modify this bit of code too.
-  if (slice != _num_time_slices)
+  if (slice != static_cast<unsigned>(_num_time_slices))
     {
       error("\nSinglesRatesFromGEHDF5: Couldn't read all records in the file. Read %d of %d. Exiting\n", slice, _num_time_slices);
       // TODO resize singles to return array with new sizes
@@ -83,7 +83,7 @@ SinglesRatesFromGEHDF5::read_from_file(const std::string& rdf_filename)
     {
       // GE RDF9 listmode stores singles every second
       _singles_time_interval = 1.0;
-      for (unsigned int slice = 0; slice < _num_time_slices; ++slice)
+      for (unsigned int slice = 0; slice < static_cast<unsigned>(_num_time_slices); ++slice)
         _times[slice] = slice + _singles_time_interval; // note that this has to store the "end-time" of the slice
 
       assert(_times.size() != 0);

src/include/stir/TimeFrameDefinitions.h

@@ -98,7 +98,7 @@ class TimeFrameDefinitions
   void set_num_time_frames(int num_time_frames) { frame_times.resize(num_time_frames); }
 
   //! Set time frame
-  void set_time_frame(const int frame_num, const double start, const double end);
+  void set_time_frame(const unsigned int frame_num, const double start, const double end);
 
   bool operator==(const TimeFrameDefinitions& t) const;
 

src/include/stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.inl

@@ -687,7 +687,7 @@ DataSymmetriesForBins_PET_CartesianGrid::num_related_view_segment_numbers(const
 int
 DataSymmetriesForBins_PET_CartesianGrid::num_related_bins(const Bin& b) const
 {
-  int num;
+  int num = 0;
   // cylindrical implementaion
   if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry() == "Cylindrical")
     {

src/iterative/KOSMAPOSL/KOSMAPOSLReconstruction.cxx

@@ -418,7 +418,9 @@ void
 KOSMAPOSLReconstruction<TargetT>::set_anatomical_prior_sptr(shared_ptr<TargetT> arg, int index)
 {
   this->_already_set_up = false;
-  if (index < this->anatomical_prior_sptrs.size())
+  if (index < 0)
+    error("KOSMAPOSLReconstruction::set_anatomical_prior_sptr called with negative index");
+  if (static_cast<unsigned>(index) < this->anatomical_prior_sptrs.size())
     this->anatomical_prior_sptrs.at(index) = arg;
   else
     this->anatomical_prior_sptrs.push_back(arg);
@@ -438,6 +440,8 @@ void
 KOSMAPOSLReconstruction<TargetT>::set_anatomical_image_filename(const std::string& arg, const int index)
 {
   this->_already_set_up = false;
+  if (index < 0)
+    error("KOSMAPOSLReconstruction::set_anatomical_image_filename called with negative index");
   if (static_cast<unsigned>(index) < this->anatomical_image_filenames.size())
     this->anatomical_image_filenames.at(index) = arg;
   else

src/test/IO/test_IO_DynamicDiscretisedDensity.cxx

@@ -123,7 +123,7 @@ IOTests_DynamicDiscretisedDensity::check_result()
   std::cerr << "\tChecking the exam info...\n";
   check_exam_info(_image_to_write_sptr->get_exam_info(), _image_to_read_sptr->get_exam_info());
 
-  for (int i = 1; i <= _image_to_read_sptr->get_densities().size(); ++i)
+  for (int i = 1; static_cast<unsigned>(i) <= _image_to_read_sptr->get_densities().size(); ++i)
     {
 
       std::cerr << "\t\tChecking dynamic image " << i << "...\n";

src/test/IO/test_IO_ParametricDiscretisedDensity.cxx

@@ -132,7 +132,7 @@ IOTests_ParametricDiscretisedDensity::check_result()
   std::cerr << "\tChecking the exam info...\n";
   check_exam_info(_image_to_write_sptr->get_exam_info(), _image_to_read_sptr->get_exam_info());
 
-  for (int i = 1; i <= _image_to_read_sptr->get_num_params(); ++i)
+  for (int i = 1; static_cast<unsigned>(i) <= _image_to_read_sptr->get_num_params(); ++i)
     {
 
       std::cerr << "\t\tChecking kinetic parameter " << i << "...\n";

src/utilities/GE/print_GE_singles_values.cxx

@@ -69,7 +69,7 @@ main(int argc, char** argv)
   Array<3, float> singles_arr(IndexRange3D(
       time_def.get_num_time_frames(), scanner.get_num_axial_singles_units(), scanner.get_num_transaxial_singles_units()));
 
-  for (int time_frame_num = 1; time_frame_num <= time_def.get_num_time_frames(); ++time_frame_num)
+  for (int time_frame_num = 1; static_cast<unsigned>(time_frame_num) <= time_def.get_num_time_frames(); ++time_frame_num)
     {
       for (int ax = 0; ax < scanner.get_num_axial_singles_units(); ++ax)
         {

src/utilities/separate_true_from_random_scatter_for_necr.cxx

@@ -262,7 +262,7 @@ main(int argc, char* argv[])
       float random_and_scatter = random_and_scatter_inside_14mm + random_and_scatter_outside_14mm;
 
       float total_event_number = 0;
-      for (int idx = 0; idx < squeezed_sino_all.size(); ++idx)
+      for (int idx = 0; static_cast<unsigned>(idx) < squeezed_sino_all.size(); ++idx)
         {
           total_event_number += squeezed_sino_all[idx];
         }