diff options
| author | Sebastiano Tronto <sebastiano.tronto@gmail.com> | 2021-12-13 20:40:18 +0100 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano.tronto@gmail.com> | 2021-12-13 20:40:18 +0100 |
| commit | 1215648b1ba3c592bd9d97b871349673d1702e44 (patch) | |
| tree | 7dc73a013c76b0cb0976e98d5e07902a0045363f /src/steps.h | |
| parent | 296f35b7ed4ea3177c520f28176f44d6ad47d76d (diff) | |
| download | nissy-1215648b1ba3c592bd9d97b871349673d1702e44.tar.gz nissy-1215648b1ba3c592bd9d97b871349673d1702e44.zip | |
Faster optimal solver.
This is a pretty big one, but unfortunately performance only improved by about 5%.
I implemented one of the main ideas of nxopt, that is switching to the
inverse scramble on the fly if it gives a lower branching factor.
On the one hand it makes sense that it does not have such a huge impact, since
it only rarely happens that we do have a lower branching factor on inverse, but
on the other hand I am quite sad that the improvement is barely noticeable :-(
Maybe the problem is that I have introduced a lot of new overhead and I can improve
that in the future. Or maybe I am just overlooking something stupid.
Diffstat (limited to '')
| -rw-r--r-- | src/steps.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/steps.h b/src/steps.h index e145c64..a55a101 100644 --- a/src/steps.h +++ b/src/steps.h | |||
| @@ -7,8 +7,10 @@ | |||
| 7 | 7 | ||
| 8 | extern Step * steps[NSTEPS]; | 8 | extern Step * steps[NSTEPS]; |
| 9 | 9 | ||
| 10 | void free_localinfo(LocalInfo *li); | 10 | void copy_estimatedata(EstimateData *s, EstimateData *d); |
| 11 | LocalInfo * new_localinfo(); | 11 | void free_estimatedata(EstimateData *ed); |
| 12 | void prepare_step(Step *step, int nthreads); | 12 | void invert_estimatedata(EstimateData *ed); |
| 13 | EstimateData * new_estimatedata(); | ||
| 14 | void prepare_step(Step *step, SolveOptions *opts); | ||
| 13 | 15 | ||
| 14 | #endif | 16 | #endif |
