From 2c901d761ca0cbbc690ca30cd9f6d93673fa4eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Sat, 15 Jan 2022 01:15:10 +0100 Subject: [PATCH] Add Makefile --- Makefile | 28 ++++++++++++++++++++++++++++ src/Models.py | 8 +++++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..554ba88 --- /dev/null +++ b/Makefile @@ -0,0 +1,28 @@ +SHELL := /bin/bash +.DEFAULT_GOAL := help +.PHONY: coverage deps help lint push test doc build + +lint: ## Lint and static-check + black src + flake8 src + mypy src + +audit: ## Audit pip + pip-audit + +help: ## Show help message + @IFS=$$'\n' ; \ + help_lines=(`fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##/:/'`); \ + printf "%s\n\n" "Usage: make [task]"; \ + printf "%-20s %s\n" "task" "help" ; \ + printf "%-20s %s\n" "------" "----" ; \ + for help_line in $${help_lines[@]}; do \ + IFS=$$':' ; \ + help_split=($$help_line) ; \ + help_command=`echo $${help_split[0]} | sed -e 's/^ *//' -e 's/ *$$//'` ; \ + help_info=`echo $${help_split[2]} | sed -e 's/^ *//' -e 's/ *$$//'` ; \ + printf '\033[36m'; \ + printf "%-20s %s" $$help_command ; \ + printf '\033[0m'; \ + printf "%s\n" $$help_info; \ + done diff --git a/src/Models.py b/src/Models.py index edb962b..9b248a0 100644 --- a/src/Models.py +++ b/src/Models.py @@ -43,9 +43,11 @@ class Models: nodes = 0 leaves = result.get_n_leaves() depth = 0 - elif name=="Bagging": + elif name == "Bagging": if hasattr(result.base_estimator_, "nodes_leaves"): - nodes, leaves = list(zip(*[x.nodes_leaves() for x in result.estimators_])) + nodes, leaves = list( + zip(*[x.nodes_leaves() for x in result.estimators_]) + ) nodes, leaves = mean(nodes), mean(leaves) depth = mean([x.depth_ for x in result.estimators_]) elif hasattr(result.base_estimator_, "tree_"): @@ -53,7 +55,7 @@ class Models: leaves = mean([x.get_n_leaves() for x in result.estimators_]) depth = mean([x.get_depth() for x in result.estimators_]) else: - nodes = leaves=depth=0 + nodes = leaves = depth = 0 elif name == "RandomForest": leaves = mean([x.get_n_leaves() for x in result.estimators_]) depth = mean([x.get_depth() for x in result.estimators_])