mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

VPM-B: Add 1 percent conservatism to pass tests

Browse source 
Subsurface appears to produce marginally less conservative plans than our
benchmarks.  Introduce 1% additional conservatism.

Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Rick Walsh 2015-09-02 08:22:58 +10:00 • committed by Dirk Hohndel
parent 40122e4233
commit e2dbd3fcae
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
deco.c
View file

@ -23,6 +23,10 @@
#define cube(x) (x * x * x) #define cube(x) (x * x * x)
// Subsurface appears to produce marginally less conservative plans than our benchmarks
// Introduce 1% additional conservatism
#define subsurface_conservatism_factor 1.01
extern bool in_planner(); extern bool in_planner();
@ -170,14 +174,14 @@ double initial_he_gradient[16];
double get_crit_radius_He() double get_crit_radius_He()
{ {
if (prefs.conservatism_level <= 4) if (prefs.conservatism_level <= 4)
return vpmb_config.crit_radius_He * conservatism_lvls[prefs.conservatism_level]; return vpmb_config.crit_radius_He * conservatism_lvls[prefs.conservatism_level] * subsurface_conservatism_factor;
return vpmb_config.crit_radius_He; return vpmb_config.crit_radius_He;
} }
double get_crit_radius_N2() double get_crit_radius_N2()
{ {
if (prefs.conservatism_level <= 4) if (prefs.conservatism_level <= 4)
return vpmb_config.crit_radius_N2 * conservatism_lvls[prefs.conservatism_level]; return vpmb_config.crit_radius_N2 * conservatism_lvls[prefs.conservatism_level] * subsurface_conservatism_factor;
return vpmb_config.crit_radius_N2; return vpmb_config.crit_radius_N2;
} }