Update libalx (use gsl)

8 files changed, 21 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index d0ec4a0..ae55b1d 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ LIBS_PKG       += `pkg-config --libs opencv`
 LIBS_PKG       += `pkg-config --libs zbar`
 LIBS_PKG       += `pkg-config --libs tesseract`
 LIBS_PKG       += `pkg-config --libs lept`
+LIBS_PKG       += -l gsl -l cblas -l atlas
 
 LIBS		= $(LIBS_STD)
 LIBS           += $(LIBS_OPT)
@@ -230,10 +231,8 @@ all: bin
 PHONY += libalx
 libalx:
 	@echo	"	MAKE	$@"
-	$(Q)$(MAKE) math	-C $(LIBALX_DIR)
-	$(Q)$(MAKE) stdio	-C $(LIBALX_DIR)
-	$(Q)$(MAKE) stdlib	-C $(LIBALX_DIR)
-	$(Q)$(MAKE) string	-C $(LIBALX_DIR)
+	$(Q)$(MAKE) base	-C $(LIBALX_DIR)
+	$(Q)$(MAKE) gsl		-C $(LIBALX_DIR)
 	$(Q)$(MAKE) ncurses	-C $(LIBALX_DIR)
 	@echo
 
diff --git a/bin/Makefile b/bin/Makefile
index 7c236d8..8f5fa6b 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -29,11 +29,9 @@ OBJS		=							\
 		$(TMP_DIR)/user/iface.o					\
 		$(TMP_DIR)/user/tui.o
 DEPS_LIBS	= 							\
-		$(LIBALX_LIB_DIR)/libalx-ncurses.a			\
-		$(LIBALX_LIB_DIR)/libalx-stdio.a			\
-		$(LIBALX_LIB_DIR)/libalx-math.a				\
-		$(LIBALX_LIB_DIR)/libalx-stdlib.a			\
-		$(LIBALX_LIB_DIR)/libalx-string.a
+		$(LIBALX_LIB_DIR)/libalx-base.a				\
+		$(LIBALX_LIB_DIR)/libalx-gsl.a				\
+		$(LIBALX_LIB_DIR)/libalx-ncurses.a
 
 ALL	= $(BIN_NAME) size
 
@@ -41,10 +39,8 @@ ALL	= $(BIN_NAME) size
 
 STATIC_LIBS	= -L $(LIBALX_LIB_DIR)					\
 		-l alx-ncurses						\
-		-l alx-stdio						\
-		-l alx-string						\
-		-l alx-math						\
-		-l alx-stdlib
+		-l alx-gsl						\
+		-l alx-base
 
 
 # target: dependencies
diff --git a/libalx b/libalx
-Subproject 90d6c8256592c5cc0ad83412c60481bfae9f356
+Subproject eaf1e29e167cabd27c9b15f6b91e5e38c283d5c
diff --git a/src/image/alx.cpp b/src/image/alx.cpp
index ce3d450..3dad748 100644
--- a/src/image/alx.cpp
+++ b/src/image/alx.cpp
@@ -16,8 +16,8 @@
 
 #include <opencv2/core/core.hpp>
 
-#include "libalx/base/math/arithmetic_mean.hpp"
-#include "libalx/base/math/median.hpp"
+#include "libalx/extra/gsl/rstat/median.hpp"
+#include "libalx/extra/gsl/statistics/mean.hpp"
 
 #include "vision-artificial/image/iface.hpp"
 
@@ -342,7 +342,7 @@ static	void	img_alx_mean_horizontal		(class cv::Mat  *imgptr)
 			img_pix		= imgptr->data + i * step + j;
 			row[j]		= *img_pix;
 		}
-		mean	= alx_arithmetic_mean_u8(cols, row);
+		mean	= alx_gsl_stats_mean_u8(cols, row);
 
 		for (ptrdiff_t j = 0; j < cols; j++) {
 			img_pix		= imgptr->data + i * step + j;
@@ -366,7 +366,7 @@ static	void	img_alx_mean_vertical		(class cv::Mat  *imgptr)
 			img_pix		= imgptr->data + j * step + i;
 			col[j]		= *img_pix;
 		}
-		mean	= alx_arithmetic_mean_u8(rows, col);
+		mean	= alx_gsl_stats_mean_u8(rows, col);
 
 		for (ptrdiff_t j = 0; j < rows; j++) {
 			img_pix		= imgptr->data + j * step + i;
@@ -390,7 +390,7 @@ static	void	img_alx_median_horizontal	(class cv::Mat  *imgptr)
 			img_pix	= imgptr->data + i * step + j;
 			row[j]	= *img_pix;
 		}
-		median	= alx_median_u8(cols, row);
+		median	= alx_gsl_rstat_median_u8(cols, row);
 
 		for (ptrdiff_t j = 0; j < cols; j++) {
 			img_pix		= imgptr->data + i * step + j;
@@ -414,7 +414,7 @@ static	void	img_alx_median_vertical		(class cv::Mat  *imgptr)
 			img_pix	= imgptr->data + j * step + i;
 			col[j]	= *img_pix;
 		}
-		median	= alx_median_u8(rows, col);
+		median	= alx_gsl_rstat_median_u8(rows, col);
 
 		for (ptrdiff_t j = 0; j < rows; j++) {
 			img_pix		= imgptr->data + j * step + i;
diff --git a/src/proc/coins.cpp b/src/proc/coins.cpp
index 75b7a04..1d7e56d 100644
--- a/src/proc/coins.cpp
+++ b/src/proc/coins.cpp
@@ -14,8 +14,8 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include "libalx/base/math/arithmetic_mean.hpp"
 #include "libalx/base/stddef/size.hpp"
+#include "libalx/base/stdlib/average.hpp"
 #include "libalx/base/stdlib/maximum.hpp"
 
 #include "vision-artificial/image/iface.hpp"
diff --git a/src/proc/objects.cpp b/src/proc/objects.cpp
index fa06a8c..c160fc0 100644
--- a/src/proc/objects.cpp
+++ b/src/proc/objects.cpp
@@ -15,7 +15,7 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include "libalx/base/math/median.hpp"
+#include "libalx/extra/gsl/rstat/median.hpp"
 
 #include "vision-artificial/image/iface.hpp"
 #include "vision-artificial/proc/common.hpp"
@@ -372,7 +372,7 @@ static	void	pattern_calib_mm_pix	(void)
 
 	for (ptrdiff_t i = 0; i < squares_n; i++)
 		pattern_len[i]	= pattern.square[i].len;
-	median_size	= alx_median_u8(squares_n, pattern_len);
+	median_size	= alx_gsl_rstat_median_u8(squares_n, pattern_len);
 	ratio_mm_pix	= PATTERN_SQUARE_LEN_MM / median_size;
 
 	snprintf(txt, LOG_LINE_LEN, "mm/pix	= %lf", ratio_mm_pix);
diff --git a/tmp/image/Makefile b/tmp/image/Makefile
index 951f7db..2c167f0 100644
--- a/tmp/image/Makefile
+++ b/tmp/image/Makefile
@@ -23,8 +23,8 @@ OBJ		=							\
 
 ALX_INC		=							\
 		$(INC_DIR)/vision-artificial/image/alx.hpp		\
-		$(LIBALX_INC_DIR)/libalx/base/math/arithmetic_mean.hpp	\
-		$(LIBALX_INC_DIR)/libalx/base/math/median.hpp		\
+		$(LIBALX_INC_DIR)/libalx/extra/gsl/rstat/median.hpp	\
+		$(LIBALX_INC_DIR)/libalx/extra/gsl/statistics/mean.hpp	\
 		$(INC_DIR)/vision-artificial/image/iface.hpp
 ALX_SRC		=							\
 		$(SRC_DIR)/image/alx.cpp
diff --git a/tmp/proc/Makefile b/tmp/proc/Makefile
index b5e9577..d36ee82 100644
--- a/tmp/proc/Makefile
+++ b/tmp/proc/Makefile
@@ -23,8 +23,8 @@ OBJ		=							\
 
 COINS_INC	=							\
 		$(INC_DIR)/vision-artificial/proc/coins.hpp		\
-		$(LIBALX_INC_DIR)/libalx/base/math/arithmetic_mean.hpp	\
 		$(LIBALX_INC_DIR)/libalx/base/stddef/size.hpp		\
+		$(LIBALX_INC_DIR)/libalx/base/stdlib/average.hpp	\
 		$(LIBALX_INC_DIR)/libalx/base/stdlib/maximum.hpp	\
 		$(INC_DIR)/vision-artificial/image/iface.hpp		\
 		$(INC_DIR)/vision-artificial/proc/common.hpp		\
@@ -78,7 +78,7 @@ LIGHTERS_SRC	=							\
 
 OBJECTS_INC	=							\
 		$(INC_DIR)/vision-artificial/proc/objects.hpp		\
-		$(LIBALX_INC_DIR)/libalx/base/math/median.hpp		\
+		$(LIBALX_INC_DIR)/libalx/extra/gsl/rstat/median.hpp	\
 		$(INC_DIR)/vision-artificial/image/iface.hpp		\
 		$(INC_DIR)/vision-artificial/proc/common.hpp		\
 		$(INC_DIR)/vision-artificial/user/iface.hpp