Merge pull request #451 from NOAA-FIMS/371-refactor-remove-set-from-d…

…ataobject-class fix: remove set()
NOAA-FIMS · Aug 22, 2023 · bf9932a · bf9932a
2 parents d7815a4 + 77416d0
commit bf9932a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/inst/extdata/TMB_tests/distributions/test_fleet_acomp_nll.hpp b/inst/extdata/TMB_tests/distributions/test_fleet_acomp_nll.hpp
@@ -67,7 +67,7 @@
         obs.resize(n);
         p_set.resize(n);
         for(int i =0; i < n; i++){
-          nll_fac.observed_agecomp_data->set(0, i, x[i]);
+          nll_fac.observed_agecomp_data->at(0, i);
           nll_fac.catch_numbers_at_age[i] = p[i];
 
           obs[i] = nll_fac.observed_agecomp_data->at(0,i);

diff --git a/inst/extdata/TMB_tests/distributions/test_fleet_index_nll.hpp b/inst/extdata/TMB_tests/distributions/test_fleet_index_nll.hpp
@@ -66,7 +66,7 @@
         Vector temp;
         temp.resize(n);
         for(int i =0; i < n; i++){
-          nll_fleet_index.observed_index_data->set(i,y[i]);
+          nll_fleet_index.observed_index_data->at(i);
           temp[i] = nll_fleet_index.observed_index_data->at(i);
           nll = nll_fleet_index.evaluate();
         }

diff --git a/inst/include/common/data_object.hpp b/inst/include/common/data_object.hpp
@@ -107,18 +107,6 @@ struct DataObject : public fims::FIMSObject<Type> {
     return data[i];
   }
 
-  /**
-   * @brief Set value of element
-   * @param i
-   * @param x
-   *
-   */
-  inline void set(size_t i, Type x) {
-    if (i >= this->data.size()) {
-      throw std::overflow_error("DataObject error: index out of bounds");
-    }
-    data[i] = x;
-  }
 
   /**
    * Retrieve element from 2d data set.
@@ -144,20 +132,6 @@ struct DataObject : public fims::FIMSObject<Type> {
     return data[i * jmax + j];
   }
 
-  /**
-   * @brief Set value of element
-   * @param i
-   * @param j
-   * @param x
-   *
-   */
-  inline void set(size_t i, size_t j, Type x) {
-    if ((i * jmax + j) >= this->data.size()) {
-      throw std::overflow_error("DataObject error: index out of bounds");
-    }
-    data[i * jmax + j] = x;
-  }
-
   /**
    * Retrieve element from 3d data set.
    * @param i 1st dimension of 3d data set
@@ -185,7 +159,7 @@ struct DataObject : public fims::FIMSObject<Type> {
   }
 
   /**
-   * Retrieve element from 3d data set.
+   * Retrieve element from 4d data set.
    * @param i 1st dimension of 4d data set
    * @param j 2nd dimension of 4d data set
    * @param k 3rd dimension of 4d data set