mlquantify 0.0.1__py3-none-any.whl → 0.0.11.2__py3-none-any.whl

mlquantify/base.py

@@ -138,13 +138,14 @@ class AggregativeQuantifier(Quantifier, ABC):
         return self.learner.get_params()
 
     def set_params(self, **params):
+        
         # Model Params
         for key, value in params.items():
             if hasattr(self, key):
                 setattr(self, key, value)
 
         # Learner Params
-        if self.learner:
+        if self.learner is not None:
             learner_params = {k.replace('learner__', ''): v for k, v in params.items() if 'learner__' in k}
             if learner_params:
                 self.learner.set_params(**learner_params)

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.2.dist-info/METADATA

@@ -0,0 +1,122 @@
+Metadata-Version: 2.1
+Name: mlquantify
+Version: 0.0.11.2
+Summary: Quantification Library
+Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
+Maintainer: Luiz Fernando Luth Junior
+Keywords: python,machine learning,quantification,quantify
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Science/Research
+Classifier: Programming Language :: Python :: 3
+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** is a Python library for quantification, also known as supervised prevalence estimation, designed to estimate the distribution of classes within datasets. It offers a range of tools for various quantification methods, model selection tailored for quantification tasks, evaluation metrics, and protocols to assess quantification performance. Additionally, mlquantify includes popular datasets and visualization tools to help analyze and interpret results.
+
+___
+
+## Latest Release
+
+- **Version 0.0.1**: Inicial beta version. For a detailed list of changes, check the [changelog](#).
+- In case you need any help, refer to the [wiki](https://github.com/luizfernandolj/mlquantify/wiki).
+- Explore the [API documentation](#) for detailed developer information.
+- See also the library in the pypi site in [pypi mlquantify](https://pypi.org/project/mlquantify/)
+
+___
+
+## Installation
+
+To install mlquantify, run the following command:
+
+```bash
+pip install mlquantify
+```
+
+___
+
+## Contents
+
+| Section | Description |
+|---|---|
+| **Quantification Methods** | Methods for quantification, such as classify & Count Correct methods, Threshold Optimization, Mixture Models and more.|
+| **Dynamic class management** | All methods are dynamic, and handles multiclass and binary problems, in case of binary it makes One-Vs-All (OVA) automatically. |
+| **Model Selection** | Criteria and processes used to select the best model, such as grid-search for the case of quantification|
+| **Evaluation Metrics** | Specific metrics used to evaluate quantification performance, (e.g., AE, BIAS, NAE, SE, KLD, etc.). |
+| **Evaluation Protocols** | Evaluation protocols used, based on sampling generation (e.g., APP, NPP, etc.).. |
+| **Plotting Results** | Tools and techniques used to visualize results, such as the protocol results.|
+| **Comprehensive Documentation** | Complete documentation of the project, including code, data, and results. |
+
+___
+
+## Quick example:
+
+This code first loads the breast cancer dataset from _sklearn_, which is then split into training and testing sets. It uses the _Expectation Maximisation Quantifier (EMQ)_ with a RandomForest classifier to predict class prevalence. After training the model, it evaluates performance by calculating and printing the absolute error and bias between the real and predicted prevalences.
+
+```python
+import mlquantify as mq
+from sklearn.ensemble import RandomForestClassifier
+from sklearn.datasets import load_breast_cancer
+from sklearn.model_selection import train_test_split
+
+# Loading dataset from sklearn
+features, target = load_breast_cancer(return_X_y=True)
+
+#Splitting into train and test
+X_train, X_test, y_train, y_test = train_test_split(features, target, test_size=0.3)
+
+#Create the model, here it is the Expectation Maximisation Quantifier (EMQ) with a classifier
+model = mq.methods.EMQ(RandomForestClassifier())
+model.fit(X_train, y_train)
+
+#Predict the class prevalence for X_test
+pred_prevalence = model.predict(X_test)
+real_prevalence = mq.utils.get_real_prev(y_test)
+
+#Get the error for the prediction
+ae = mq.evaluation.absolute_error(real_prevalence, pred_prevalence)
+bias = mq.evaluation.bias(real_prevalence, pred_prevalence)
+
+print(f"Mean Squared Error (MSE) -> {ae:.4f}")
+print(f"Bias -> {bias}")
+```
+
+___
+
+## Requirements
+
+- Scikit-learn
+- pandas
+- numpy
+- joblib
+- tqdm
+- matplotlib
+- xlrd
+
+___
+
+## Documentation
+
+##### API is avaliable [here](#)
+
+- [Methods](https://github.com/luizfernandolj/mlquantify/wiki/Methods)
+- [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)
+
+
+___

{mlquantify-0.0.1.dist-info → mlquantify-0.0.11.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mlquantify/__init__.py,sha256=BGxGCeZhlNsTYZkLoJJ-zcpVDRU4jBFVsz9ZmEZCtvs,166
-mlquantify/base.py,sha256=XpI7vynnn-f126Ykkw_YuuZI0CtuRMkPt0oBbDDZ7yY,8371
+mlquantify/base.py,sha256=przWKpQtoTT6ekbyTrAU3Kp_JsQ1982rAXWX_oAoSQM,8393
 mlquantify/model_selection.py,sha256=zN-qkrCe35GoJ8u1_Ab3EKXvrnAppk68Fj5kQVi61nU,8617
 mlquantify/classification/__init__.py,sha256=zxE6_ouh3kJVL56aJAhpFh36EBWKq9U4IcID4noROPQ,26
 mlquantify/classification/pwkclf.py,sha256=K1XBgI9FIh1Yu571bzdw8PM-TJXFGOQAzP4ewDV9b3Y,2323
@@ -49,7 +49,7 @@ mlquantify/methods/non_aggregative/__init__.py,sha256=HD34lwNmAkw26qlEA5PDHay9V6
 mlquantify/methods/non_aggregative/hdx.py,sha256=vwodV_Z89_be8HBOSriX3lsFhzmPZVLdOgKewa6la-E,2420
 mlquantify/plots/__init__.py,sha256=IDnv_KVALIsVuohiudclnIMSM5F1dNRxUFpjygLblBI,118
 mlquantify/plots/distribution_plot.py,sha256=8l22Lq6LhlOd3yv6gHX6wg2p1MTozYASyNzPcLlPHzk,4038
-mlquantify/plots/protocol_plot.py,sha256=DoVg_oDO_8HcFHMmWBVY2TM9HR-sgw20EqPQAOVRKj4,5513
+mlquantify/plots/protocol_plot.py,sha256=DfkCSHELr9lyyxMqeGNJgx0iywODQmH8EL5tlMjeAFQ,6618
 mlquantify/utils/__init__.py,sha256=VKplOsrL4ONf0-9anhcWFOxXjvGSQTH0Kh922s_hGb0,63
 mlquantify/utils/general_purposes/__init__.py,sha256=-Pwx1t2M_rGCEHxIc2TyomSe92w6U5Bdp6wtpsdcMZI,380
 mlquantify/utils/general_purposes/convert_col_to_array.py,sha256=Pq6_U6BdsIAl4Vr_836_vM-g2iRQAJ1b4kGOsYoFukI,560
@@ -67,7 +67,7 @@ mlquantify/utils/method_purposes/get_scores.py,sha256=qdIVYUS8xd8Vt86k19yETDNfib
 mlquantify/utils/method_purposes/moss.py,sha256=CVDDMHxPBnl_U2hz7Aqvne7jhB2mBUsVzTTsaiLQhOc,352
 mlquantify/utils/method_purposes/ternary_search.py,sha256=JpNrfJsA5kWuanVW_hyMucy7rQ9UzTSgazFpTRi9jMI,416
 mlquantify/utils/method_purposes/tprfpr.py,sha256=VKniG5aK8IwAA2fXEhkdHtwnx1zHH12qhwS4kKW5Dlo,1181
-mlquantify-0.0.1.dist-info/METADATA,sha256=hT32pA_BUXMWzHfQ12L9LmVzlc1plpWG8rVPSYSxPwE,774
-mlquantify-0.0.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mlquantify-0.0.1.dist-info/top_level.txt,sha256=tGEkYkbbFElwULvqENjam3u1uXtyC1J9dRmibsq8_n0,11
-mlquantify-0.0.1.dist-info/RECORD,,
+mlquantify-0.0.11.2.dist-info/METADATA,sha256=CQ6GvMVgM4JfD6KW4vXoDAixa35QM1zOFs5Erdm3EEM,4717
+mlquantify-0.0.11.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mlquantify-0.0.11.2.dist-info/top_level.txt,sha256=tGEkYkbbFElwULvqENjam3u1uXtyC1J9dRmibsq8_n0,11
+mlquantify-0.0.11.2.dist-info/RECORD,,

mlquantify-0.0.1.dist-info/METADATA

@@ -1,23 +0,0 @@
-Metadata-Version: 2.1
-Name: mlquantify
-Version: 0.0.1
-Summary: Quantification Library
-Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
-Maintainer: Luiz Fernando Luth Junior
-Keywords: python,machine learning,quantification,quantify
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Science/Research
-Classifier: Programming Language :: Python :: 3
-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
-