diff options
| author | Tomas Kulhanek <tmkulhanek@gmail.com> | 2019-02-28 15:22:10 +0000 |
|---|---|---|
| committer | Tomas Kulhanek <tmkulhanek@gmail.com> | 2019-02-28 15:22:10 +0000 |
| commit | 68e6f3397e8a450854f39a5d514e1f747b9031a4 (patch) | |
| tree | eddf7bc14a998ffabc7e9e01f0cca2ac44b1d88a | |
| parent | 364a703de9f31b35d4301f3e913f519be9d3a14f (diff) | |
| download | regularization-68e6f3397e8a450854f39a5d514e1f747b9031a4.tar.gz regularization-68e6f3397e8a450854f39a5d514e1f747b9031a4.tar.bz2 regularization-68e6f3397e8a450854f39a5d514e1f747b9031a4.tar.xz regularization-68e6f3397e8a450854f39a5d514e1f747b9031a4.zip | |
merge
| -rw-r--r-- | demos/SoftwareX_supp/Demo_RealData_Recon_SX.py (renamed from Wrappers/Python/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py) | 0 | ||||
| -rw-r--r-- | demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py (renamed from Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py) | 0 | ||||
| -rw-r--r-- | demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py (renamed from Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py) | 0 | ||||
| -rw-r--r-- | demos/SoftwareX_supp/Demo_SimulData_SX.py (renamed from Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_SX.py) | 0 | ||||
| -rw-r--r-- | demos/SoftwareX_supp/Readme.md (renamed from Wrappers/Python/demos/SoftwareX_supp/Readme.md) | 0 | ||||
| -rw-r--r-- | demos/SoftwareX_supp/optim_param/Optim_admm_rofllt.h5 (renamed from Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_rofllt.h5) | bin | 2408 -> 2408 bytes | |||
| -rw-r--r-- | demos/SoftwareX_supp/optim_param/Optim_admm_sbtv.h5 (renamed from Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_sbtv.h5) | bin | 2408 -> 2408 bytes | |||
| -rw-r--r-- | demos/SoftwareX_supp/optim_param/Optim_admm_tgv.h5 (renamed from Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_tgv.h5) | bin | 2408 -> 2408 bytes | |||
| -rw-r--r-- | recipe/meta.yaml | 2 | ||||
| -rwxr-xr-x | recipe/run_test.py | 2 | ||||
| -rw-r--r-- | test/test_CPU_regularisers.py | 1 |
11 files changed, 5 insertions, 0 deletions
diff --git a/Wrappers/Python/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py b/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py index 01491d9..01491d9 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py +++ b/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py diff --git a/Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py b/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py index 59ffc0e..59ffc0e 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py +++ b/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py diff --git a/Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py b/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py index 93b0cef..93b0cef 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py +++ b/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py diff --git a/Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_SX.py b/demos/SoftwareX_supp/Demo_SimulData_SX.py index cdf4325..cdf4325 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/Demo_SimulData_SX.py +++ b/demos/SoftwareX_supp/Demo_SimulData_SX.py diff --git a/Wrappers/Python/demos/SoftwareX_supp/Readme.md b/demos/SoftwareX_supp/Readme.md index 54e83f1..54e83f1 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/Readme.md +++ b/demos/SoftwareX_supp/Readme.md diff --git a/Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_rofllt.h5 b/demos/SoftwareX_supp/optim_param/Optim_admm_rofllt.h5 Binary files differindex 63bc4fd..63bc4fd 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_rofllt.h5 +++ b/demos/SoftwareX_supp/optim_param/Optim_admm_rofllt.h5 diff --git a/Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_sbtv.h5 b/demos/SoftwareX_supp/optim_param/Optim_admm_sbtv.h5 Binary files differindex 03c0c14..03c0c14 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_sbtv.h5 +++ b/demos/SoftwareX_supp/optim_param/Optim_admm_sbtv.h5 diff --git a/Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_tgv.h5 b/demos/SoftwareX_supp/optim_param/Optim_admm_tgv.h5 Binary files differindex 056d915..056d915 100644 --- a/Wrappers/Python/demos/SoftwareX_supp/optim_param/Optim_admm_tgv.h5 +++ b/demos/SoftwareX_supp/optim_param/Optim_admm_tgv.h5 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 527ad32..6f36906 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,6 +14,8 @@ test: requires: - pillow - pillow=4.1.1 # [win] +# command: +# - unittest -d discover .... ../test requirements: build: diff --git a/recipe/run_test.py b/recipe/run_test.py index 21f3216..f551616 100755 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -815,5 +815,7 @@ class TestRegularisers(unittest.TestCase): self.assertLess(abs(rms_fgp-rms_fgp_exp) , tolerance)
+
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/test_CPU_regularisers.py b/test/test_CPU_regularisers.py index 6af4cd4..379b989 100644 --- a/test/test_CPU_regularisers.py +++ b/test/test_CPU_regularisers.py @@ -2,6 +2,7 @@ import unittest import math import os import timeit +import numpy as np from ccpi.filters.regularisers import FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, Diff4th, ROF_TV from testroutines import * |