mlquantify 0.0.11.1__tar.gz → 0.0.11.3__tar.gz

{mlquantify-0.0.11.1 → mlquantify-0.0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlquantify
-Version: 0.0.11.1
+Version: 0.0.11.3
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -109,6 +109,7 @@ ___
 - [Model Selection](https://github.com/luizfernandolj/mlquantify/wiki/Model-Selection)
 - [Evaluation](https://github.com/luizfernandolj/mlquantify/wiki/Evaluation)
 - [Plotting](https://github.com/luizfernandolj/mlquantify/wiki/Plotting)
+- [Utilities](https://github.com/luizfernandolj/mlquantify/wiki/Utilities)
 
 
 ___

{mlquantify-0.0.11.1 → mlquantify-0.0.11.3}/README.md

@@ -94,6 +94,7 @@ ___
 - [Model Selection](https://github.com/luizfernandolj/mlquantify/wiki/Model-Selection)
 - [Evaluation](https://github.com/luizfernandolj/mlquantify/wiki/Evaluation)
 - [Plotting](https://github.com/luizfernandolj/mlquantify/wiki/Plotting)
+- [Utilities](https://github.com/luizfernandolj/mlquantify/wiki/Utilities)
 
 
 ___

{mlquantify-0.0.11.1 → mlquantify-0.0.11.3}/mlquantify/plots/distribution_plot.py

@@ -30,8 +30,6 @@ plt.rcParams.update({
 })
 
 
-
-
 COLORS = [
     '#FFAB91', '#FFE082', '#A5D6A7', '#4DD0E1', '#FF6F61', '#FF8C94', '#D4A5A5',
     '#FF677D', '#B9FBC0', '#C2C2F0', '#E3F9A6', '#E2A8F7', '#F7B7A3', '#F7C6C7',
@@ -40,6 +38,7 @@ COLORS = [
     '#4FC3F7', '#FFB3B3', '#FF6F61'
 ]
 
+
 def class_distribution_plot(values: Union[List, np.ndarray],
                             labels: Union[List, np.ndarray],
                             bins: int = 30,
@@ -47,7 +46,6 @@ def class_distribution_plot(values: Union[List, np.ndarray],
                             legend: bool = True,
                             save_path: Optional[str] = None,
                             plot_params: Optional[Dict[str, Any]] = None):
-    
     """Plot overlaid histograms of class distributions.
 
     This function creates a plot with overlaid histograms, each representing the distribution
@@ -76,30 +74,72 @@ def class_distribution_plot(values: Union[List, np.ndarray],
             If the number of labels does not match the number of value sets.
 
     """
-
-
+    
+    # Ensure the number of labels matches the number of value sets
+    assert len(values) == len(labels), "The number of value sets must match the number of labels."
+    
+    if isinstance(values, list):
+        values = np.asarray(values)
+    if isinstance(labels, list):
+        labels = np.asarray(labels)
+    
+    
     # Apply custom plotting parameters if provided
     if plot_params:
         plt.rcParams.update(plot_params)
 
-    # Ensure the number of labels matches the number of value sets
-    assert len(values) == len(labels), "The number of value sets must match the number of labels."
+    if values.shape[1] > 1:
+        num_plots = values.shape[1]  # Number of columns in `values`
+        cols = int(np.ceil(np.sqrt(num_plots)))
+        rows = int(np.ceil(num_plots / cols))
 
+        fig, axs = plt.subplots(rows, cols, figsize=(cols * 5, rows * 4))
+        axs = axs.flatten()
+    
     # Create the overlaid histogram
-    for i, (value_set, label) in enumerate(zip(values, labels)):
-        plt.hist(value_set, bins=bins, color=COLORS[i % len(COLORS)], edgecolor='black', alpha=0.5, label=label)
-
+    for i, label in enumerate(np.unique(labels)):
+        if values.shape[1] > 1:
+            for j, lab in enumerate(np.unique(labels)):
+                value_set = values[:, j][label == labels]
+                axs[i].hist(value_set, bins=bins, color=COLORS[j % len(COLORS)], edgecolor='black', alpha=0.5, label=lab)
+                axs[i].set_xlim([0, 1])  # Fix x-axis range between 0 and 1
+        else:
+            value_set = values[label == labels]
+            plt.hist(value_set, bins=bins, color=COLORS[i % len(COLORS)], edgecolor='black', alpha=0.5, label=label)
+            plt.xlim([0, 1])  # Fix x-axis range between 0 and 1
+
+    if values.shape[1] > 1:
+        for i in range(i + 1, len(axs)):
+            fig.delaxes(axs[i])
+    
     # Add title to the plot if provided
     if title:
-        plt.title(title)
+        if values.shape[1] > 1:
+            for i in range(values.shape[1]):
+                axs[i].set_title(f'{title} for class {i+1}')
+        else:
+            plt.title(title)
 
     # Add legend to the plot if enabled
     if legend:
-        plt.legend(loc='upper right')
+        if values.shape[1] > 1:
+            for i in range(values.shape[1]):
+                axs[i].legend(loc='upper right')
+        else:
+            plt.legend(loc='upper right')
 
     # Set axis labels
-    plt.xlabel('Values')
-    plt.ylabel('Frequency')
+    if values.shape[1] > 1:
+        for i in range(values.shape[1]):
+            axs[i].set_xlabel('Values')
+            axs[i].set_ylabel('Frequency')
+    else:
+        plt.xlabel('Values')
+        plt.ylabel('Frequency')
+
+    # Adjust layout to prevent overlapping
+    plt.subplots_adjust(hspace=0.9, wspace=0.4)
+    plt.tight_layout()
 
     # Save the figure if a path is specified
     if save_path:

{mlquantify-0.0.11.1 → mlquantify-0.0.11.3}/mlquantify/plots/protocol_plot.py

@@ -1,10 +1,12 @@
 import matplotlib.pyplot as plt
+import matplotlib.colors as mcolors
 import matplotlib.patches as mpatches
 import pandas as pd
 from typing import List, Optional, Dict, Any, Union
 from pathlib import Path
 
 plt.rcParams.update({
+    'lines.markersize': 6,
     'axes.facecolor': "#F8F8F8",
     'figure.facecolor': "#F8F8F8",
     'font.family': 'sans-serif',
@@ -41,6 +43,28 @@ COLORS = [
 
 MARKERS = ["o", "s", "^", "D", "p", "*", "+", "x", "H", "1", "2", "3", "4", "|", "_"]
 
+def adjust_color_saturation(color: str, saturation_factor: float = 5) -> str:
+    """
+    Adjusts the saturation of a given color.
+    
+    Parameters:
+    - color (str): The original color in hexadecimal format.
+    - saturation_factor (float): The factor by which to adjust the saturation. 
+                                 Values > 1 will increase saturation, 
+                                 values < 1 will decrease it. Default is 1.5.
+    
+    Returns:
+    - str: The color with adjusted saturation in hexadecimal format.
+    """
+    # Convert color to HSV (Hue, Saturation, Value)
+    h, s, v = mcolors.rgb_to_hsv(mcolors.to_rgb(color))
+    
+    # Adjust saturation
+    s = min(1, s * saturation_factor)
+    
+    # Convert back to RGB and then to hex
+    return mcolors.to_hex(mcolors.hsv_to_rgb((h, s, v)))
+
 
 
 def protocol_boxplot(
@@ -100,6 +124,10 @@ def protocol_boxplot(
 
 
 
+
+
+
+
 def protocol_lineplot(
     table_protocol: pd.DataFrame,
     methods: Union[List[str], str, None],
@@ -135,10 +163,16 @@ def protocol_lineplot(
 
     # Create plot with custom figsize
     fig, ax = plt.subplots(figsize=figsize)
-    for i, (method, marker) in enumerate(zip(methods, MARKERS[:len(methods)])):
+    for i, (method, marker) in enumerate(zip(methods, MARKERS[:len(methods)+1])):
         method_data = table[table['QUANTIFIER'] == method]
         y_data = real if y == "ALPHA" else method_data[y]
-        ax.plot(method_data[x], y_data, color=COLORS[i % len(COLORS)], marker=marker, label=method, **plot_params)
+        color = adjust_color_saturation(COLORS[i % len(COLORS)])  # Aumenta a saturação das cores
+        ax.plot(method_data[x], 
+                y_data, color=color, 
+                marker=marker, 
+                label=method,
+                alpha=1.0, 
+                **plot_params)
 
     # Add legend
     if legend:
@@ -155,3 +189,5 @@ def protocol_lineplot(
     if save_path:
         plt.savefig(save_path, bbox_inches='tight')
     plt.show()
+
+    

{mlquantify-0.0.11.1 → mlquantify-0.0.11.3}/mlquantify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlquantify
-Version: 0.0.11.1
+Version: 0.0.11.3
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -109,6 +109,7 @@ ___
 - [Model Selection](https://github.com/luizfernandolj/mlquantify/wiki/Model-Selection)
 - [Evaluation](https://github.com/luizfernandolj/mlquantify/wiki/Evaluation)
 - [Plotting](https://github.com/luizfernandolj/mlquantify/wiki/Plotting)
+- [Utilities](https://github.com/luizfernandolj/mlquantify/wiki/Utilities)
 
 
 ___

{mlquantify-0.0.11.1 → mlquantify-0.0.11.3}/setup.py

@@ -6,7 +6,7 @@ here = pathlib.Path(__file__).parent.resolve()
 
 long_description = (here / 'README.md').read_text(encoding='utf-8')
 
-VERSION = '0.0.11.1'
+VERSION = '0.0.11.3'
 DESCRIPTION = 'Quantification Library'
 
 # Setting up