Skip to content

Development #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tbertus wants to merge 44 commits into
base: development
Choose a base branch
from
Open

Development #44

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0cf0263
Add .travis.yml file
rayhem Oct 27, 2018
52156fb
Update travis to build with cmake
rayhem Oct 27, 2018
5c14ee1
Get eigen package
rayhem Oct 27, 2018
0d44ffb
Remove eigen deb package; include boost dependencies
rayhem Oct 27, 2018
1357e27
Manually get and build eigen package
rayhem Oct 27, 2018
33fae63
Actually run the eigen getter script
rayhem Oct 27, 2018
d967f2a
Build Eigen with sudo
rayhem Oct 30, 2018
7d9ee0f
Fix up get eigen script
rayhem Oct 30, 2018
417f800
Mark as executable
rayhem Oct 30, 2018
a7bfe54
Get boost
rayhem Oct 30, 2018
91d6b8a
Quiet logs
rayhem Oct 30, 2018
eda915d
Debugging get boost
rayhem Nov 2, 2018
32577f8
well crap.
rayhem Nov 2, 2018
28c92a0
changes
rayhem Nov 2, 2018
75dce9f
formating
tbertus Oct 3, 2019
2cec272
Eliminated redundant calls to bloch_rhs' evaluate during corrector
tbertus May 19, 2020
6ba5f6f
the way to win on rainbow road
tbertus May 26, 2020
9961c14
listing what's in the boost directory
tbertus May 26, 2020
492cb9c
added .sh to ./bootstrap.sh in get_boost.sh
tbertus May 26, 2020
616d85e
changed make qtest to make qtest-bin and commented out anything relat…
tbertus May 26, 2020
102ceb1
trying to get rapidcheck to work. submodules are pretty cool
tbertus May 26, 2020
7cbdc23
automatic boost install
tbertus May 27, 2020
10c54d8
trying to install boost automatically
tbertus May 27, 2020
96ebe23
other changes
tbertus May 27, 2020
8ccb2f0
temporarily removed some unit tests
tbertus May 27, 2020
d331aff
temporarily removed some unit tests
tbertus May 27, 2020
42db27e
installing eigen through apt
tbertus May 27, 2020
85d3b3f
boost / eigen versions available through apt do not work well with ra…
tbertus May 27, 2020
b0af103
Merge branch 'travis' into development
tbertus May 29, 2020
9fe8f2f
added pass/fail flag to README.md
tbertus May 29, 2020
c23b752
working on badg
tbertus May 29, 2020
f8777e0
markdown troubles
tbertus May 29, 2020
7e5be99
try to get submodule to work with travis
tbertus May 29, 2020
afed5c6
initialize rapidcheck submodule
tbertus May 29, 2020
17697fb
removed first_call flag in favor of two seperate functions
tbertus Jun 1, 2020
ca8168c
reintroducing some unit tests
tbertus Jun 1, 2020
42948a6
including unit test
tbertus Jun 2, 2020
e74e86d
corrected submodule location
tbertus Jun 2, 2020
66cc336
trying to get travis CI to work
tbertus Jun 2, 2020
3bf248c
trying to get rapidcheck to work with travis on this branch
tbertus Jun 2, 2020
54c8771
removed unneeded comments
tbertus Jun 2, 2020
47bbd65
remove old code
tbertus Jun 2, 2020
6b9308a
renamed evaluate functions of rhs and interaction classes
tbertus Jun 11, 2020
4817ee2
changed past_terms_of_results to past_terms_of_convolution for pull r…
tbertus Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/integrator/RHS/bloch_rhs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ Integrator::BlochRHS::BlochRHS(
{
}

void Integrator::BlochRHS::evaluate(const int step) const
void Integrator::BlochRHS::evaluate_present(const int step) const
{
auto eval_and_sum = [step](
const InteractionBase::ResultArray &r,
const std::shared_ptr<InteractionBase> &interaction) {
return r + interaction->evaluate(step);
return r + interaction->evaluate_present_field(step);
};
auto nil = InteractionBase::ResultArray::Zero(num_solutions, 1).eval();

Expand All @@ -30,12 +30,12 @@ void Integrator::BlochRHS::evaluate(const int step) const
}
}

void Integrator::BlochRHS::first_evaluation_of_timestep(const int step) const
void Integrator::BlochRHS::evaluate(const int step) const
{
auto eval_and_sum = [step](
const InteractionBase::ResultArray &r,
const std::shared_ptr<InteractionBase> &interaction) {
return r + interaction->first_evaluation_of_timestep(step);
return r + interaction->evaluate(step);
};
auto nil = InteractionBase::ResultArray::Zero(num_solutions, 1).eval();

Expand Down
2 changes: 1 addition & 1 deletion src/integrator/RHS/bloch_rhs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class Integrator::BlochRHS : public Integrator::RHS<Eigen::Vector2cd> {
const std::shared_ptr<History<Eigen::Vector2cd>>,
std::vector<std::shared_ptr<InteractionBase>>,
std::vector<BlochFunctionType>);
void evaluate_present(const int) const override;
void evaluate(const int) const override;
void first_evaluation_of_timestep(const int) const override;

private:
int num_solutions;
Expand Down
7 changes: 2 additions & 5 deletions src/integrator/RHS/ode_rhs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class Integrator::ODE_RHS : public RHS<double> {
ODE_RHS(const double,
const std::shared_ptr<Integrator::History<double>>,
const std::vector<std::function<double(double, double)>>);
void evaluate_present(const int) const;
void evaluate(const int) const;
void first_evaluation_of_timestep(const int) const;

private:
std::vector<std::function<double(double, double)>> rhs_functions;
Expand All @@ -38,9 +38,6 @@ void Integrator::ODE_RHS::evaluate(const int n) const
}
}

void Integrator::ODE_RHS::first_evaluation_of_timestep(const int n) const
{
evaluate(n);
}
void Integrator::ODE_RHS::evaluate_present(const int n) const { evaluate(n); }

#endif
2 changes: 1 addition & 1 deletion src/integrator/RHS/rhs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class Integrator::RHS {
public:
RHS(const double dt, const std::shared_ptr<History<soltype>> history)
: dt(dt), history(std::move(history)){};
virtual void evaluate_present(const int) const = 0;
virtual void evaluate(const int) const = 0;
virtual void first_evaluation_of_timestep(const int) const = 0;

protected:
double dt;
Expand Down
4 changes: 2 additions & 2 deletions src/integrator/integrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ void Integrator::PredictorCorrector<soltype>::solve_step(const int step) const
assert(0 <= step && step < time_idx_ubound);

predictor(step);
rhs->first_evaluation_of_timestep(step);
rhs->evaluate(step);

for(int m = 0; m < num_corrector_steps; ++m) {
corrector(step);
rhs->evaluate(step);
rhs->evaluate_present(step);
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/interactions/AIM/aim_interaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,19 @@ class AIM::Interaction final : public InteractionBase {
{
}

const ResultArray &first_evaluation_of_timestep(const int t)
const ResultArray &evaluate(const int t)
{
results = (ff.first_evaluation_of_timestep(t).conjugate() -
nf.first_evaluation_of_timestep(t)) +
direct.first_evaluation_of_timestep(t);
results =
(ff.evaluate(t).conjugate() - nf.evaluate(t)) + direct.evaluate(t);
return results;
}

const ResultArray &evaluate(const int t)
const ResultArray &evaluate_present_field(const int t)
{
// I DON'T KNOW WHY THAT NEEDS A CONJUGATE!!!
results =
(ff.evaluate(t).conjugate() - nf.evaluate(t)) + direct.evaluate(t);
results = (ff.evaluate_present_field(t).conjugate() -
nf.evaluate_present_field(t)) +
direct.evaluate_present_field(t);
return results;
}

Expand Down
18 changes: 9 additions & 9 deletions src/interactions/AIM/direct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ AIM::DirectInteraction::DirectInteraction(
{
}

const InteractionBase::ResultArray &
AIM::DirectInteraction::first_evaluation_of_timestep(const int time_idx)
const InteractionBase::ResultArray &AIM::DirectInteraction::evaluate(
const int time_idx)
{
constexpr int RHO_01 = 1;

results.setZero();
past_terms_of_results.setZero();
past_terms_of_convolution.setZero();

for(int pair_idx = 0; pair_idx < shape_[0]; ++pair_idx) {
const auto &pair = (*interaction_pairs_)[pair_idx];
Expand All @@ -33,10 +33,10 @@ AIM::DirectInteraction::first_evaluation_of_timestep(const int time_idx)
std::max(time_idx - floor_delays_[pair_idx] - i,
static_cast<int>(history->array_.index_bases()[1]));

past_terms_of_results[pair.first] +=
past_terms_of_convolution[pair.first] +=
(history->array_[pair.second][s][0])[RHO_01] *
coefficients_[pair_idx][i];
past_terms_of_results[pair.second] +=
past_terms_of_convolution[pair.second] +=
(history->array_[pair.first][s][0])[RHO_01] *
coefficients_[pair_idx][i];
}
Expand All @@ -49,12 +49,12 @@ AIM::DirectInteraction::first_evaluation_of_timestep(const int time_idx)
results[pair.second] += (history->array_[pair.first][s][0])[RHO_01] *
coefficients_[pair_idx][0];
}
results += past_terms_of_results;
results += past_terms_of_convolution;
Copy link
Copy Markdown
Owner

@cglosser cglosser Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be return results + past_terms_of_convolution? If evaluate is called, and then evaluate_present_field is called, results gets multiple "presents" added to it, no?

Copy link
Copy Markdown
Collaborator Author

@tbertus tbertus Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

results is set to zero at the top of evaluate_present_field so it has the contribution of a one "present" at a time. As a matter of curiosity, because the function returns a reference, would return results + past_terms_of_convolution work?

Copy link
Copy Markdown
Owner

@cglosser cglosser Jun 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes, ok - that makes sense. There's still something I'm not seeing, though; ultimately I think evaluate is really just past_part + present_part. You've moved the logic for present_part into the other function but you don't call it here so I'm not sure what your intention is.

And you're exactly right: using return results + past; returns what's called an "rvalue" (so a reference to it is invalid). Coding it that way would require changing the function signature.

Copy link
Copy Markdown
Collaborator Author

@tbertus tbertus Jun 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure I follow. As of now, evaluate computes and stores the past and adds it to the present. evaluate_present_field zeros out results computes the updated present contribution and adds it to the past_part that was calculated by evaluate

Copy link
Copy Markdown
Owner

@cglosser cglosser Jun 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, so, in my head evaluate should always give you the full field (perhaps inefficiently) because it's the virtual function prescribed by InteractionBase. "An interaction can always be evaluated", so to speak, and you may not need the complexity of divorcing the past update from the present update (if, say, you're not using something as sophisticated as the predictor/corrector). So I think a good design here would be to implement two methods, ResultArray &AIM::DirectInteraction::evaluate_past and resultArray &AIM::DirectInteraction::evaluate_present, that each populate an internal array of known size (like results). Then you'll have something like this:

const InteractionBase::ResultArray &AIM::DirectInteraction::evaluate(const int time_idx) {
    evaluate_past(time_idx);
    evaluate_present(time_idx);
    results = past_results + present_results;
    return results;
}

and

const InteractionBase::ResultArray &AIM::DirectInteraction::evaluate_present(const int time_idx) {
    // Assumes evaluate_past has already been called for this time_idx
 
    // <Logic for present update>
    results = past_results + present_results;
    return results;
}

To do this, it may make sense to hoist evaluate_past and evaluate_present into InteractionBase as pure virtual functions. This would be the case if every Interaction that ever exists must define those functions to make sense (which is probably the case).

Copy link
Copy Markdown
Collaborator Author

@tbertus tbertus Jun 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that would be a good way to set things up. But to be clear evaluate can currently be used independent of evaluate_present_field. The functionality of evaluate now is the same as it was originally with the added side effect of storing past_results.

return results;
}

const InteractionBase::ResultArray &AIM::DirectInteraction::evaluate(
const int time_idx)
const InteractionBase::ResultArray &
AIM::DirectInteraction::evaluate_present_field(const int time_idx)
{
constexpr int RHO_01 = 1;

Expand All @@ -71,7 +71,7 @@ const InteractionBase::ResultArray &AIM::DirectInteraction::evaluate(
results[pair.second] += (history->array_[pair.first][s][0])[RHO_01] *
coefficients_[pair_idx][0];
}
results += past_terms_of_results;
results += past_terms_of_convolution;
return results;
}

Expand Down
2 changes: 1 addition & 1 deletion src/interactions/AIM/direct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AIM::DirectInteraction final : public HistoryInteraction {
std::shared_ptr<const std::vector<Grid::ipair_t>>);

const ResultArray &evaluate(const int) final;
const ResultArray &first_evaluation_of_timestep(const int) final;
const ResultArray &evaluate_present_field(const int) final;
boost::multi_array<cmplx, 2> coefficient_table(Propagation::Kernel<cmplx> &,
std::vector<int> &) const;

Expand Down
4 changes: 2 additions & 2 deletions src/interactions/AIM/farfield.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void AIM::Farfield::fill_source_table(const int step)
}
}

void AIM::Farfield::first_propagate_of_timestep(const int step)
void AIM::Farfield::propagate(const int step)
{
const auto wrapped_step = step % table_dimensions_[0];
const auto nb = 8 * grid->size();
Expand Down Expand Up @@ -107,7 +107,7 @@ void AIM::Farfield::first_propagate_of_timestep(const int step)
reinterpret_cast<fftw_complex *>(o_ptr));
}

void AIM::Farfield::propagate(const int step)
void AIM::Farfield::propagate_present_field(const int step)
{
const auto wrapped_step = step % table_dimensions_[0];
const auto nb = 8 * grid->size();
Expand Down
10 changes: 5 additions & 5 deletions src/interactions/AIM/farfield.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ class AIM::Farfield final : public AimBase {
Normalization::SpatialNorm);
~Farfield() = default;

const ResultArray &evaluate(const int step) final
const ResultArray &evaluate_present_field(const int step) final
{
fill_source_table(step);
propagate(step);
propagate_present_field(step);
fill_results_table(step);

return results;
}
const ResultArray &first_evaluation_of_timestep(const int step) final
const ResultArray &evaluate(const int step) final
{
fill_source_table(step);
first_propagate_of_timestep(step);
propagate(step);
fill_results_table(step);
return results;
}
Expand All @@ -53,7 +53,7 @@ class AIM::Farfield final : public AimBase {
spacetime::vector<cmplx> make_propagation_table() const;
void fill_source_table(const int);
void propagate(const int);
void first_propagate_of_timestep(const int);
void propagate_present_field(const int);
void fill_results_table(const int);

void fill_gmatrix_table(spacetime::vector<cmplx> &) const;
Expand Down
16 changes: 8 additions & 8 deletions src/interactions/AIM/nearfield.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ AIM::Nearfield::Nearfield(
{
}

const InteractionBase::ResultArray &
AIM::Nearfield::first_evaluation_of_timestep(const int time_idx)
const InteractionBase::ResultArray &AIM::Nearfield::evaluate(const int time_idx)
{
constexpr int RH0_01 = 1;

results.setZero();
past_terms_of_results.setZero();
past_terms_of_convolution.setZero();

for(int pair_idx = 0; pair_idx < shape_[0]; ++pair_idx) {
const auto &pair = (*interaction_pairs_)[pair_idx];
Expand All @@ -45,10 +44,10 @@ AIM::Nearfield::first_evaluation_of_timestep(const int time_idx)
const int s = std::max(
time_idx - t, static_cast<int>(history->array_.index_bases()[1]));

past_terms_of_results[pair.first] +=
past_terms_of_convolution[pair.first] +=
(history->array_[pair.second][s][0])[RHO_01] *
coefficients_[pair_idx][t][0];
past_terms_of_results[pair.second] +=
past_terms_of_convolution[pair.second] +=
(history->array_[pair.first][s][0])[RHO_01] *
coefficients_[pair_idx][t][1];
}
Expand All @@ -62,12 +61,13 @@ AIM::Nearfield::first_evaluation_of_timestep(const int time_idx)
results[pair.second] += (history->array_[pair.first][s][0])[RHO_01] *
coefficients_[pair_idx][t][1];
}
results += past_terms_of_results;
results += past_terms_of_convolution;

return results;
}

const InteractionBase::ResultArray &AIM::Nearfield::evaluate(const int time_idx)
const InteractionBase::ResultArray &AIM::Nearfield::evaluate_present_field(
const int time_idx)
{
constexpr int RH0_01 = 1;

Expand All @@ -86,7 +86,7 @@ const InteractionBase::ResultArray &AIM::Nearfield::evaluate(const int time_idx)
results[pair.second] += (history->array_[pair.first][s][0])[RHO_01] *
coefficients_[pair_idx][t][1];
}
results += past_terms_of_results;
results += past_terms_of_convolution;

return results;
}
Expand Down
2 changes: 1 addition & 1 deletion src/interactions/AIM/nearfield.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class AIM::Nearfield final : public AimBase {
~Nearfield() = default;

const ResultArray &evaluate(const int) final;
const ResultArray &first_evaluation_of_timestep(const int) final;
const ResultArray &evaluate_present_field(const int) final;

private:
struct support_range_t {
Expand Down
16 changes: 8 additions & 8 deletions src/interactions/direct_interaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ void DirectInteraction::build_coefficient_table(
}
}

const InteractionBase::ResultArray &
DirectInteraction::first_evaluation_of_timestep(const int time_idx)
const InteractionBase::ResultArray &DirectInteraction::evaluate(
const int time_idx)
{
constexpr int RHO_01 = 1;
results.setZero();
past_terms_of_results.setZero();
past_terms_of_convolution.setZero();

// iterate through all dot pairs
for(int pair_idx = 0; pair_idx < num_interactions; ++pair_idx) {
Expand All @@ -59,9 +59,9 @@ DirectInteraction::first_evaluation_of_timestep(const int time_idx)
std::max(time_idx - floor_delays[pair_idx] - i,
static_cast<int>(history->array_.index_bases()[1]));

past_terms_of_results[src] +=
past_terms_of_convolution[src] +=
(history->array_[obs][s][0])[RHO_01] * coefficients[pair_idx][i];
past_terms_of_results[obs] +=
past_terms_of_convolution[obs] +=
(history->array_[src][s][0])[RHO_01] * coefficients[pair_idx][i];
}
const int s = std::max(time_idx - floor_delays[pair_idx],
Expand All @@ -72,11 +72,11 @@ DirectInteraction::first_evaluation_of_timestep(const int time_idx)
results[obs] +=
(history->array_[src][s][0])[RHO_01] * coefficients[pair_idx][0];
}
results += past_terms_of_results;
results += past_terms_of_convolution;
return results;
}

const InteractionBase::ResultArray &DirectInteraction::evaluate(
const InteractionBase::ResultArray &DirectInteraction::evaluate_present_field(
const int time_idx)
{
constexpr int RHO_01 = 1;
Expand All @@ -95,7 +95,7 @@ const InteractionBase::ResultArray &DirectInteraction::evaluate(
results[obs] +=
(history->array_[src][s][0])[RHO_01] * coefficients[pair_idx][0];
}
results += past_terms_of_results;
results += past_terms_of_convolution;
return results;
}

Expand Down
2 changes: 1 addition & 1 deletion src/interactions/direct_interaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class DirectInteraction final : public HistoryInteraction {
const double);

const ResultArray &evaluate(const int) final;
const ResultArray &first_evaluation_of_timestep(const int) final;
const ResultArray &evaluate_present_field(const int) final;
Comment on lines 16 to +17
Copy link
Copy Markdown
Owner

@cglosser cglosser Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really really hate that, e.g., direct_interaction needs to change to accommodate a new requirement in the predictor/corrector. It indicates things are too tightly coupled together. I'm sure there's a better way to push all of this into the integrator (probably with a strategy), but I'm not sure how to do it yet.


private:
int num_interactions;
Expand Down
6 changes: 3 additions & 3 deletions src/interactions/interaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ class InteractionBase {
InteractionBase(const std::shared_ptr<const DotVector> dots, const double dt)
: dots(std::move(dots)),
results(dots ? dots->size() : 0),
past_terms_of_results(dots ? dots->size() : 0),
past_terms_of_convolution(dots ? dots->size() : 0),
dt(dt){};
// const cmplx &operator[](const int i) const { return results[i]; }
virtual const ResultArray &evaluate(const int) = 0;
virtual const ResultArray &first_evaluation_of_timestep(const int) = 0;
virtual const ResultArray &evaluate_present_field(const int) = 0;

virtual ~InteractionBase(){};

protected:
std::shared_ptr<const DotVector> dots;
ResultArray results;
ResultArray past_terms_of_results;
ResultArray past_terms_of_convolution;
double dt;
};

Expand Down
2 changes: 1 addition & 1 deletion src/interactions/pulse_interaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class PulseInteraction : public InteractionBase {
const double,
const double);
virtual const ResultArray &evaluate(const int);
virtual const ResultArray &first_evaluation_of_timestep(const int n)
virtual const ResultArray &evaluate_present_field(const int n)
{
return evaluate(n);
}
Expand Down
6 changes: 2 additions & 4 deletions test/propagator_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ BOOST_FIXTURE_TEST_CASE(DIRECT_INTERACTION, SimulationStructures)
for(int i = 0; i < num_timesteps; ++i) {
BOOST_TEST_MESSAGE(i);

const double obs_val_calculated =
direct_interaction.first_evaluation_of_timestep(i)(1).real();
const double obs_val_calculated = direct_interaction.evaluate(i)(1).real();
const double obs_val_actual = obs_fn(i * dt);
BOOST_REQUIRE_CLOSE_FRACTION(obs_val_calculated, obs_val_actual, 1e-9);
}
Expand All @@ -99,8 +98,7 @@ BOOST_FIXTURE_TEST_CASE(AIM_INTERACTION, SimulationStructures)
for(int i = 0; i < num_timesteps; ++i) {
BOOST_TEST_MESSAGE(i);

const double obs_val_calculated =
aim_interaction.first_evaluation_of_timestep(i)(1).real();
const double obs_val_calculated = aim_interaction.evaluate(i)(1).real();
const double obs_val_actual = obs_fn(i * dt);

if(i > 16) {
Expand Down