diff --git a/.gitignore b/.gitignore index 62df9d3..4f6422d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ words.txt compile_commands.json lab2/edit lab2/spell -lab3/tabletest diff --git a/lab3/Makefile b/lab3/Makefile deleted file mode 100644 index e6d004c..0000000 --- a/lab3/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -CXX = g++ -CXXFLAGS = -Wall -Wextra -Wpedantic -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wunused -Woverloaded-virtual -Wconversion -Wsign-conversion -Wnull-dereference -Wdouble-promotion -Wformat=2 -std=c++17 -#CXXFLAGS += -Werror - -SRC = $(wildcard *.cc) -HDR = $(wildcard *.h) -OBJ = $(SRC:.cc=.o) - -all: tabletest $(OBJ) - -tabletest: $(OBJ) - @echo "Building & linking $@" - @$(CXX) $(CXXFLAGS) $^ -o $@ - -%.o:%.cc - @echo "Building $@" - @$(CXX) -c $(CXXFLAGS) $< -o $@ - -lint: clang-tidy cppcheck clang-format - -clang-tidy: - clang-tidy $(SRC) -- $(CXXFLAGS) - -cppcheck: - cppcheck --enable=all --language=c++ --std=c++17 --suppress=missingIncludeSystem -I/usr/include $(SRC) $(HDR) - -clang-format: - clang-format -i $(SRC) $(HDR) - -clean: - rm -f *.o spell edit - -.PHONY: clean all lint clang-tidy cppcheck clang-format diff --git a/lab3/UserTable.cc b/lab3/UserTable.cc index ec31eff..91db558 100644 --- a/lab3/UserTable.cc +++ b/lab3/UserTable.cc @@ -56,8 +56,8 @@ User UserTable::find(int c) const while (low < high && ! found) { mid = (low + high) / 2; // - const int midnbr = users[mid].getCardNbr(); - if (c == midnbr) { + int midnbr = users[mid].getCardNbr(); + if (midnbr = c) { found = true; } else if (users[mid].getCardNbr() < c) { low = mid + 1; diff --git a/lab3/UserTableTest.cc b/lab3/UserTableTest.cc deleted file mode 100644 index 9d989dd..0000000 --- a/lab3/UserTableTest.cc +++ /dev/null @@ -1,22 +0,0 @@ -#include "UserTable.h" -#include "User.h" -#include - -int main() { - // Two identical users - User u1 = User(1234, "Name Nameson"); - User u2 = User(1234, "Name Nameson"); - - assert(u1.getName() == u2.getName()); - assert(u1.getCardNbr() == u2.getCardNbr()); - - // Two different users - User u3 = User(1200, "Name Surname"); - User u4 = User(1201, "Name Nameson"); - - assert(u3.getName() != u4.getName()); - assert(u3.getCardNbr() != u4.getCardNbr()); - - UserTable ut1 = UserTable("users.txt"); -} -