Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
1 result

Target

Select target project
  • pmag/topupopt
1 result
Select Git revision
  • master
1 result
Show changes
Showing with 20159 additions and 11663 deletions
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -6,13 +6,12 @@ from src.topupopt.problems.esipp.resource import are_prices_time_invariant ...@@ -6,13 +6,12 @@ from src.topupopt.problems.esipp.resource import are_prices_time_invariant
# ***************************************************************************** # *****************************************************************************
# ***************************************************************************** # *****************************************************************************
class TestResourcePrice:
class TestResourcePrice:
# ************************************************************************* # *************************************************************************
# ************************************************************************* # *************************************************************************
def test_resources_time_invariant(self): def test_resources_time_invariant(self):
# single entry # single entry
resource_prices = { resource_prices = {
...@@ -72,7 +71,6 @@ class TestResourcePrice: ...@@ -72,7 +71,6 @@ class TestResourcePrice:
# ************************************************************************* # *************************************************************************
def test_resource_prices_reals(self): def test_resource_prices_reals(self):
# 1) single segment, no volume limit, real input # 1) single segment, no volume limit, real input
prices = 3 prices = 3
...@@ -117,7 +115,6 @@ class TestResourcePrice: ...@@ -117,7 +115,6 @@ class TestResourcePrice:
# ************************************************************************* # *************************************************************************
def test_equivalence_single(self): def test_equivalence_single(self):
# ********************************************************************* # *********************************************************************
# ********************************************************************* # *********************************************************************
...@@ -280,7 +277,6 @@ class TestResourcePrice: ...@@ -280,7 +277,6 @@ class TestResourcePrice:
# ************************************************************************* # *************************************************************************
def test_equivalence_multiple_segments(self): def test_equivalence_multiple_segments(self):
# ********************************************************************* # *********************************************************************
# ********************************************************************* # *********************************************************************
...@@ -388,7 +384,6 @@ class TestResourcePrice: ...@@ -388,7 +384,6 @@ class TestResourcePrice:
# ************************************************************************* # *************************************************************************
def test_resource_prices_lists(self): def test_resource_prices_lists(self):
# ********************************************************************* # *********************************************************************
# aspects that were tested: # aspects that were tested:
...@@ -606,8 +601,7 @@ class TestResourcePrice: ...@@ -606,8 +601,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=None, _ = ResourcePrice(prices=None, volumes=volumes)
volumes=volumes)
except TypeError: except TypeError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -619,8 +613,7 @@ class TestResourcePrice: ...@@ -619,8 +613,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,-3,2], _ = ResourcePrice(prices=[7, -3, 2], volumes=[3, 4, 5])
volumes=[3,4,5])
except ValueError: except ValueError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -632,8 +625,7 @@ class TestResourcePrice: ...@@ -632,8 +625,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,4,2], _ = ResourcePrice(prices=[7, 4, 2], volumes=[3, None, 5])
volumes=[3,None,5])
except ValueError: except ValueError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -645,8 +637,7 @@ class TestResourcePrice: ...@@ -645,8 +637,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,3,2], _ = ResourcePrice(prices=[7, 3, 2], volumes=[4, -1, 2])
volumes=[4,-1,2])
except ValueError: except ValueError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -658,8 +649,7 @@ class TestResourcePrice: ...@@ -658,8 +649,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,'4',2], _ = ResourcePrice(prices=[7, "4", 2], volumes=[3, 4, 5])
volumes=[3,4,5])
except TypeError: except TypeError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -671,8 +661,7 @@ class TestResourcePrice: ...@@ -671,8 +661,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,3,2], _ = ResourcePrice(prices=[7, 3, 2], volumes=[4, "3", 2])
volumes=[4,'3',2])
except TypeError: except TypeError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -684,8 +673,7 @@ class TestResourcePrice: ...@@ -684,8 +673,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,3,2], _ = ResourcePrice(prices=[7, 3, 2], volumes=[5, 7])
volumes=[5,7])
except ValueError: except ValueError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -697,8 +685,7 @@ class TestResourcePrice: ...@@ -697,8 +685,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,3,2], _ = ResourcePrice(prices=[7, 3, 2], volumes="hello")
volumes='hello')
except TypeError: except TypeError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -710,8 +697,7 @@ class TestResourcePrice: ...@@ -710,8 +697,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,3,-2], _ = ResourcePrice(prices=[7, 3, -2], volumes=None)
volumes=None)
except TypeError: except TypeError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -723,8 +709,7 @@ class TestResourcePrice: ...@@ -723,8 +709,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=[7,3,'a'], _ = ResourcePrice(prices=[7, 3, "a"], volumes=None)
volumes=None)
except TypeError: except TypeError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -736,8 +721,7 @@ class TestResourcePrice: ...@@ -736,8 +721,7 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=5, _ = ResourcePrice(prices=5, volumes=[7, 3, 4])
volumes=[7,3,4])
except TypeError: except TypeError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
...@@ -749,13 +733,13 @@ class TestResourcePrice: ...@@ -749,13 +733,13 @@ class TestResourcePrice:
error_triggered = False error_triggered = False
try: try:
_ = ResourcePrice(prices=-3, _ = ResourcePrice(prices=-3, volumes=None)
volumes=None)
except ValueError: except ValueError:
error_triggered = True error_triggered = True
assert error_triggered assert error_triggered
# ********************************************************************* # *********************************************************************
# ***************************************************************************** # *****************************************************************************
# ***************************************************************************** # *****************************************************************************
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.