From 3a100bbba74f2de5b6a89ecad16f220349166ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Tue, 25 Apr 2023 17:11:40 +0200 Subject: [PATCH] Add mdlp version to Makefile Refactor sample.py --- Makefile | 1 + samples/sample.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ffc0216..7679994 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ audit: ## Audit pip version: @echo "Current Python version .: $(shell python --version)" @echo "Current FImdlp version .: $(shell python -c "from fimdlp import _version; print(_version.__version__)")" + @echo "Current mdlp version ...: $(shell python -c "from fimdlp.cppfimdlp import CFImdlp; print(CFImdlp().get_version().decode())")" @echo "Installed FImdlp version: $(shell pip show fimdlp | grep Version | cut -d' ' -f2)" help: ## Show help message diff --git a/samples/sample.py b/samples/sample.py index 0e12647..aa525b2 100644 --- a/samples/sample.py +++ b/samples/sample.py @@ -1,7 +1,6 @@ import time import argparse import os -from scipy.io import arff import pandas as pd from sklearn.ensemble import RandomForestClassifier from fimdlp.mdlp import FImdlp @@ -18,11 +17,21 @@ datasets = { ap = argparse.ArgumentParser() ap.add_argument( - "--min_length", type=int, default=3, help="Minimum length of interval" + "-n", + "--min_length", + type=int, + default=3, + help="Minimum length of interval", ) -ap.add_argument("--max_depth", type=int, default=9999, help="Maximum depth") ap.add_argument( - "--max_cuts", type=float, default=0, help="Maximum number of cut points" + "-m", "--max_depth", type=int, default=9999, help="Maximum depth" +) +ap.add_argument( + "-c", + "--max_cuts", + type=float, + default=0, + help="Maximum number of cut points", ) ap.add_argument("dataset", type=str, choices=datasets.keys()) args = ap.parse_args()