From 762d01741c4feef82956e943359857615fdf7569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Sun, 27 Nov 2022 11:57:56 +0100 Subject: [PATCH] Fix cutPoints computation --- Makefile | 5 ++++- fimdlp/CPPFImdlp.cpp | 10 +++++++--- fimdlp/cppfimdlp.cpython-310-darwin.so | Bin 84512 -> 84512 bytes 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 49674a6..ee03ff6 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,8 @@ SHELL := /bin/bash clean: ## Clean up rm -rf build dist *.egg-info - for name in fimdlp/cfimdlp.cpp fimdlp/fimdlp.cpython-310-darwin.so;do if [ -f $name ]; then rm $name; fi; done + if [ -f fimdlp/cfimdlp.cpp ]; then rm fimdlp/cfimdlp.cpp; fi; + if [ -f fimdlp/cppfimdlp.cpython-310-darwin.so ]; then rm fimdlp/cppfimdlp.cpython-310-darwin.so; fi; lint: ## Lint and static-check black fimdlp @@ -21,7 +22,9 @@ build: ## Build package buildext: ## Build extension rm -fr dist/* rm -fr build/* + make clean python setup.py build_ext + echo "Build extension success"; mv build/lib.macosx-12-x86_64-cpython-310/cppfimdlp.cpython-310-darwin.so fimdlp; audit: ## Audit pip pip-audit diff --git a/fimdlp/CPPFImdlp.cpp b/fimdlp/CPPFImdlp.cpp index 3600959..5f9039b 100644 --- a/fimdlp/CPPFImdlp.cpp +++ b/fimdlp/CPPFImdlp.cpp @@ -10,14 +10,18 @@ namespace CPPFImdlp std::vector CPPFImdlp::cutPoints(std::vector &X, std::vector &y) { std::vector cutPts; - int i, ant = X.at(0); + int i, ant = X.at(0), anty = y.at(0); int n = X.size(); for (i = 1; i < n; i++) { if (X.at(i) != ant) { - cutPts.push_back(float(X.at(i) + ant) / 2); - ant = X.at(i); + if (y.at(i) != anty) + { + cutPts.push_back(float(X.at(i) + ant) / 2); + ant = X.at(i); + anty = y.at(i); + } } } return cutPts; diff --git a/fimdlp/cppfimdlp.cpython-310-darwin.so b/fimdlp/cppfimdlp.cpython-310-darwin.so index c553eccde1968d84b6f0d253514c1d2ab803ac7d..4e5cb5bf2e06162c72a3319b177acc7ce7fdf20f 100755 GIT binary patch delta 6854 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