Skip to content

Commit

Permalink
fix C++ tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrea-Havron-NOAA committed Aug 6, 2024
1 parent 98fa446 commit 1b11de2
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions tests/integration/integration_class.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ class IntegrationTest {
for (size_t i = 0; i < nfleets; i++) {
std::shared_ptr<fims_popdy::Fleet<double> > f = std::make_shared<fims_popdy::Fleet<double> >();
f->Initialize(nyears, nages);
f->observed_index_data = std::make_shared<fims_data_object::DataObject<double> >(nyears);
f->observed_agecomp_data = std::make_shared<fims_data_object::DataObject<double> >(nyears, nages);
// f->observed_index_data = std::make_shared<fims_data_object::DataObject<double> >(nyears);
// f->observed_agecomp_data = std::make_shared<fims_data_object::DataObject<double> >(nyears, nages);

std::stringstream strs;
strs << "fleet" << i + 1;
Expand Down Expand Up @@ -303,8 +303,8 @@ class IntegrationTest {
std::shared_ptr<fims_popdy::Fleet<double> > s = std::make_shared<fims_popdy::Fleet<double> >();
s->is_survey = true;
s->Initialize(nyears, nages);
s->observed_index_data = std::make_shared<fims_data_object::DataObject<double> >(nyears);
s->observed_agecomp_data = std::make_shared<fims_data_object::DataObject<double> >(nyears, nages);
// s->observed_index_data = std::make_shared<fims_data_object::DataObject<double> >(nyears);
// s->observed_agecomp_data = std::make_shared<fims_data_object::DataObject<double> >(nyears, nages);

std::stringstream strs;
strs << "survey" << i + 1;
Expand All @@ -316,7 +316,7 @@ class IntegrationTest {
if (e.GetType() == JsonValueType::Object) {
JsonObject o = e.GetObject();
fsel = o.find(strs.str().c_str());


if ((*fsel).second.GetType() == JsonValueType::Object) {

Expand Down Expand Up @@ -606,7 +606,7 @@ class IntegrationTest {
std::cout << "'A50.mat' not found.\n";
}
}

pop.maturity = mat;

it = obj.find("slope.mat");
Expand Down Expand Up @@ -665,7 +665,7 @@ class IntegrationTest {
JsonObject output;
JsonArray array;



pop.Evaluate();

Expand All @@ -683,9 +683,9 @@ class IntegrationTest {
std::cout << std::endl;
}
}

output["NumbersAtAge"] = array;

if (print_statements) {
std::cout << "\n\n"
<< std::endl;
Expand Down

0 comments on commit 1b11de2

Please sign in to comment.