diff --git a/README.md b/README.md index 3ae207a..05cd122 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,3 @@ El sistema actualmente se encuentra migrado a Python3 por lo que no se recomiend ./script_install_py2.sh ``` - diff --git a/tests/performance/generation/time.py b/tests/performance/generation/time.py index 9721e32..19eb542 100644 --- a/tests/performance/generation/time.py +++ b/tests/performance/generation/time.py @@ -37,7 +37,7 @@ def generate(N): return k, duration N=int(sys.argv[1]) -SAMPLE_SIZE=1000 +SAMPLE_SIZE=100 def time_measurement(n, sample_size): sample = [] diff --git a/tests/stages/generation/test.py b/tests/stages/generation/test.py index 732fdf1..357f542 100644 --- a/tests/stages/generation/test.py +++ b/tests/stages/generation/test.py @@ -37,9 +37,8 @@ def generate(N): def test(N): k, duration = generate(N) k_correct = np.load(f"out_{N}.npy") - comparison = k == k_correct print(f"Generation with N = {N} time = {duration}s") - return comparison.all() + return np.allclose(k, k_correct, rtol=1e-10, atol=1e-10) class TestGeneration(unittest.TestCase): def test_08(self): diff --git a/tools/generation/fftma_gen.py b/tools/generation/fftma_gen.py index 2e5d288..752fec1 100755 --- a/tools/generation/fftma_gen.py +++ b/tools/generation/fftma_gen.py @@ -207,8 +207,7 @@ def genGaussK( 0, ) # coord des vecteurs de base (1 0 0) y (0 1 0) k = gen( - Nx, Ny, Nz, dx, dy, dz, seed, [v1], 0, 1, 0, 8 #TODO: change this harcoded value - ) # 0, 1, 0 = mean, variance, typ #Generation of a correlated standard dsitribution N(0,1) + Nx, Ny, Nz, dx, dy, dz, seed, [v1], 0, 1, 0) # 0, 1, 0 = mean, variance, typ #Generation of a correlated standard dsitribution N(0,1) return k