Skip to content

Commit 9379434

Browse files
henrikjacobsenfyshenrikjacobsenfys
committed
replaced np.Inf with np.inf
1 parent e95fd47 commit 9379434

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

‎tests/unit_tests/Objects/new_variable/test_parameter.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def test_as_data_dict(self, clear, parameter: Parameter):
337337

338338
@pytest.mark.parametrize("test, expected, expected_reverse", [
339339
(Parameter("test", 2, "m", 0.01, -10, 20), Parameter("name + test", 3, "m", 0.02, -10, 30), Parameter("test + name", 3, "m", 0.02, -10, 30)),
340-
(Parameter("test", 2, "m", 0.01), Parameter("name + test", 3, "m", 0.02, min=-np.Inf, max=np.Inf),Parameter("test + name", 3, "m", 0.02, min=-np.Inf, max=np.Inf)),
340+
(Parameter("test", 2, "m", 0.01), Parameter("name + test", 3, "m", 0.02, min=-np.inf, max=np.inf),Parameter("test + name", 3, "m", 0.02, min=-np.inf, max=np.inf)),
341341
(Parameter("test", 2, "cm", 0.01, -10, 10), Parameter("name + test", 1.02, "m", 0.010001, -0.1, 10.1), Parameter("test + name", 102, "cm", 100.01, -10, 1010))],
342342
ids=["regular", "no_bounds", "unit_conversion"])
343343
def test_addition_with_parameter(self, parameter : Parameter, test : Parameter, expected : Parameter, expected_reverse : Parameter):
@@ -427,7 +427,7 @@ def test_addition_exception(self, parameter : Parameter, test):
427427

428428
@pytest.mark.parametrize("test, expected, expected_reverse", [
429429
(Parameter("test", 2, "m", 0.01, -20, 20), Parameter("name - test", -1, "m", 0.02, -20, 30), Parameter("test - name", 1, "m", 0.02, -30, 20)),
430-
(Parameter("test", 2, "m", 0.01), Parameter("name - test", -1, "m", 0.02, min=-np.Inf, max=np.Inf),Parameter("test - name", 1, "m", 0.02, min=-np.Inf, max=np.Inf)),
430+
(Parameter("test", 2, "m", 0.01), Parameter("name - test", -1, "m", 0.02, min=-np.inf, max=np.inf),Parameter("test - name", 1, "m", 0.02, min=-np.inf, max=np.inf)),
431431
(Parameter("test", 2, "cm", 0.01, -10, 10), Parameter("name - test", 0.98, "m", 0.010001, -0.1, 10.1), Parameter("test - name", -98, "cm", 100.01, -1010, 10))],
432432
ids=["regular", "no_bounds", "unit_conversion"])
433433
def test_subtraction_with_parameter(self, parameter : Parameter, test : Parameter, expected : Parameter, expected_reverse : Parameter):
@@ -457,8 +457,8 @@ def test_subtraction_with_parameter(self, parameter : Parameter, test : Paramete
457457

458458
def test_subtraction_with_parameter_nan_cases(self):
459459
# When
460-
parameter = Parameter(name="name", value=1, variance=0.01, min=-np.Inf, max=np.Inf)
461-
test = Parameter(name="test", value=2, variance=0.01, min=-np.Inf, max=np.Inf)
460+
parameter = Parameter(name="name", value=1, variance=0.01, min=-np.inf, max=np.inf)
461+
test = Parameter(name="test", value=2, variance=0.01, min=-np.inf, max=np.inf)
462462

463463
# Then
464464
result = parameter - test
@@ -469,15 +469,15 @@ def test_subtraction_with_parameter_nan_cases(self):
469469
assert result.value == -1.0
470470
assert result.unit == "dimensionless"
471471
assert result.variance == 0.02
472-
assert result.min == -np.Inf
473-
assert result.max == np.Inf
472+
assert result.min == -np.inf
473+
assert result.max == np.inf
474474

475475
assert result_reverse.name == result_reverse.unique_name
476476
assert result_reverse.value == 1.0
477477
assert result_reverse.unit == "dimensionless"
478478
assert result_reverse.variance == 0.02
479-
assert result_reverse.min == -np.Inf
480-
assert result_reverse.max == np.Inf
479+
assert result_reverse.min == -np.inf
480+
assert result_reverse.max == np.inf
481481

482482
def test_subtraction_with_scalar(self):
483483
# When
@@ -541,7 +541,7 @@ def test_subtraction_exception(self, parameter : Parameter, test):
541541

542542
@pytest.mark.parametrize("test, expected, expected_reverse", [
543543
(Parameter("test", 2, "m", 0.01, -10, 20), Parameter("name * test", 2, "m^2", 0.05, -100, 200), Parameter("test * name", 2, "m^2", 0.05, -100, 200)),
544-
(Parameter("test", 2, "m", 0.01), Parameter("name * test", 2, "m^2", 0.05, min=-np.Inf, max=np.Inf), Parameter("test * name", 2, "m^2", 0.05, min=-np.Inf, max=np.Inf)),
544+
(Parameter("test", 2, "m", 0.01), Parameter("name * test", 2, "m^2", 0.05, min=-np.inf, max=np.inf), Parameter("test * name", 2, "m^2", 0.05, min=-np.inf, max=np.inf)),
545545
(Parameter("test", 2, "dm", 0.01, -10, 20), Parameter("name * test", 0.2, "m^2", 0.0005, -10, 20), Parameter("test * name", 0.2, "m^2", 0.0005, -10, 20))],
546546
ids=["regular", "no_bounds", "base_unit_conversion"])
547547
def test_multiplication_with_parameter(self, parameter : Parameter, test : Parameter, expected : Parameter, expected_reverse : Parameter):
@@ -568,12 +568,12 @@ def test_multiplication_with_parameter(self, parameter : Parameter, test : Param
568568
assert result_reverse.max == expected_reverse.max
569569

570570
@pytest.mark.parametrize("test, expected, expected_reverse", [
571-
(Parameter("test", 0, "", 0.01, -10, 0), Parameter("name * test", 0.0, "dimensionless", 0.01, -np.Inf, 0), Parameter("test * name", 0, "dimensionless", 0.01, -np.Inf, 0)),
572-
(Parameter("test", 0, "", 0.01, 0, 10), Parameter("name * test", 0.0, "dimensionless", 0.01, 0, np.Inf), Parameter("test * name", 0, "dimensionless", 0.01, 0, np.Inf))],
571+
(Parameter("test", 0, "", 0.01, -10, 0), Parameter("name * test", 0.0, "dimensionless", 0.01, -np.inf, 0), Parameter("test * name", 0, "dimensionless", 0.01, -np.inf, 0)),
572+
(Parameter("test", 0, "", 0.01, 0, 10), Parameter("name * test", 0.0, "dimensionless", 0.01, 0, np.inf), Parameter("test * name", 0, "dimensionless", 0.01, 0, np.inf))],
573573
ids=["zero_min", "zero_max"])
574574
def test_multiplication_with_parameter_nan_cases(self, test, expected, expected_reverse):
575575
# When
576-
parameter = Parameter(name="name", value=1, variance=0.01, min=1, max=np.Inf)
576+
parameter = Parameter(name="name", value=1, variance=0.01, min=1, max=np.inf)
577577

578578
# Then
579579
result = parameter * test
@@ -656,9 +656,9 @@ def test_multiplication_with_scalar(self, parameter : Parameter, test, expected,
656656
assert result_reverse.max == expected_reverse.max
657657

658658
@pytest.mark.parametrize("test, expected, expected_reverse", [
659-
(Parameter("test", 2, "s", 0.01, -10, 20), Parameter("name / test", 0.5, "m/s", 0.003125, -np.Inf, np.Inf), Parameter("test / name", 2, "s/m", 0.05, -np.Inf, np.Inf)),
660-
(Parameter("test", 2, "s", 0.01, 0, 20), Parameter("name / test", 0.5, "m/s", 0.003125, 0.0, np.Inf), Parameter("test / name", 2, "s/m", 0.05, 0.0, np.Inf)),
661-
(Parameter("test", -2, "s", 0.01, -10, 0), Parameter("name / test", -0.5, "m/s", 0.003125, -np.Inf, 0.0), Parameter("test / name", -2, "s/m", 0.05, -np.Inf, 0.0))],
659+
(Parameter("test", 2, "s", 0.01, -10, 20), Parameter("name / test", 0.5, "m/s", 0.003125, -np.inf, np.inf), Parameter("test / name", 2, "s/m", 0.05, -np.inf, np.inf)),
660+
(Parameter("test", 2, "s", 0.01, 0, 20), Parameter("name / test", 0.5, "m/s", 0.003125, 0.0, np.inf), Parameter("test / name", 2, "s/m", 0.05, 0.0, np.inf)),
661+
(Parameter("test", -2, "s", 0.01, -10, 0), Parameter("name / test", -0.5, "m/s", 0.003125, -np.inf, 0.0), Parameter("test / name", -2, "s/m", 0.05, -np.inf, 0.0))],
662662
ids=["crossing_zero", "only_positive", "only_negative"])
663663
def test_division_with_parameter(self, parameter : Parameter, test, expected, expected_reverse):
664664
# When
@@ -686,8 +686,8 @@ def test_division_with_parameter(self, parameter : Parameter, test, expected, ex
686686
assert result_reverse.max == expected_reverse.max
687687

688688
@pytest.mark.parametrize("first, second, expected", [
689-
(Parameter("name", 1, "m", 0.01, -10, 20), Parameter("test", -2, "s", 0.01, -10, 0), Parameter("name / test", -0.5, "m/s", 0.003125, -np.Inf, np.Inf)),
690-
(Parameter("name", -10, "m", 0.01, -20, -10), Parameter("test", -2, "s", 0.01, -10, 0), Parameter("name / test", 5.0, "m/s", 0.065, 1, np.Inf)),
689+
(Parameter("name", 1, "m", 0.01, -10, 20), Parameter("test", -2, "s", 0.01, -10, 0), Parameter("name / test", -0.5, "m/s", 0.003125, -np.inf, np.inf)),
690+
(Parameter("name", -10, "m", 0.01, -20, -10), Parameter("test", -2, "s", 0.01, -10, 0), Parameter("name / test", 5.0, "m/s", 0.065, 1, np.inf)),
691691
(Parameter("name", 10, "m", 0.01, 10, 20), Parameter("test", -20, "s", 0.01, -20, -10), Parameter("name / test", -0.5, "m/s", 3.125e-5, -2, -0.5))],
692692
ids=["first_crossing_zero_second_negative_0", "both_negative_second_negative_0", "finite_limits"])
693693
def test_division_with_parameter_remaining_cases(self, first, second, expected):
@@ -703,8 +703,8 @@ def test_division_with_parameter_remaining_cases(self, first, second, expected):
703703
assert result.max == expected.max
704704

705705
@pytest.mark.parametrize("test, expected, expected_reverse", [
706-
(DescriptorNumber(name="test", value=2, variance=0.1, unit="s"), Parameter("name / test", 0.5, "m/s", 0.00875, 0, 5), Parameter("test / name", 2, "s/m", 0.14, 0.2, np.Inf)),
707-
(2, Parameter("name / 2", 0.5, "m", 0.0025, 0, 5), Parameter("2 / name", 2, "m**-1", 0.04, 0.2, np.Inf))],
706+
(DescriptorNumber(name="test", value=2, variance=0.1, unit="s"), Parameter("name / test", 0.5, "m/s", 0.00875, 0, 5), Parameter("test / name", 2, "s/m", 0.14, 0.2, np.inf)),
707+
(2, Parameter("name / 2", 0.5, "m", 0.0025, 0, 5), Parameter("2 / name", 2, "m**-1", 0.04, 0.2, np.inf))],
708708
ids=["descriptor_number", "number"])
709709
def test_division_with_descriptor_number_and_number(self, parameter : Parameter, test, expected, expected_reverse):
710710
# When
@@ -750,10 +750,10 @@ def test_zero_value_divided_by_parameter(self, parameter : Parameter, test, expe
750750
assert result.variance == expected.variance
751751

752752
@pytest.mark.parametrize("first, second, expected", [
753-
(DescriptorNumber("name", 1, "m", 0.01), Parameter("test", 2, "s", 0.1, -10, 10), Parameter("name / test", 0.5, "m/s", 0.00875, -np.Inf, np.Inf)),
754-
(DescriptorNumber("name", -1, "m", 0.01), Parameter("test", 2, "s", 0.1, 0, 10), Parameter("name / test", -0.5, "m/s", 0.00875, -np.Inf, -0.1)),
755-
(DescriptorNumber("name", 1, "m", 0.01), Parameter("test", -2, "s", 0.1, -10, 0), Parameter("name / test", -0.5, "m/s", 0.00875, -np.Inf, -0.1)),
756-
(DescriptorNumber("name", -1, "m", 0.01), Parameter("test", -2, "s", 0.1, -10, 0), Parameter("name / test", 0.5, "m/s", 0.00875, 0.1, np.Inf)),
753+
(DescriptorNumber("name", 1, "m", 0.01), Parameter("test", 2, "s", 0.1, -10, 10), Parameter("name / test", 0.5, "m/s", 0.00875, -np.inf, np.inf)),
754+
(DescriptorNumber("name", -1, "m", 0.01), Parameter("test", 2, "s", 0.1, 0, 10), Parameter("name / test", -0.5, "m/s", 0.00875, -np.inf, -0.1)),
755+
(DescriptorNumber("name", 1, "m", 0.01), Parameter("test", -2, "s", 0.1, -10, 0), Parameter("name / test", -0.5, "m/s", 0.00875, -np.inf, -0.1)),
756+
(DescriptorNumber("name", -1, "m", 0.01), Parameter("test", -2, "s", 0.1, -10, 0), Parameter("name / test", 0.5, "m/s", 0.00875, 0.1, np.inf)),
757757
(DescriptorNumber("name", 1, "m", 0.01), Parameter("test", 2, "s", 0.1, 1, 10), Parameter("name / test", 0.5, "m/s", 0.00875, 0.1, 1))],
758758
ids=["crossing_zero", "positive_0_with_negative", "negative_0_with_positive", "negative_0_with_negative", "finite_limits"])
759759
def test_division_with_descriptor_number_missing_cases(self, first, second, expected):
@@ -789,8 +789,8 @@ def test_divide_by_zero_value_parameter(self):
789789
@pytest.mark.parametrize("test, expected", [
790790
(3, Parameter("name ** 3", 125, "m^3", 281.25, -125, 1000)),
791791
(2, Parameter("name ** 2", 25, "m^2", 5.0, 0, 100)),
792-
(-1, Parameter("name ** -1", 0.2, "1/m", 8e-5, -np.Inf, np.Inf)),
793-
(-2, Parameter("name ** -2", 0.04, "1/m^2", 1.28e-5, 0, np.Inf)),
792+
(-1, Parameter("name ** -1", 0.2, "1/m", 8e-5, -np.inf, np.inf)),
793+
(-2, Parameter("name ** -2", 0.04, "1/m^2", 1.28e-5, 0, np.inf)),
794794
(0, DescriptorNumber("name ** 0", 1, "dimensionless", 0)),
795795
(DescriptorNumber("test", 2), Parameter("name ** test", 25, "m^2", 5.0, 0, 100))],
796796
ids=["power_3", "power_2", "power_-1", "power_-2", "power_0", "power_descriptor_number"])
@@ -812,13 +812,13 @@ def test_power_of_parameter(self, test, expected):
812812
assert result.max == expected.max
813813

814814
@pytest.mark.parametrize("test, exponent, expected", [
815-
(Parameter("name", 5, "m", 0.05, 0, 10), -1, Parameter("name ** -1", 0.2, "1/m", 8e-5, 0.1, np.Inf)),
816-
(Parameter("name", -5, "m", 0.05, -5, 0), -1, Parameter("name ** -1", -0.2, "1/m", 8e-5, -np.Inf, -0.2)),
815+
(Parameter("name", 5, "m", 0.05, 0, 10), -1, Parameter("name ** -1", 0.2, "1/m", 8e-5, 0.1, np.inf)),
816+
(Parameter("name", -5, "m", 0.05, -5, 0), -1, Parameter("name ** -1", -0.2, "1/m", 8e-5, -np.inf, -0.2)),
817817
(Parameter("name", 5, "m", 0.05, 5, 10), -1, Parameter("name ** -1", 0.2, "1/m", 8e-5, 0.1, 0.2)),
818818
(Parameter("name", -5, "m", 0.05, -10, -5), -1, Parameter("name ** -1", -0.2, "1/m", 8e-5, -0.2, -0.1)),
819819
(Parameter("name", -5, "m", 0.05, -10, -5), -2, Parameter("name ** -2", 0.04, "1/m^2", 1.28e-5, 0.01, 0.04)),
820820
(Parameter("name", 5, "", 0.1, 1, 10), 0.3, Parameter("name ** 0.3", 1.6206565966927624, "", 0.0009455500095853564, 1, 1.9952623149688795)),
821-
(Parameter("name", 5, "", 0.1), 0.5, Parameter("name ** 0.5", 2.23606797749979, "", 0.005, 0, np.Inf))],
821+
(Parameter("name", 5, "", 0.1), 0.5, Parameter("name ** 0.5", 2.23606797749979, "", 0.005, 0, np.inf))],
822822
ids=["0_positive", "negative_0", "both_positive", "both_negative_invert", "both_negative_invert_square", "fractional", "fractional_negative_limit"])
823823
def test_power_of_diffent_parameters(self, test, exponent, expected):
824824
# When Then

0 commit comments

Comments
 (0)