Skip to content

Commit a090911

Browse files
committed
'add_plot'
1 parent 5768bfa commit a090911

File tree

10 files changed

+458
-22
lines changed

10 files changed

+458
-22
lines changed

UQPyL/inference/amh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class AMH(InferenceABC):
1212
# Adaptive Metropolis-Hastings
1313
# ---------------------------- #
1414

15-
name = "Adaptive Metropolis-Hastings"
15+
name = "AMH"
1616

1717
def __init__(self, nChains: int = 1, warmUp: int = 1000, maxIterTimes: int = 1000,
1818
propDist: Literal['gauss', 'uniform'] = 'gauss',

UQPyL/inference/demc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DEMC(InferenceABC):
1313
# Differential Evolution Markov Chain
1414
# ---------------------------------- #
1515

16-
name = "Differential Evolution Markov Chain"
16+
name = "DEMC"
1717

1818
def __init__(self, nChains: int = 1, warmUp: int = 1000,
1919
maxIterTimes: int = 1000,

UQPyL/inference/dream_zs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DREAM_ZS(InferenceABC):
1313
# Differential Evolution Adaptive Metropolis Z-score
1414
# ---------------------------------------- #
1515

16-
name = "Differential Evolution Adaptive Metropolis Z-score"
16+
name = "DREAM-ZS"
1717

1818
def __init__(self, nChains: int = 10, warmUp: int = 1000,
1919
ps: float = 0.1, k: int = 1, jitter: float = 0.1,

UQPyL/inference/mh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class MH(InferenceABC):
1313
# Metropolis–Hastings
1414
# ------------------- #
1515

16-
name = "Metropolis-Hastings"
16+
name = "MH"
1717

1818
def __init__(self, nChains: int = 1, warmUp: int = 1000,
1919
propDist: Literal['gauss', 'uniform'] = 'gauss',

UQPyL/inference/mh_gibbs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class MH_Gibbs(InferenceABC):
1313
# MH-Gibbs
1414
# --------- #
1515

16-
name = "MH with Gibbs"
16+
name = "MH-Gibbs"
1717

1818
def __init__(self, nChains: int = 1, warmUp: int = 1000, maxIters: int = 1000,
1919
propDist: Literal['gauss', 'uniform'] = 'gauss',

UQPyL/util/__init__.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from .poly import PolyFeature
44
from .metric import r_square, rank_score, nse, mse, sort_score
55
from .verbose import Verbose
6-
from .plot import plot_op_curve, plot_op_curve_stat, plot_op_pareto, plot_sa
6+
from .plot import plot_op_curve, plot_op_curve_stat, plot_op_pareto, plot_sa, \
7+
plot_surrogate, plot_infer_trace, plot_infer_stat, plot_infer_stat_combined
78
__all__=[
89
'Scaler',
910
'MinMaxScaler',
@@ -20,5 +21,9 @@
2021
'plot_op_curve',
2122
'plot_op_curve_stat',
2223
'plot_op_pareto',
23-
'plot_sa'
24+
'plot_sa',
25+
'plot_surrogate',
26+
'plot_infer_trace',
27+
'plot_infer_stat',
28+
'plot_infer_stat_combined',
2429
]

UQPyL/util/metric.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def mse(true_Y: np.ndarray, pre_Y: np.ndarray) -> np.ndarray:
2020
"""
2121
Mean square error
2222
"""
23-
return np.mean(np.square(true_Y-pre_Y), axis=0)
23+
return np.mean(np.square(true_Y - pre_Y), axis=0)
2424

2525
def rank_score(true_Y: np.ndarray, pre_Y: np.ndarray) -> np.ndarray:
2626
"""

0 commit comments

Comments
 (0)