From fea49d2bf4779045bb80457310af8cb0cebc9301 Mon Sep 17 00:00:00 2001 From: "Roy H. Stogner" Date: Tue, 11 Apr 2017 10:48:41 -0500 Subject: [PATCH] Reference experiment where needed, not simulation This appears to be the correct fix for #533; thanks to @briadam for tracking it down. This *doesn't* appear to change our regression results, however, which is a bit worrying... --- src/gp/src/GPMSA.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gp/src/GPMSA.C b/src/gp/src/GPMSA.C index bda5383de..624c4d710 100644 --- a/src/gp/src/GPMSA.C +++ b/src/gp/src/GPMSA.C @@ -293,8 +293,8 @@ GPMSAEmulator::lnValue(const V & domainVector, // If we're in the experiment cross correlation part, need extra // foo: Sigma_delta/Sigma_v and Sigma_y if (i < this->m_numExperiments && j < this->m_numExperiments) { - typename SharedPtr::Type cross_scenario1 = (this->m_simulationScenarios)[i]; - typename SharedPtr::Type cross_scenario2 = (this->m_simulationScenarios)[j]; + typename SharedPtr::Type cross_scenario1 = (this->m_experimentScenarios)[i]; + typename SharedPtr::Type cross_scenario2 = (this->m_experimentScenarios)[j]; prodDiscrepancy = 1.0; unsigned int discrepancyCorrStrStart = dimParameter + num_svd_terms + dimParameter + dimScenario + 1 +