@@ -204,7 +204,7 @@ def test_pdf(self):
204204 p_sim = sim_model .pdf (x ,y )
205205 p_true = stats .norm .pdf (y , loc = 1 , scale = 2 )
206206 diff = np .sum (np .abs (p_sim - p_true ))
207- self .assertAlmostEquals (diff , 0.0 , places = 2 )
207+ self .assertAlmostEqual (diff , 0.0 , places = 2 )
208208
209209 def test_cdf (self ):
210210 sim_model = EconDensity ()
@@ -213,7 +213,7 @@ def test_cdf(self):
213213 p_sim = sim_model .cdf (x ,y )
214214 p_true = stats .norm .cdf (y , loc = 1 , scale = 2 )
215215 diff = np .sum (np .abs (p_sim - p_true ))
216- self .assertAlmostEquals (diff , 0.0 , places = 2 )
216+ self .assertAlmostEqual (diff , 0.0 , places = 2 )
217217
218218 def test_value_at_risk (self ):
219219 sim_model = EconDensity ()
@@ -252,8 +252,8 @@ def test_random_seed(self):
252252
253253 diff_x = np .sum (np .abs (X1 [:100 ] - X2 [:]))
254254 diff_y = np .sum (np .abs (Y1 [:100 ] - Y2 [:]))
255- self .assertAlmostEquals (diff_x , 0 , places = 2 )
256- self .assertAlmostEquals (diff_y , 0 , places = 2 )
255+ self .assertAlmostEqual (diff_x , 0 , places = 2 )
256+ self .assertAlmostEqual (diff_y , 0 , places = 2 )
257257
258258class TetsSkewNormal (unittest .TestCase ):
259259 def setUp (self ):
@@ -518,7 +518,9 @@ def test_covariance(self):
518518 self .assertAlmostEqual (cov_est [0 ][1 ][0 ], sigma [1 ][0 ], places = 2 )
519519
520520
521- def mean_pdf (density , x_cond , n_samples = 10 ** 6 ):
521+ _DEFAULT_MC_SAMPLES = 5 * 10 ** 6
522+
523+ def mean_pdf (density , x_cond , n_samples = _DEFAULT_MC_SAMPLES ):
522524 means = np .zeros ((x_cond .shape [0 ], density .ndim_y ))
523525 for i in range (x_cond .shape [0 ]):
524526 x = x = np .tile (x_cond [i ].reshape ((1 , x_cond [i ].shape [0 ])), (n_samples , 1 ))
@@ -527,7 +529,7 @@ def mean_pdf(density, x_cond, n_samples=10 ** 6):
527529 means [i ] = integral
528530 return means
529531
530- def covariance_pdf (density , x_cond , n_samples = 10 ** 6 ):
532+ def covariance_pdf (density , x_cond , n_samples = _DEFAULT_MC_SAMPLES ):
531533 covs = np .zeros ((x_cond .shape [0 ], density .ndim_y , density .ndim_y ))
532534 mean = density .mean_ (x_cond )
533535 for i in range (x_cond .shape [0 ]):
0 commit comments