Update to v2

.github/workflows/main.yml

@@ -10,8 +10,6 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get update -y -qq
-        sudo apt install libsdl1.2-dev libsdl-image1.2-dev
-    - name: CMake the project
-      run: cmake .
+        sudo apt install libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libgtk-3-dev
     - name: Make the projet
       run: make

CMakeLists.txt

@@ -2,55 +2,67 @@ cmake_minimum_required(VERSION 3.16)
 project(CText C)
 
 set(CMAKE_C_STANDARD 99)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
-
-find_package(SDL REQUIRED)
-find_package(SDL_image REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+pkg_check_modules(SDL REQUIRED sdl)
+pkg_check_modules(SDL_IMAGE REQUIRED SDL_image)
 
 include_directories(
         ${SDL_INCLUDE_DIRS}
         ${SDL_IMAGE_INCLUDE_DIRS}
+        ${GTK3_INCLUDE_DIRS}
 )
 
-add_executable(
-        CText src/neuralnetwork/main.c
-        src/neuralnetwork/neuron.c src/neuralnetwork/neuron.h
-        src/neuralnetwork/function.c src/neuralnetwork/function.h
-        src/neuralnetwork/layer.c src/neuralnetwork/layer.h
-        src/util.c src/util.h
-)
-
-add_executable(
-        CText-tests src/test/main.c
-        src/neuralnetwork/neuron.c src/neuralnetwork/neuron.h
-        src/neuralnetwork/function.c src/neuralnetwork/function.h
-        src/neuralnetwork/layer.c src/neuralnetwork/layer.h
-        src/util.c src/util.h
-        src/test/test.c src/test/test.h
-        src/test/test_method.c src/test/test_method.h
+link_directories(
+        ${SDL_LIBRARY_DIRS}
+        ${SDL_IMAGE_LIBRARY_DIRS}
+        ${GTK3_LIBRARY_DIRS}
 )
 
-add_executable(
-        CText-display src/preprocessing/main.c
-        src/display/pixel_operations.c src/display/pixel_operations.h
-        src/display/display.c src/display/display.h
-        src/preprocessing/grayscale.c src/preprocessing/grayscale.h
-        src/preprocessing/otsu.c src/preprocessing/otsu.h
+add_definitions(
+        ${SDL_CFLAGS_OTHER}
+        ${SDL_IMAGE_CFLAGS_OTHER}
+        ${GTK3_CFLAGS_OTHER}
 )
 
 add_executable(
-        CText-seg
-        src/segmentation/segmentation.c src/segmentation/segmentation.h
-)
+        CText
+        src/main.c
+        src/libs/list/list.c
+        src/libs/list/list.h
+        src/libs/string/string.c
+        src/libs/string/string.h
+        src/libs/application/application.c
+        src/libs/application/application.h
+        src/libs/application/app.h
+        src/libs/neural_network/neuralnetwork.c
+        src/libs/neural_network/neuralnetwork.h
+        src/libs/neural_network/neuron.c
+        src/libs/neural_network/neuron.h
+        src/libs/neural_network/train.c
+        src/libs/neural_network/train.h
+        src/libs/image_manipulation/pixel_operations.c
+        src/libs/image_manipulation/pixel_operations.h
+        src/libs/image_manipulation/otsu.c
+        src/libs/image_manipulation/otsu.h
+        src/libs/image_manipulation/grayscale.c
+        src/libs/image_manipulation/grayscale.h
+        src/libs/image_manipulation/segmentation.c
+        src/libs/image_manipulation/segmentation.h
+        src/libs/image_manipulation/bradley.c
+        src/libs/image_manipulation/bradley.h
+        src/libs/image_manipulation/filter.c
+        src/libs/image_manipulation/filter.h
+        src/libs/image_manipulation/rotation.c
+        src/libs/image_manipulation/rotation.h)
 
-target_link_libraries(CText m ${SDL_LIBRARY} ${SDL_IMAGE_LIBRARIES})
-target_link_libraries(CText-display m ${SDL_LIBRARY} ${SDL_IMAGE_LIBRARIES})
-target_link_libraries(CText-tests m)
+target_link_libraries(CText m ${SDL_LIBRARY} ${SDL_IMAGE_LIBRARIES} ${GTK3_LIBRARIES})
 
 if (CMAKE_COMPILER_IS_GNUCC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Wdouble-promotion -Wformat=2 -Wformat-truncation -Wformat-overflow -Wundef -fno-common -Wconversion")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Wdouble-promotion -Wformat=2 -Wformat-truncation -Wformat-overflow -Wundef -fno-common -Wconversion -rdynamic")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -rdynamic -O0")
 endif ()
 if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-endif ()
+endif ()

Makefile

@@ -0,0 +1,29 @@
+rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+
+SOURCE      = $(call rwildcard, src/, *.c)
+OBJS        = $(SOURCE:%.c=_build/%.o)
+HEADER      = $(SOURCE:.c=.h)
+OUT         = CText.exe
+CC          = gcc
+FLAGS       = -O3
+DEBUG_FLAGS = -O0
+
+CFLAGS      =  -Wall -Wextra -Werror -rdynamic -std=c99 `pkg-config --cflags gtk+-3.0`
+SDL_FLAGS   = `sdl-config --cflags --libs` -lSDL_image `pkg-config --libs gtk+-3.0` `pkg-config gmodule-2.0 --libs`
+CPPFLAGS    = `pkg-config --cflags sdl` -MMD `pkg-config --libs gtk+-3.0`
+
+
+CPPFLAGS= `pkg-config --cflags sdl` -MMD
+
+all: $(OBJS)
+	$(CC) $(FLAGS) -g $(OBJS) -o $(OUT) ${SDL_FLAGS} -lm -ldl
+
+debug: $(OBJS)
+	$(CC) $(DEBUG_FLAGS) -g $(OBJS) -o $(OUT) ${SDL_FLAGS} -lm -ldl
+
+_build/%.o: %.c
+	mkdir -p $(dir $@)
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $(^:_build=)
+
+clean:
+	rm -fr $(OBJS) $(OUT) _build/ *.jpg

README

@@ -7,19 +7,19 @@ git clone https://github.com/C-Text/CText.git
 = Dependencies =
 
 gcc
-cmake
 make
 sdl
-sdl2
-sdl2_image
+sdl_image
+sdl_gfx
+gtk3
 
 = Build =
-cmake .
 make
 
 = Launch =
-./CText
-./CText-tests
+./CText.exe
+
+./CText.exe -t : Train the neural network
 
 = Contribute =
 

data/tmp/out.txt

@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+