From 8d3f75ba9869de0781408454edd70437ae4458ef Mon Sep 17 00:00:00 2001 From: Membrizard Date: Fri, 2 Dec 2022 15:47:00 +0300 Subject: [PATCH] fixing composition issues --- pyvaporation/__init__.py | 2 +- pyvaporation/mixtures/mixture.py | 4 ++-- setup.py | 2 +- tests/test_mixtures/test_mixture_methods.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyvaporation/__init__.py b/pyvaporation/__init__.py index ab3ee92..98ac7a4 100644 --- a/pyvaporation/__init__.py +++ b/pyvaporation/__init__.py @@ -53,4 +53,4 @@ "Components", ] -__version__ = "1.1.6" +__version__ = "1.1.7" diff --git a/pyvaporation/mixtures/mixture.py b/pyvaporation/mixtures/mixture.py index f59d79d..6c17697 100644 --- a/pyvaporation/mixtures/mixture.py +++ b/pyvaporation/mixtures/mixture.py @@ -39,9 +39,9 @@ class Composition: def __attrs_post_init__(self): if self.p < 0: - self.p = 0 + self.p = 1e-10 if self.p > 1: - self.p = 1 + self.p = 1-1e-10 @property def first(self) -> float: diff --git a/setup.py b/setup.py index 1cd03e6..a8b4ca6 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name="pyvaporation", packages=find_packages(), - version="1.1.6", + version="1.1.7", license="Apache license 2.0", description="Set of tools for modelling pervaporation processes", author="Denis Sapegin, Aleksei Chekmachev", diff --git a/tests/test_mixtures/test_mixture_methods.py b/tests/test_mixtures/test_mixture_methods.py index 4c1806a..73c28d9 100644 --- a/tests/test_mixtures/test_mixture_methods.py +++ b/tests/test_mixtures/test_mixture_methods.py @@ -177,5 +177,5 @@ def test_get_nrtl_partial_pressures_from_weight_composition(): def test_invalid_compositions(): - assert Composition(p=-1, type="weight") == Composition(p=0, type="weight") - assert Composition(p=2, type="weight") == Composition(p=1, type="weight") + assert Composition(p=-1, type="weight") == Composition(p=1e-10, type="weight") + assert Composition(p=2, type="weight") == Composition(p=(1-1e-10), type="weight")