Skip to content

Commit

Permalink
add initialization identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
FFroehlich committed May 16, 2024
1 parent e03f829 commit cdbcddf
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion include/amici/edata.h
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,15 @@ class ExpData : public SimulationParameters {
void clear_observations();

/**
* @brief Arbitrary (not necessarily unique) identifier.
* @brief Unique identifier.
*/
std::string id;

/**
* @brief Unique Identifier of the ExpData to use for initialization.
*/
std::string initialization_id;

protected:
/**
* @brief resizes observedData, observedDataStdDev, observedEvents and
Expand Down Expand Up @@ -480,6 +485,7 @@ inline bool operator==(ExpData const& lhs, ExpData const& rhs) {
return *dynamic_cast<SimulationParameters const*>(&lhs)
== *dynamic_cast<SimulationParameters const*>(&rhs)
&& lhs.id == rhs.id && lhs.nytrue_ == rhs.nytrue_
&& lhs.initialization_id == rhs.initialization_id
&& lhs.nztrue_ == rhs.nztrue_ && lhs.nmaxevent_ == rhs.nmaxevent_
&& is_equal(lhs.observed_data_, rhs.observed_data_)
&& is_equal(lhs.observed_data_std_dev_, rhs.observed_data_std_dev_)
Expand Down
7 changes: 6 additions & 1 deletion include/amici/rdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,15 @@ class ReturnData : public ModelDimensions {
Model& model, Solver const& solver, ExpData const* edata
);
/**
* @brief Arbitrary (not necessarily unique) identifier.
* @brief Unique identifier.
*/
std::string id;

/**
* @brief Unique Identifier of the ExpData to use for initialization.
*/
std::string initialization_id;

/**
* timepoints (shape `nt`)
*/
Expand Down
1 change: 1 addition & 0 deletions src/edata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ ExpData::ExpData(
}

id = rdata.id;
initialization_id = rdata.initialization_id;
}

void ExpData::setTimepoints(std::vector<realtype> const& ts) {
Expand Down

0 comments on commit cdbcddf

Please sign in to comment.