diff --git a/.gitignore b/.gitignore index c12ed68..dcd344d 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,5 @@ ENV/ # macOS temporary files .DS_Store +*.png +*.pdf diff --git a/comet_maths/__init__.py b/comet_maths/__init__.py index d7b0889..f7d655a 100644 --- a/comet_maths/__init__.py +++ b/comet_maths/__init__.py @@ -1,4 +1,5 @@ """comet_maths - Mathematical algorithms and tools to use within CoMet toolkit.""" + from comet_maths.generate_sample.generate_sample import ( generate_sample, generate_error_sample, diff --git a/comet_maths/_version.py b/comet_maths/_version.py index 9e604c0..e13bd59 100644 --- a/comet_maths/_version.py +++ b/comet_maths/_version.py @@ -1 +1 @@ -__version__ = "1.0.7" +__version__ = "1.0.8" diff --git a/comet_maths/generate_sample/generate_sample.py b/comet_maths/generate_sample/generate_sample.py index 92b1b21..283cd04 100644 --- a/comet_maths/generate_sample/generate_sample.py +++ b/comet_maths/generate_sample/generate_sample.py @@ -1,4 +1,5 @@ """describe class""" + import copy import warnings @@ -512,21 +513,39 @@ def generate_sample_correlated( if len(corr_x[i]) == len(u_x[i].ravel()): # cov_x = cm.convert_corr_to_cov(corr_x[i], u_x[i]) MC_data = generate_sample_corr( - MCsteps, x[i], u_x[i], corr_x[i], dtype=dtype + MCsteps, + x[i], + u_x[i], + corr_x[i], + dtype=dtype, + pdf_shape=pdf_shape, + pdf_params=pdf_params, ) elif len(corr_x[i]) == len(u_x[i]): MC_data = np.zeros((MCsteps,) + (u_x[i].shape)) for j in range(len(u_x[i][0])): # cov_x = cm.convert_corr_to_cov(corr_x[i], u_x[i][:, j]) MC_data[:, :, j] = generate_sample_corr( - MCsteps, x[i][:, j], u_x[i][:, j], corr_x[i], dtype=dtype + MCsteps, + x[i][:, j], + u_x[i][:, j], + corr_x[i], + dtype=dtype, + pdf_shape=pdf_shape, + pdf_params=pdf_params, ) elif u_x[i].ndim > 1 and len(corr_x[i]) == len(u_x[i][0]): MC_data = np.zeros((MCsteps,) + (u_x[i].shape)) for j in range(len(u_x[i][:, 0])): # cov_x = cm.convert_corr_to_cov(corr_x[i], u_x[i][j]) MC_data[:, j, :] = generate_sample_corr( - MCsteps, x[i][j], u_x[i][j], corr_x[i], dtype=dtype + MCsteps, + x[i][j], + u_x[i][j], + corr_x[i], + dtype=dtype, + pdf_shape=pdf_shape, + pdf_params=pdf_params, ) else: raise NotImplementedError( diff --git a/comet_maths/generate_sample/probability_density_function.py b/comet_maths/generate_sample/probability_density_function.py index 6b8005d..66c6e75 100644 --- a/comet_maths/generate_sample/probability_density_function.py +++ b/comet_maths/generate_sample/probability_density_function.py @@ -1,4 +1,5 @@ """describe class""" + import warnings """___Built-In Modules___""" diff --git a/comet_maths/interpolation/interpolation.py b/comet_maths/interpolation/interpolation.py index 4f94b32..a227f21 100644 --- a/comet_maths/interpolation/interpolation.py +++ b/comet_maths/interpolation/interpolation.py @@ -1,4 +1,4 @@ -""" Module for interpolation of data and enables propagation of uncertainties through the interpolation.""" +"""Module for interpolation of data and enables propagation of uncertainties through the interpolation.""" from typing import Union, Optional, List, Tuple