From a0ec46d6eebbab160514ed6f707c69023bbd75c9 Mon Sep 17 00:00:00 2001
From: "Egli Adrian (IT-SCI-API-PFI)" <adrian.egli@sbb.ch>
Date: Thu, 19 Sep 2019 09:10:00 +0200
Subject: [PATCH] machine epsilon -> np.isclose
---
tests/test_flatland_core_grid_grid_utils.py | 18 ++++++++----------
tests/test_flatland_envs_city_generator.py | 1 +
...test_flatland_envs_sparse_rail_generator.py | 1 +
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/test_flatland_core_grid_grid_utils.py b/tests/test_flatland_core_grid_grid_utils.py
index 35ecd247..d5982553 100644
--- a/tests/test_flatland_core_grid_grid_utils.py
+++ b/tests/test_flatland_core_grid_grid_utils.py
@@ -2,8 +2,6 @@ import numpy as np
from flatland.core.grid.grid_utils import Vec2dOperations as Vec2d
-machine_epsilon = 10.0 * np.finfo(float).eps
-
def test_vec2d_is_equal():
node_a = (1, 2)
@@ -79,8 +77,8 @@ def test_vec2d_normalize():
node_b = (1, -2)
res_1 = Vec2d.normalize(node_a)
res_2 = Vec2d.normalize(node_b)
- assert (1.0 - Vec2d.get_norm(res_1)) < machine_epsilon
- assert (1.0 - Vec2d.get_norm(res_2)) < machine_epsilon
+ assert np.isclose(1.0, Vec2d.get_norm(res_1))
+ assert np.isclose(1.0, Vec2d.get_norm(res_2))
def test_vec2d_scale():
@@ -144,9 +142,9 @@ def test_vec2d_rotate():
res_5 = (Vec2d.get_norm(Vec2d.subtract(res_5, (-2.2, 1.95))))
res_6 = (Vec2d.get_norm(Vec2d.subtract(res_6, (-0.5887495373796556, -2.880255888325765))))
- assert res_1 < machine_epsilon
- assert res_2 < machine_epsilon
- assert res_3 < machine_epsilon
- assert res_4 < machine_epsilon
- assert res_5 < machine_epsilon
- assert res_6 < machine_epsilon
+ assert np.isclose(0, res_1)
+ assert np.isclose(0, res_2)
+ assert np.isclose(0, res_3)
+ assert np.isclose(0, res_4)
+ assert np.isclose(0, res_5)
+ assert np.isclose(0, res_6)
diff --git a/tests/test_flatland_envs_city_generator.py b/tests/test_flatland_envs_city_generator.py
index a7a96e51..353bb1d4 100644
--- a/tests/test_flatland_envs_city_generator.py
+++ b/tests/test_flatland_envs_city_generator.py
@@ -26,6 +26,7 @@ def test_city_generator():
number_of_agents=10,
obs_builder_object=GlobalObsForRailEnv())
+ # approximative test (replace image comparison)
assert (np.sum(env.rail.grid) == 2718122)
s0 = 0
s1 = 0
diff --git a/tests/test_flatland_envs_sparse_rail_generator.py b/tests/test_flatland_envs_sparse_rail_generator.py
index 19c2614e..c32b3c3e 100644
--- a/tests/test_flatland_envs_sparse_rail_generator.py
+++ b/tests/test_flatland_envs_sparse_rail_generator.py
@@ -24,6 +24,7 @@ def test_sparse_rail_generator():
number_of_agents=10,
obs_builder_object=GlobalObsForRailEnv())
+ # approximative test (replace image comparison)
assert (np.sum(env.rail.grid) == 10746925)
s0 = 0
s1 = 0
--
GitLab