From d6e21eea1e8052a088fec7ae5d52e1130fd3609e Mon Sep 17 00:00:00 2001 From: Michael BAUDIN Date: Wed, 23 Aug 2023 22:53:35 +0200 Subject: [PATCH] Fixed C++ not and and boolean operators --- .../MetaModel/FunctionalChaos/FunctionalChaosResult.cxx | 2 +- lib/test/t_FunctionalChaos_conditionalExpectation.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/Uncertainty/Algorithm/MetaModel/FunctionalChaos/FunctionalChaosResult.cxx b/lib/src/Uncertainty/Algorithm/MetaModel/FunctionalChaos/FunctionalChaosResult.cxx index 5d8f56aa547..d9f5e9a1d0c 100644 --- a/lib/src/Uncertainty/Algorithm/MetaModel/FunctionalChaos/FunctionalChaosResult.cxx +++ b/lib/src/Uncertainty/Algorithm/MetaModel/FunctionalChaos/FunctionalChaosResult.cxx @@ -357,7 +357,7 @@ FunctionalChaosResult FunctionalChaosResult::getConditionalExpectation(const Ind // See if this function has active marginal indices only bool isActive = true; for (UnsignedInteger i = 0; i < inputDimension; ++i) - if (not conditioningIndices.contains(i) and multiIndex[i] > 0) + if (!(conditioningIndices.contains(i)) && multiIndex[i] > 0) { isActive = false; break; diff --git a/lib/test/t_FunctionalChaos_conditionalExpectation.cxx b/lib/test/t_FunctionalChaos_conditionalExpectation.cxx index 4d5de747520..240db9074e9 100644 --- a/lib/test/t_FunctionalChaos_conditionalExpectation.cxx +++ b/lib/test/t_FunctionalChaos_conditionalExpectation.cxx @@ -111,7 +111,7 @@ int main(int, char *[]) Distribution distributionMarginalGivenX1(distribution.getMarginal(0)); MonteCarloExperiment experimentTestGivenX1(distributionMarginalGivenX1, errorSampleSize); Point errorGivenX1(experimentTestGivenX1.computeError(functionCEGivenX1, functionEgivenX1Exact)); - fullprint << " Error = " << errorGivenX1 << std::endl; + fullprint << " Error = " << errorGivenX1[0] << std::endl; assert(errorGivenX1[0] < atol); // Condition with respect to X2 @@ -136,7 +136,7 @@ int main(int, char *[]) Distribution distributionMarginalGivenX2(distribution.getMarginal(1)); MonteCarloExperiment experimentTestGivenX2(distributionMarginalGivenX2, errorSampleSize); Point errorGivenX2(experimentTestGivenX2.computeError(functionCEGivenX2, functionEgivenX2Exact)); - fullprint << " Error = " << errorGivenX2 << std::endl; + fullprint << " Error = " << errorGivenX2[0] << std::endl; assert(errorGivenX2[0] < atol); // Condition with respect to X3 @@ -161,7 +161,7 @@ int main(int, char *[]) Distribution distributionMarginalGivenX3(distribution.getMarginal(2)); MonteCarloExperiment experimentTestGivenX3(distributionMarginalGivenX3, errorSampleSize); Point errorGivenX3(experimentTestGivenX3.computeError(functionCEGivenX3, functionEgivenX3Exact)); - fullprint << " Error = " << errorGivenX3 << std::endl; + fullprint << " Error = " << errorGivenX3[0] << std::endl; assert(errorGivenX3[0] < atol); return ExitCode::Success;