diff --git a/Makefile b/Makefile index aac9fe8..1855e99 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ else endif # EXECUTION FLAGS -RUN_FLAGS = -b -d +RUN_FLAGS = -b # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # @@ -103,48 +103,48 @@ $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LFLAGS) run: $(NAME) -# @echo $(B_PURPLE)"\n---------------------------------------------\n1. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3 * x^2 + 5 * x^1 - 2 * x^0 = 5 * x^1" + @echo $(B_PURPLE)"\n---------------------------------------------\n1. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3 * x^2 + 5 * x^1 - 2 * x^0 = 5 * x^1" @echo $(B_PURPLE)"\n---------------------------------------------\n2. degree 2 \n"$(RESET) -./$(NAME) $(RUN_FLAGS) "3.4 * x^2 + 1 * x^1 - 2.0 * x^0 = 5 * x^1" -# @echo $(B_PURPLE)"\n---------------------------------------------\n3. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3 * x^2 + 2 * x^2 = 5 * x^1" -# @echo $(B_PURPLE)"\n---------------------------------------------\n4. flag -e SHOULD FAIL \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) -e "3 * x^2 + 2 * x - 7 * x^4 = 1 * x^4" -# @echo $(B_PURPLE)"\n---------------------------------------------\n5. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3*x^2 + 2x = 0" + @echo $(B_PURPLE)"\n---------------------------------------------\n3. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3 * x^2 + 2 * x^2 = 5 * x^1" + @echo $(B_PURPLE)"\n---------------------------------------------\n4. flag -e SHOULD FAIL \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) -e "3 * x^2 + 2 * x - 7 * x^4 = 1 * x^4" + @echo $(B_PURPLE)"\n---------------------------------------------\n5. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3*x^2 + 2x = 0" @echo $(B_PURPLE)"\n---------------------------------------------\n6. degree 2 \n"$(RESET) -./$(NAME) $(RUN_FLAGS) "3.4 * x^2 + 1 * x^1 - 2.0 * x^0 = 5.123 * x^1" -# @echo $(B_PURPLE)"\n---------------------------------------------\n7. float exponent SHOULD FAIL \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3.4 * x^2 + 1 * x^1 - 2.0 * x^0 = 5 * x^1.2" -# @echo $(B_PURPLE)"\n---------------------------------------------\n8. degree 4 SHOULD FAIL \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3x^2 + 2x -7x^4 = x^4" + @echo $(B_PURPLE)"\n---------------------------------------------\n7. float exponent SHOULD FAIL \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3.4 * x^2 + 1 * x^1 - 2.0 * x^0 = 5 * x^1.2" + @echo $(B_PURPLE)"\n---------------------------------------------\n8. degree 4 SHOULD FAIL \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3x^2 + 2x -7x^4 = x^4" @echo $(B_PURPLE)"\n---------------------------------------------\n9. degree 2 \n"$(RESET) -./$(NAME) $(RUN_FLAGS) "3x² + 2x -7x¹ = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n10. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3x² + 2x -7 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n11. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "-3x² + 2x -7 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n12. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "+3x² + 2x -7 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n13. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3x² + 0x -7 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n14. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3x² + 0x -0 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n15. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3x² + 2x -0 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n16. degree 1 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3x + 2x -0 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n17. degree 2 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "3x² + x -0 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n18. degree 2 SHOULD FAIL \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "0x² + x -0 = x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n19. degree 5 SHOULD FAIL \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "2x⁵ + x -0 = -7x^5" -# @echo $(B_PURPLE)"\n---------------------------------------------\n20. degree 1 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "2x + x -0 = -7x" -# @echo $(B_PURPLE)"\n---------------------------------------------\n21. degree 1 \n"$(RESET) -# -./$(NAME) $(RUN_FLAGS) "2x + x -3 = -7x" + @echo $(B_PURPLE)"\n---------------------------------------------\n10. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3x² + 2x -7 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n11. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "-3x² + 2x -7 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n12. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "+3x² + 2x -7 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n13. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3x² + 0x -7 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n14. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3x² + 0x -0 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n15. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3x² + 2x -0 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n16. degree 1 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3x + 2x -0 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n17. degree 2 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "3x² + x -0 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n18. degree 2 SHOULD FAIL \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "0x² + x -0 = x" + @echo $(B_PURPLE)"\n---------------------------------------------\n19. degree 5 SHOULD FAIL \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "2x⁵ + x -0 = -7x^5" + @echo $(B_PURPLE)"\n---------------------------------------------\n20. degree 1 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "2x + x -0 = -7x" + @echo $(B_PURPLE)"\n---------------------------------------------\n21. degree 1 \n"$(RESET) + -./$(NAME) $(RUN_FLAGS) "2x + x -3 = -7x" clean: $(RM_OBJS) diff --git a/libft b/libft index de28530..f662d7f 160000 --- a/libft +++ b/libft @@ -1 +1 @@ -Subproject commit de2853025930ac6ea8ff54a12fe089cc3eb777e8 +Subproject commit f662d7f750d555e4be10c3e01399e20bf8cc758b