DiaModality 0.1.8__tar.gz → 0.2.1__tar.gz

{diamodality-0.1.8/src/DiaModality.egg-info → diamodality-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DiaModality
-Version: 0.1.8
+Version: 0.2.1
 Summary: Tool to plot modality vector diagrams
 Author-email: konung-yaropolk <yaropolk1995@gmail.com>
 License: MIT License
@@ -27,7 +27,9 @@ License: MIT License
 Project-URL: Homepage, https://github.com/konung-yaropolk/DiaModality
 Project-URL: Issues, https://github.com/konung-yaropolk/DiaModality/issues
 Keywords: Visualization,Science,Plotting,Matplotlib
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
@@ -39,6 +41,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: matplotlib
+Requires-Dist: scsv
 
 # DiaModality - The Modality Diagram
 
@@ -103,8 +106,8 @@ with open(file_path, mode='w', newline='') as file:
 ---
 ``plot_sample_data.py``:
 ```python
-import DiaModality.CsvParser as csv
 import DiaModality.ModalityPlot as plt
+import scsv as csv
 import os
 
 # input files:
@@ -119,7 +122,7 @@ for file in files:
     file_path = os.path.join(script_dir, file)
 
     # Parse data from csv file
-    new_csv = csv.LoadCsv(file_path)
+    new_csv = csv.OpenFile(file_path)
     data, binarization = new_csv.ParseCsv(3, 3)
 
     # Make figure:
@@ -141,6 +144,7 @@ for file in files:
                                    # else draw trimodal vectors only
         whole_sum=True,            # Calculate all three modality vectors despite binarization
         figsize=(10, 10),
+        dpi=200,
         title='Modality Diagram Example',
         colors=(
             'tab:green',   # Set 1 color

{diamodality-0.1.8 → diamodality-0.2.1}/README.md

@@ -61,8 +61,8 @@ with open(file_path, mode='w', newline='') as file:
 ---
 ``plot_sample_data.py``:
 ```python
-import DiaModality.CsvParser as csv
 import DiaModality.ModalityPlot as plt
+import scsv as csv
 import os
 
 # input files:
@@ -77,7 +77,7 @@ for file in files:
     file_path = os.path.join(script_dir, file)
 
     # Parse data from csv file
-    new_csv = csv.LoadCsv(file_path)
+    new_csv = csv.OpenFile(file_path)
     data, binarization = new_csv.ParseCsv(3, 3)
 
     # Make figure:
@@ -99,6 +99,7 @@ for file in files:
                                    # else draw trimodal vectors only
         whole_sum=True,            # Calculate all three modality vectors despite binarization
         figsize=(10, 10),
+        dpi=200,
         title='Modality Diagram Example',
         colors=(
             'tab:green',   # Set 1 color

{diamodality-0.1.8 → diamodality-0.2.1}/pyproject.toml

@@ -14,7 +14,9 @@ keywords = ["Visualization", "Science", "Plotting", "Matplotlib"]
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.10"
 classifiers = [
+    "Programming Language :: Python",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.12",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Development Status :: 4 - Beta",
@@ -25,6 +27,7 @@ classifiers = [
 dependencies = [
     "numpy",
     "matplotlib",
+    "scsv",
 ]
 
 [project.urls]

{diamodality-0.1.8 → diamodality-0.2.1}/src/DiaModality/ModalityPlot.py

@@ -20,6 +20,7 @@ class __Figure():
         linewidth=0.5,
         alpha=0.8,
         figsize=(10, 10),
+        dpi=300,
         title='',
     ) -> None:
 
@@ -28,11 +29,12 @@ class __Figure():
         self.linewidth = linewidth
         self.alpha = alpha
         self.figsize = figsize
+        self.dpi = dpi
         self.title = title
         self.debug_flag = DEBUG
 
         # Prepare figure:
-        self.fig = plt.figure(figsize=self.figsize)
+        self.fig = plt.figure(figsize=self.figsize, dpi=self.dpi)
         self._make_layout()
 
     def _make_layout(self) -> None:
@@ -85,6 +87,7 @@ class ModalityPlot(__Figure, __Output):
         full_center=True,
         whole_sum=True,            # Calculate all three modality vectors despite binarization
         figsize=(10, 10),
+        dpi=300,
         title='',
         colors=(
             'tab:green',           # Set 1 color
@@ -135,6 +138,7 @@ class ModalityPlot(__Figure, __Output):
             linewidth,
             alpha,
             figsize,
+            dpi,
             title,
         )
 

diamodality-0.2.1/src/DiaModality/_version.py

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

{diamodality-0.1.8 → diamodality-0.2.1/src/DiaModality.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DiaModality
-Version: 0.1.8
+Version: 0.2.1
 Summary: Tool to plot modality vector diagrams
 Author-email: konung-yaropolk <yaropolk1995@gmail.com>
 License: MIT License
@@ -27,7 +27,9 @@ License: MIT License
 Project-URL: Homepage, https://github.com/konung-yaropolk/DiaModality
 Project-URL: Issues, https://github.com/konung-yaropolk/DiaModality/issues
 Keywords: Visualization,Science,Plotting,Matplotlib
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
@@ -39,6 +41,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: matplotlib
+Requires-Dist: scsv
 
 # DiaModality - The Modality Diagram
 
@@ -103,8 +106,8 @@ with open(file_path, mode='w', newline='') as file:
 ---
 ``plot_sample_data.py``:
 ```python
-import DiaModality.CsvParser as csv
 import DiaModality.ModalityPlot as plt
+import scsv as csv
 import os
 
 # input files:
@@ -119,7 +122,7 @@ for file in files:
     file_path = os.path.join(script_dir, file)
 
     # Parse data from csv file
-    new_csv = csv.LoadCsv(file_path)
+    new_csv = csv.OpenFile(file_path)
     data, binarization = new_csv.ParseCsv(3, 3)
 
     # Make figure:
@@ -141,6 +144,7 @@ for file in files:
                                    # else draw trimodal vectors only
         whole_sum=True,            # Calculate all three modality vectors despite binarization
         figsize=(10, 10),
+        dpi=200,
         title='Modality Diagram Example',
         colors=(
             'tab:green',   # Set 1 color

{diamodality-0.1.8 → diamodality-0.2.1}/src/DiaModality.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ src/DiaModality/ModalityPlot.py
 src/DiaModality/__init__.py
 src/DiaModality/__main__.py
 src/DiaModality/_version.py
-src/DiaModality/scsv.py
 src/DiaModality.egg-info/PKG-INFO
 src/DiaModality.egg-info/SOURCES.txt
 src/DiaModality.egg-info/dependency_links.txt

{diamodality-0.1.8 → diamodality-0.2.1}/src/DiaModality.egg-info/requires.txt

@@ -1,2 +1,3 @@
 numpy
 matplotlib
+scsv

diamodality-0.1.8/src/DiaModality/_version.py

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

diamodality-0.1.8/src/DiaModality/scsv.py

@@ -1,108 +0,0 @@
-#!/usr/bin/env python
-import csv
-
-class __Transform_methods():
-
-    def _floatify_recursive(self, data):
-        if isinstance(data, list):
-            # Recursively process sublists and filter out None values
-            processed_list = [self._floatify_recursive(item) for item in data]
-            return [item for item in processed_list if item is not None]
-        else:
-            try:
-                # Try to convert the item to float
-                return float(data)
-            except (ValueError, TypeError):
-                # If conversion fails, replace with None
-                self.warning_flag_non_numeric_data = True
-                return None
-
-    def _transpose_matrix(self, matrix):
-        max_len = max(len(row) for row in matrix)
-        padded_matrix = [row + [None] * (max_len - len(row)) for row in matrix]
-        transposed = [[padded_matrix[j][i] for j in range(len(padded_matrix))] for i in range(max_len)]
-        # Remove None values if padding was used
-        return [[element for element in row if element is not None] for row in transposed]
-
-
-class OpenFile(__Transform_methods):
-    '''
-        The input CSV file must be comma delimited and contains only numeric 
-        data or empty cells. Each empty cell considers as None.
-    '''
-
-    def __init__(self, file_path: str, floatify=False, delimiter: str = ',', lineterminator: str = "\r\n") -> None:
-        self.file_path = file_path
-        self.floatify = floatify
-
-        with open(self.file_path, 'r', encoding='utf-8-sig') as file:
-            self.Rows = list(csv.reader(file, delimiter=delimiter, lineterminator=lineterminator))
-
-        self.Cols = self._transpose_matrix(self.Rows)
-
-    def GetTableByRows(self) -> list:
-        return self.Rows
-
-    def GetTableByCols(self) -> list:
-        return self.Cols
-    
-    def GetCol(self, col_id) -> list:
-        assert col_id > 0, 'Column numger must be starting from 1'
-        output = []
-        for row in self.Rows:
-            try:
-                value = float(row[col_id-1])
-                output.append(value)
-            except (ValueError, IndexError):
-                # Replace non-number cells and empty cells with None
-                output.append(None)
-
-        return output
-
-    def GetCols(self, *args) -> list:
-        '''
-            The input is a list of integers. 
-            Output is list of lists of columns.
-            Each int represents how many columns to return.
-            Eg: input: (3, 2)
-                output: list of two lists of columns, first one with [0:2] cols 
-                        and second one with [2:3] cols from the original csv.
-        '''
-        output = []
-
-        for i, arg in enumerate(args):
-            output.append([])
-            start = sum(args) - sum(args[i:])
-            stop = start + arg
-
-            for col_id in range(start, stop):
-                output[i].append(self.GetCol(col_id+1))
-
-        return output
-
-    def GetRows(self, *args) -> list:
-        '''
-            The input is a list of integers. 
-            Output is list of matrices.
-            Each int represents each output matrix and defines
-            how many columns to include in the matrix.
-            Eg: input: (3, 2)
-                output: list of two matrices, first one with 1-3 cols 
-                        and second one with 4-5 cols from the original csv.
-        '''
-        output = []
-
-        for i, arg in enumerate(args):
-            output.append([])
-            start = sum(args) - sum(args[i:])
-            stop = start + arg
-
-            for row in self.Rows:
-                output[i].append(
-                    [float(cell) if cell else None for cell in row[start:stop]]
-                )
-
-        return output
-
-if __name__ == '__main__':
-    print('\nThis script can be used as an imported module only\n')