From 0a47e5ffcba6b5d9b08b79a9a6accbb26af0f610 Mon Sep 17 00:00:00 2001
From: Segcolt <9hmbzr275@mozmail.com>
Date: Tue, 15 Oct 2024 23:19:06 -0300
Subject: [PATCH] Update pretty much everything so that it compiles

Also update the script so that it uses the correct executable
---
 .gitignore |  1 +
 makefile   | 16 ++++++++--------
 run.sh     |  2 +-
 src/sa.hpp |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e257658..c35e249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 *.out
 *.app
 
+build
diff --git a/makefile b/makefile
index d899f8e..ee3f0a5 100644
--- a/makefile
+++ b/makefile
@@ -1,12 +1,12 @@
 # Flag para alterar o padrão do compilador
-standart = -std=c++11
+standart = -std=c++17
 
 # Flags para otimizar o arquivo executável
 optimize_flags = -O3 -pipe -flto
 
 # Flags para ativar todos os avisos do compilador
-warnings = -Wall -Wextra -Werror -Wshadow -Wformat=2 \
-	   -Wformat-overflow=2 -Wundef -Wconversion -fanalyzer -Wwrite-strings
+warnings = -Wall -Wextra -Werror -Wformat=2 -Wno-maybe-uninitialized \
+	   -Wformat-overflow=2 -Wundef -Wconversion -Wwrite-strings
 
 # Flags para depurar o código
 sanitize = -fsanitize=address,undefined,pointer-compare,pointer-subtract
@@ -21,17 +21,17 @@ objectdir = $(builddir)/$(objectname)
 
 .PHONY: all debug
 
-all:set_flags compile
+all:set_flags $(objectdir)
 
-debug:set_debug_flags compile
+debug:set_debug_flags $(objectdir)
 
-compile:random.o sa.o
+$(objectdir):$(builddir)/random.o $(builddir)/sa.o src/main.cpp
 	$(CXX) $(CPPFLAGS) $(builddir)/random.o $(builddir)/sa.o src/main.cpp -o $(objectdir)
 
-random.o:
+$(builddir)/random.o:src/random.cpp
 	$(CXX) $(CPPFLAGS) src/random.cpp -o $(builddir)/random.o -c
 
-sa.o:
+$(builddir)/sa.o:src/sa.cpp
 	$(CXX) $(CPPFLAGS) src/sa.cpp -o $(builddir)/sa.o -c
 
 set_flags:
diff --git a/run.sh b/run.sh
index 4a40390..535f4c0 100755
--- a/run.sh
+++ b/run.sh
@@ -3,7 +3,7 @@
 IFS=$'\n'
 
 if [[ -z $EXEC ]]; then
-	EXEC="build/main.out"
+	EXEC="build/sabp"
 fi
 
 if [[ -z $TEST_FOLDER ]]; then
diff --git a/src/sa.hpp b/src/sa.hpp
index 6353f8f..487953f 100644
--- a/src/sa.hpp
+++ b/src/sa.hpp
@@ -219,7 +219,7 @@ class solution {
 		sequence10.reserve(boxes.size());
 		sequence11.reserve(boxes.size());
 
-		for (size_t i = 0; i < choice; i++) {
+		for (size_t i = 0; i < (size_t)choice; i++) {
 			if (boxes[choice].swappable10(boxes[i], capacity)) {
 				sequence10.push_back((int)i);
 			}