diff --git a/framework/Distributions.py b/framework/Distributions.py index 7729fe3910..a2732395af 100644 --- a/framework/Distributions.py +++ b/framework/Distributions.py @@ -387,9 +387,9 @@ def cdf(self,x): @ Out, retunrCdf, float, requested cdf """ if hasattr(x,'__len__'): - returnCdf = np.array([self.cdf(i) for i in x]) + returnCdf = np.array([self.cdf(utils.floatConversion(i)) for i in x]) else: - returnCdf = self._distribution.cdf(x) + returnCdf = self._distribution.cdf(utils.floatConversion(x)) return returnCdf def ppf(self,x): @@ -400,9 +400,9 @@ def ppf(self,x): """ # TODO speed this up by doing it in Crow, not in python if hasattr(x,'__len__'): - returnPpf = np.array([self.ppf(i) for i in x]) + returnPpf = np.array([self.ppf(utils.floatConversion(i)) for i in x]) else: - returnPpf = self._distribution.inverseCdf(x) + returnPpf = self._distribution.inverseCdf(utils.floatConversion(x)) return returnPpf def pdf(self,x): @@ -411,7 +411,7 @@ def pdf(self,x): @ In, x, float, value to get the pdf at @ Out, returnPdf, float, requested pdf """ - returnPdf = self._distribution.pdf(x) + returnPdf = self._distribution.pdf(utils.floatConversion(x)) return returnPdf def untruncatedCdfComplement(self, x): @@ -420,7 +420,7 @@ def untruncatedCdfComplement(self, x): @ In, x, float, value to get the untruncated cdf complement at @ Out, float, requested untruncated cdf complement """ - return self._distribution.untrCdfComplement(x) + return self._distribution.untrCdfComplement(utils.floatConversion(x)) def untruncatedHazard(self, x): """ @@ -428,7 +428,7 @@ def untruncatedHazard(self, x): @ In, x, float, value to get the untruncated Hazard at @ Out, float, requested untruncated Hazard """ - return self._distribution.untrHazard(x) + return self._distribution.untrHazard(utils.floatConversion(x)) def untruncatedMean(self): """ diff --git a/tests/framework/gold/GridTest/outGrid_dump.csv b/tests/framework/gold/GridTest/outGrid_dump.csv index 48843056c6..e9208b714d 100644 --- a/tests/framework/gold/GridTest/outGrid_dump.csv +++ b/tests/framework/gold/GridTest/outGrid_dump.csv @@ -1,19 +1,19 @@ VarGauss2,VarGauss1,VarTri1 -0.0,0.02,3.5 -0.0,0.02,4.0 -1.0,0.02,3.5 -1.0,0.02,4.0 -2.0,0.02,3.5 -2.0,0.02,4.0 -0.0,0.5,3.5 -0.0,0.5,4.0 -1.0,0.5,3.5 -1.0,0.5,4.0 -2.0,0.5,3.5 -2.0,0.5,4.0 -0.0,0.6,3.5 -0.0,0.6,4.0 -1.0,0.6,3.5 -1.0,0.6,4.0 -2.0,0.6,3.5 -2.0,0.6,4.0 +0.0,0,3.5 +0.0,0,4.0 +1.0,0,3.5 +1.0,0,4.0 +2.0,0,3.5 +2.0,0,4.0 +0.0,1,3.5 +0.0,1,4.0 +1.0,1,3.5 +1.0,1,4.0 +2.0,1,3.5 +2.0,1,4.0 +0.0,2,3.5 +0.0,2,4.0 +1.0,2,3.5 +1.0,2,4.0 +2.0,2,3.5 +2.0,2,4.0 diff --git a/tests/framework/test_Grid_Sampler.xml b/tests/framework/test_Grid_Sampler.xml index 48b021c0a6..a34dd74b00 100644 --- a/tests/framework/test_Grid_Sampler.xml +++ b/tests/framework/test_Grid_Sampler.xml @@ -19,6 +19,7 @@ Updating test cases to reflect the changes to the user input. added check for pre-existing backup files when validating Adding this test description. + Modified grid to test resolution of issue #1003 R-RE-3 @@ -54,10 +55,10 @@ - - Gauss1 - 0.02 0.5 0.6 - + + Gauss1 + 0 1 2 + Gauss2 0.5 1.0 0.0