Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ndarray qois in pce_analysis #379

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Fix ndarray qois in pce_analysis #379

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2473ab
removed 2020-resolver thus switching to default
bartoszbosak Dec 7, 2022
a24173a
returning ndarray instead of scalar value
bartoszbosak Dec 7, 2022
75c411d
fix for vector qois
bartoszbosak Dec 7, 2022
58a213f
remove plotting of 1% and 99% qois when they don't exist
bartoszbosak Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install pytest
if [ -f requirements.txt ]; then pip install --use-feature=2020-resolver -r requirements.txt; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python setup.py develop
pip install pytest-benchmark
- name: Benchmark with pytest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coveralls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest
if [ -f requirements.txt ]; then pip install --use-feature=2020-resolver -r requirements.txt; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python setup.py develop
python setup.py build_cannonsim
pip install pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
if [ -f requirements.txt ]; then pip install --use-feature=2020-resolver -r requirements.txt; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python setup.py develop
python setup.py build_cannonsim
pip install pdoc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest
if [ -f requirements.txt ]; then pip install --use-feature=2020-resolver -r requirements.txt; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python setup.py develop
python setup.py build_cannonsim
pip install pytest-cov
Expand Down
25 changes: 20 additions & 5 deletions easyvvuq/analysis/pce_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,30 @@ def _describe(self, qoi, statistic):
return np.array([v.upper[0] for _, v in enumerate(
self.raw_data['output_distributions'][qoi])])
elif statistic == '1%':
return self.raw_data['percentiles'][qoi]['p01']
if isinstance(self.raw_data['percentiles'][qoi]['p01'], np.ndarray):
return self.raw_data['percentiles'][qoi]['p01']
else:
return np.array([self.raw_data['percentiles'][qoi]['p01']])
elif statistic == '10%':
return self.raw_data['percentiles'][qoi]['p10']
if isinstance(self.raw_data['percentiles'][qoi]['p10'], np.ndarray):
return self.raw_data['percentiles'][qoi]['p10']
else:
return np.array([self.raw_data['percentiles'][qoi]['p10']])
elif statistic == '90%':
return self.raw_data['percentiles'][qoi]['p90']
if isinstance(self.raw_data['percentiles'][qoi]['p90'], np.ndarray):
return self.raw_data['percentiles'][qoi]['p90']
else:
return np.array([self.raw_data['percentiles'][qoi]['p90']])
elif statistic == '99%':
return self.raw_data['percentiles'][qoi]['p99']
if isinstance(self.raw_data['percentiles'][qoi]['p99'], np.ndarray):
return self.raw_data['percentiles'][qoi]['p99']
else:
return np.array([self.raw_data['percentiles'][qoi]['p99']])
elif statistic == 'median':
return self.raw_data['percentiles'][qoi]['p50']
if isinstance(self.raw_data['percentiles'][qoi]['p50'], np.ndarray):
return self.raw_data['percentiles'][qoi]['p50']
else:
return np.array([self.raw_data['percentiles'][qoi]['p50']])
else:
try:
return self.raw_data['statistical_moments'][qoi][statistic]
Expand Down