mlquantify 0.0.11.1__tar.gz → 0.0.11.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlquantify
-Version: 0.0.11.1
+Version: 0.0.11.2
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -12,6 +12,14 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Description-Content-Type: text/markdown
+Requires-Dist: scikit-learn
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: joblib
+Requires-Dist: tqdm
+Requires-Dist: pandas
+Requires-Dist: xlrd
+Requires-Dist: matplotlib
 
 <h1 align="center">MLQuantify</h1>
 <h4 align="center">A Python Package for Quantification</h4>

{mlquantify-0.0.11.1 → mlquantify-0.0.11.2}/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.2}/mlquantify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlquantify
-Version: 0.0.11.1
+Version: 0.0.11.2
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -12,6 +12,14 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Description-Content-Type: text/markdown
+Requires-Dist: scikit-learn
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: joblib
+Requires-Dist: tqdm
+Requires-Dist: pandas
+Requires-Dist: xlrd
+Requires-Dist: matplotlib
 
 <h1 align="center">MLQuantify</h1>
 <h4 align="center">A Python Package for Quantification</h4>

{mlquantify-0.0.11.1 → mlquantify-0.0.11.2}/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.2'
 DESCRIPTION = 'Quantification Library'
 
 # Setting up