Merge pull request #27 from WayScience/fix_column_reference

Fix Column Reference

Author: MattsonCam

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pairwise-compare"
-version = "0.1.1"
+version = "0.0.0"
 description = "Allows the user to compare groups of data specified in a tidy pandas dataframe with ease."
 authors = ["Cameron Mattson <mattsoncameron1@gmail.com>"]
 license = "BSD 3-Clause"
@@ -28,6 +28,20 @@ matplotlib = "^3.9.2"
 pylint = "^3.3.1"
 notebook = "^7.2.2"
 
+[tool.poetry.requires-plugins]
+poetry-dynamic-versioning = { version = ">=1.0.0,<2.0.0", extras = ["plugin"] }
+
+[tool.poetry-dynamic-versioning]
+enable = true
+style = "pep440"
+vcs = "git"
+
+[tool.poetry-dynamic-versioning.substitution]
+files = [
+    "src/comparison_tools/__init__.py",
+    "src/comparators/__init__.py"
+]
+
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+build-backend = "poetry_dynamic_versioning.backend"

src/comparators/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.0"

src/comparison_tools/PairwiseCompare.py

@@ -107,11 +107,11 @@ def __init__(
             _group_columns=self.__posthoc_group_cols,
         )
 
-    def __warn_empty_comparisons(self, _comparison_type_name):
+    def __warn_empty_comparisons(self, _comparison_type_name: str):
 
         warnings.warn(f"{_comparison_type_name} were empty", UserWarning)
 
-    def __is_iterable_with_strings(self, _data_structure):
+    def __is_iterable_with_strings(self, _data_structure: Any):
 
         prefix_msg = "Expected an Iterable of Strings."
 
@@ -125,7 +125,7 @@ def __is_iterable_with_strings(self, _data_structure):
             if any(not isinstance(element, str) for element in _data_structure):
                 raise TypeError(f"{prefix_msg} Data in Iterable is not of type String.")
 
-    def __get_group_column_idxs(self, _group_columns):
+    def __get_group_column_idxs(self, _group_columns: list[str]):
         """Get group fields after removing dropped columns."""
 
         return [
@@ -145,11 +145,15 @@ def __get_group_column_element(
         else:
             return _group_column_data
 
-    def __contains_match(self, _groups):
+    def __contains_match(
+        self,
+        _groups: Union[tuple[tuple[Any]], tuple[Any]],
+        _group_columns: list[str],
+    ):
         """Check if the same features between both groups are the same value."""
 
         if not self.__one_different_comparison:
-            if len(self.__posthoc_group_cols) == 1:
+            if len(_group_columns) == 1:
                 if _groups[0] == _groups[1]:
                     return True
 
@@ -176,7 +180,9 @@ def inter_comparisons(self):
         # Iterate through each ante group combination
         for apair in apairs:
 
-            if self.__contains_match(apair):
+            # Don't make a comparison if with this pair if
+            # any of the corresponding column values match
+            if self.__contains_match(apair, self.__antehoc_group_cols):
                 continue
 
             apair = tuple(
@@ -212,7 +218,9 @@ def inter_comparisons(self):
             # Iterate through each well group cartesian product and save the data
             for ppair in comparison_key_product:
 
-                if self.__contains_match(ppair):
+                # Don't make a comparison if with this pair if
+                # any of the corresponding column values match
+                if self.__contains_match(ppair, self.__posthoc_group_cols):
                     continue
 
                 ppair = tuple(
@@ -292,7 +300,9 @@ def intra_comparisons(self):
             # Iterate through the combinations pairs of the groups
             for ppair in comparison_key_combinations:
 
-                if self.__contains_match(ppair):
+                # Don't make a comparison if with this pair if
+                # any of the corresponding column values match
+                if self.__contains_match(ppair, self.__posthoc_group_cols):
                     continue
 
                 ppair = tuple(

src/comparison_tools/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.0"

tests/test_correctness_pairwise_compare_manager.py

@@ -55,7 +55,7 @@ def test_data(request):
             {
                 "_comparator": PearsonsCorrelation(),
                 "_same_columns": None,
-                "_different_columns": ["Metadata_siRNA", "Metadata_Well"],
+                "_different_columns": ["Metadata_siRNA", "Metadata_Well", "Metadata_genotype"],
                 "_drop_cols": None,
             }
         ),