mlquantify 0.1.10__tar.gz → 0.1.11__tar.gz

{mlquantify-0.1.10/mlquantify.egg-info → mlquantify-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlquantify
-Version: 0.1.10
+Version: 0.1.11
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -30,7 +30,7 @@ Dynamic: maintainer
 Dynamic: requires-dist
 Dynamic: summary
 
-<h1 align="center">MLQuantify</h1>
+<img src="assets/logo_mlquantify-white.svg" alt="mlquantify logo">
 <h4 align="center">A Python Package for Quantification</h4>
 
 ___
@@ -41,7 +41,7 @@ ___
 
 ## Latest Release
 
-- **Version 0.1.3**: Inicial beta version. For a detailed list of changes, check the [changelog](#).
+- **Version 0.1.11**: Inicial beta version. For a detailed list of changes, check the [changelog](#).
 - In case you need any help, refer to the [User Guide](https://luizfernandolj.github.io/mlquantify/user_guide.html).
 - Explore the [API documentation](https://luizfernandolj.github.io/mlquantify/api/index.html) for detailed developer information.
 - See also the library in the pypi site in [pypi mlquantify](https://pypi.org/project/mlquantify/)
@@ -73,7 +73,6 @@ ___
 | **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, MAE, 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. |
 
 ___
@@ -84,8 +83,8 @@ This code first loads the breast cancer dataset from _sklearn_, which is then sp
 
 ```python
 from mlquantify.methods import EMQ
-from mlquantify.evaluation.measures import absolute_error, mean_absolute_error
-from mlquantify.utils import get_real_prev
+from mlquantify.metrics import MAE, NRAE
+from mlquantify.utils import get_prev_from_labels
 
 from sklearn.ensemble import RandomForestClassifier
 from sklearn.datasets import load_breast_cancer
@@ -103,14 +102,14 @@ model.fit(X_train, y_train)
 
 #Predict the class prevalence for X_test
 pred_prevalence = model.predict(X_test)
-real_prevalence = get_real_prev(y_test)
+real_prevalence = get_prev_from_labels(y_test)
 
 #Get the error for the prediction
-ae = absolute_error(real_prevalence, pred_prevalence)
-mae = mean_absolute_error(real_prevalence, pred_prevalence)
+mae = MAE(real_prevalence, pred_prevalence)
+nrae = NRAE(real_prevalence, pred_prevalence)
 
-print(f"Absolute Error -> {ae}")
 print(f"Mean Absolute Error -> {mae}")
+print(f"Normalized Relative Absolute Error -> {nrae}")
 ```
 
 ___
@@ -129,13 +128,6 @@ ___
 
 ## Documentation
 
-##### API is avaliable [here](https://luizfernandolj.github.io/mlquantify/api/index.html)
-
-- [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)
-- [Utilities](https://github.com/luizfernandolj/mlquantify/wiki/Utilities)
-
+##### API is avaliable [here](https://luizfernandolj.github.io/mlquantify/api/)
 
 ___

{mlquantify-0.1.10 → mlquantify-0.1.11}/README.md

@@ -1,4 +1,4 @@
-<h1 align="center">MLQuantify</h1>
+<img src="assets/logo_mlquantify-white.svg" alt="mlquantify logo">
 <h4 align="center">A Python Package for Quantification</h4>
 
 ___
@@ -9,7 +9,7 @@ ___
 
 ## Latest Release
 
-- **Version 0.1.3**: Inicial beta version. For a detailed list of changes, check the [changelog](#).
+- **Version 0.1.11**: Inicial beta version. For a detailed list of changes, check the [changelog](#).
 - In case you need any help, refer to the [User Guide](https://luizfernandolj.github.io/mlquantify/user_guide.html).
 - Explore the [API documentation](https://luizfernandolj.github.io/mlquantify/api/index.html) for detailed developer information.
 - See also the library in the pypi site in [pypi mlquantify](https://pypi.org/project/mlquantify/)
@@ -41,7 +41,6 @@ ___
 | **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, MAE, 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. |
 
 ___
@@ -52,8 +51,8 @@ This code first loads the breast cancer dataset from _sklearn_, which is then sp
 
 ```python
 from mlquantify.methods import EMQ
-from mlquantify.evaluation.measures import absolute_error, mean_absolute_error
-from mlquantify.utils import get_real_prev
+from mlquantify.metrics import MAE, NRAE
+from mlquantify.utils import get_prev_from_labels
 
 from sklearn.ensemble import RandomForestClassifier
 from sklearn.datasets import load_breast_cancer
@@ -71,14 +70,14 @@ model.fit(X_train, y_train)
 
 #Predict the class prevalence for X_test
 pred_prevalence = model.predict(X_test)
-real_prevalence = get_real_prev(y_test)
+real_prevalence = get_prev_from_labels(y_test)
 
 #Get the error for the prediction
-ae = absolute_error(real_prevalence, pred_prevalence)
-mae = mean_absolute_error(real_prevalence, pred_prevalence)
+mae = MAE(real_prevalence, pred_prevalence)
+nrae = NRAE(real_prevalence, pred_prevalence)
 
-print(f"Absolute Error -> {ae}")
 print(f"Mean Absolute Error -> {mae}")
+print(f"Normalized Relative Absolute Error -> {nrae}")
 ```
 
 ___
@@ -97,13 +96,6 @@ ___
 
 ## Documentation
 
-##### API is avaliable [here](https://luizfernandolj.github.io/mlquantify/api/index.html)
-
-- [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)
-- [Utilities](https://github.com/luizfernandolj/mlquantify/wiki/Utilities)
-
+##### API is avaliable [here](https://luizfernandolj.github.io/mlquantify/api/)
 
 ___

mlquantify-0.1.11/VERSION.txt

@@ -0,0 +1 @@
+0.1.11

{mlquantify-0.1.10 → mlquantify-0.1.11}/mlquantify/utils/_validation.py

@@ -274,7 +274,7 @@ def validate_data(quantifier,
         else:
             out = X, y
     elif not no_val_X and no_val_y:
-        out = check_array(X, input_name="X", **check_params)
+        out = check_array(X, input_name="X", dtype=None, **check_params)
     elif no_val_X and not no_val_y:
         out = _check_y(y, **check_params)
     else:
@@ -286,12 +286,12 @@ def validate_data(quantifier,
             check_X_params, check_y_params = validate_separately
             if "estimator" not in check_X_params:
                 check_X_params = {**default_check_params, **check_X_params}
-            X = check_array(X, input_name="X", **check_X_params)
+            X = check_array(X, input_name="X", dtype=None, **check_X_params)
             if "estimator" not in check_y_params:
                 check_y_params = {**default_check_params, **check_y_params}
             y = check_array(y, input_name="y", **check_y_params)
         else:
-            X, y = check_X_y(X, y, **check_params)
+            X, y = check_X_y(X, y, dtype=None, **check_params)
         out = X, y
         
     return out

{mlquantify-0.1.10 → mlquantify-0.1.11/mlquantify.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlquantify
-Version: 0.1.10
+Version: 0.1.11
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -30,7 +30,7 @@ Dynamic: maintainer
 Dynamic: requires-dist
 Dynamic: summary
 
-<h1 align="center">MLQuantify</h1>
+<img src="assets/logo_mlquantify-white.svg" alt="mlquantify logo">
 <h4 align="center">A Python Package for Quantification</h4>
 
 ___
@@ -41,7 +41,7 @@ ___
 
 ## Latest Release
 
-- **Version 0.1.3**: Inicial beta version. For a detailed list of changes, check the [changelog](#).
+- **Version 0.1.11**: Inicial beta version. For a detailed list of changes, check the [changelog](#).
 - In case you need any help, refer to the [User Guide](https://luizfernandolj.github.io/mlquantify/user_guide.html).
 - Explore the [API documentation](https://luizfernandolj.github.io/mlquantify/api/index.html) for detailed developer information.
 - See also the library in the pypi site in [pypi mlquantify](https://pypi.org/project/mlquantify/)
@@ -73,7 +73,6 @@ ___
 | **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, MAE, 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. |
 
 ___
@@ -84,8 +83,8 @@ This code first loads the breast cancer dataset from _sklearn_, which is then sp
 
 ```python
 from mlquantify.methods import EMQ
-from mlquantify.evaluation.measures import absolute_error, mean_absolute_error
-from mlquantify.utils import get_real_prev
+from mlquantify.metrics import MAE, NRAE
+from mlquantify.utils import get_prev_from_labels
 
 from sklearn.ensemble import RandomForestClassifier
 from sklearn.datasets import load_breast_cancer
@@ -103,14 +102,14 @@ model.fit(X_train, y_train)
 
 #Predict the class prevalence for X_test
 pred_prevalence = model.predict(X_test)
-real_prevalence = get_real_prev(y_test)
+real_prevalence = get_prev_from_labels(y_test)
 
 #Get the error for the prediction
-ae = absolute_error(real_prevalence, pred_prevalence)
-mae = mean_absolute_error(real_prevalence, pred_prevalence)
+mae = MAE(real_prevalence, pred_prevalence)
+nrae = NRAE(real_prevalence, pred_prevalence)
 
-print(f"Absolute Error -> {ae}")
 print(f"Mean Absolute Error -> {mae}")
+print(f"Normalized Relative Absolute Error -> {nrae}")
 ```
 
 ___
@@ -129,13 +128,6 @@ ___
 
 ## Documentation
 
-##### API is avaliable [here](https://luizfernandolj.github.io/mlquantify/api/index.html)
-
-- [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)
-- [Utilities](https://github.com/luizfernandolj/mlquantify/wiki/Utilities)
-
+##### API is avaliable [here](https://luizfernandolj.github.io/mlquantify/api/)
 
 ___

mlquantify-0.1.10/VERSION.txt

@@ -1 +0,0 @@
-0.1.10