Skip to content

Commit e32d65c

Browse files
FFroehlichdweindl
andauthored
Rename edata data members (AMICI-dev#3079)
* rename edata members * fixup * fixup * fixup doc * rename measurement error to noise scale * fixup plotting * fixup plural * fixup + update doc * Update src/model.cpp --------- Co-authored-by: Daniel Weindl <dweindl@users.noreply.github.com>
1 parent 08b00ad commit e32d65c

File tree

22 files changed

+418
-434
lines changed

22 files changed

+418
-434
lines changed

doc/examples/example_steady_states/ExampleEquilibrationLogic.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@
470470
"source": [
471471
"# create edata, with 3 timepoints and 2 observables:\n",
472472
"edata = ExpData(2, 0, 0, np.array([0.0, 0.1, 1.0]))\n",
473-
"edata.set_observed_data([1.8] * 6)\n",
473+
"edata.set_measurements([1.8] * 6)\n",
474474
"edata.fixed_parameters = np.array([3.0, 5.0])\n",
475475
"# set parameters for pre-equilibration\n",
476476
"edata.fixed_parameters_pre_equilibration = np.array([0.0, 2.0])\n",
@@ -765,7 +765,7 @@
765765
"# by setting an infinity timepoint\n",
766766
"# and creatíng an edata object, which is needed for adjoint computation\n",
767767
"edata = ExpData(2, 0, 0, np.array([float(\"inf\")]))\n",
768-
"edata.set_observed_data([1.8] * 2)\n",
768+
"edata.set_measurements([1.8] * 2)\n",
769769
"edata.fixed_parameters = np.array([3.0, 5.0])\n",
770770
"\n",
771771
"model_reduced.set_steady_state_sensitivity_mode(\n",
@@ -853,7 +853,7 @@
853853
"# No post-equilibration this time.\n",
854854
"# create edata, with 3 timepoints and 2 observables:\n",
855855
"edata = ExpData(2, 0, 0, np.array([0.0, 0.1, 1.0]))\n",
856-
"edata.set_observed_data([1.8] * 6)\n",
856+
"edata.set_measurements([1.8] * 6)\n",
857857
"edata.fixed_parameters = np.array([3.0, 5.0])\n",
858858
"# set parameters for pre-equilibration\n",
859859
"edata.fixed_parameters_pre_equilibration = np.array([0.0, 2.0])\n",

doc/examples/getting_started_extended/GettingStartedExtended.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@
11351135
"edata.fixed_parameters = model.get_fixed_parameters()\n",
11361136
"# set sigma to 1.0 except for observable 5, so that p[7] is used instead\n",
11371137
"# (if we have sigma parameterized, the corresponding ExpData entries must NaN, otherwise they will override the parameter)\n",
1138-
"edata.set_observed_data_std_dev(\n",
1138+
"edata.set_noise_scales(\n",
11391139
" rdata[\"t\"] * 0 + np.nan,\n",
11401140
" list(model.get_observable_ids()).index(\"observable_x1withsigma\"),\n",
11411141
")\n",

0 commit comments

Comments
 (0)