From e2dbd3fcae8514a532789e7368fd20a8fcf047c9 Mon Sep 17 00:00:00 2001 From: Rick Walsh Date: Wed, 2 Sep 2015 08:22:58 +1000 Subject: VPM-B: Add 1 percent conservatism to pass tests Subsurface appears to produce marginally less conservative plans than our benchmarks. Introduce 1% additional conservatism. Signed-off-by: Rick Walsh Signed-off-by: Dirk Hohndel --- deco.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deco.c b/deco.c index 8618a7c38..5d3b1d867 100644 --- a/deco.c +++ b/deco.c @@ -23,6 +23,10 @@ #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(); @@ -170,14 +174,14 @@ double initial_he_gradient[16]; double get_crit_radius_He() { 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; } double get_crit_radius_N2() { 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; } -- cgit v1.2.3-70-g09d2