Skip to content

Commit e673d49

Browse files
author
Luca Geretti
committed
Fix #645 related to linking of the library when non-static Generator objects exist
1 parent 33a51f0 commit e673d49

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Legenda for the issue kind:
2727
- [#639](https://github.com/ariadne-cps/ariadne/issues/639) (C) Use a finer (3/4) refinement strategy for the step size when computing a flow step based on an accuracy threshold
2828
- [#616](https://github.com/ariadne-cps/ariadne/issues/616) (F) Fix behavior of unary symbolic expression predicates
2929
- [#620](https://github.com/ariadne-cps/ariadne/issues/620) (F) EulerBounder did not reset the bounding domain between refinements to the step size
30-
- [#631](https://github.com/ariadne-cps/ariadne/issues/631) (F) Conditional disabling of graphics in absence of both Cairo and Gnuplot was incorrect
30+
- [#631](https://github.com/ariadne-cps/ariadne/issues/631) (F) Conditional disabling of graphics in absence of both Cairo and Gnuplot was incorrect
31+
- [#645](https://github.com/ariadne-cps/ariadne/issues/645) (F) Use only static const Generator objects, addressing linking issue for the whole library
3132
- [#623](https://github.com/ariadne-cps/ariadne/issues/620) (R) Simplify IntegratorInterface with only one flow step, removing flow/flow_to and hiding flow_bounds
3233

3334
### 2.3

source/dynamics/differential_inclusion_evolver.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ struct StepSize : public Attribute<StepSizeType> { };
5353
struct NumberOfStepsBetweenSimplifications : public Attribute<Nat> { };
5454
struct NumberOfVariablesToKeep : public Attribute<Nat> { };
5555

56-
Generator<StepSize> step_size;
57-
Generator<NumberOfStepsBetweenSimplifications> number_of_steps_between_simplifications;
58-
Generator<NumberOfVariablesToKeep> number_of_variables_to_keep;
56+
static const Generator<StepSize> step_size = Generator<StepSize>();
57+
static const Generator<NumberOfStepsBetweenSimplifications> number_of_steps_between_simplifications = Generator<NumberOfStepsBetweenSimplifications>();
58+
static const Generator<NumberOfVariablesToKeep> number_of_variables_to_keep = Generator<NumberOfVariablesToKeep>();
5959

6060
using ThresholdSweeperDP = ThresholdSweeper<FloatDP>;
6161
using GradedSweeperDP = GradedSweeper<FloatDP>;

0 commit comments

Comments
 (0)