Added entry for v0.6

If it's equal to half then we want to check if it's divisible, since if
it's half then it is NOT prime.

.gitignore

@@ -2,5 +2,8 @@
 build/*
 !build/.keep
 
+# Ignore documentation
+doc/
+
 # Ignore vim temporary files
 *.sw[a-z]

.gitlab-ci.yml

@@ -17,4 +17,4 @@ build:
     # Cache .o files for faster compiling
     cache:
         paths:
-            - "*.o"
+            - "build/CMakeFiles/indivisible.dir/src/*.o"

CHANGELOG

@@ -16,3 +16,14 @@ Change Log
 	- Algorithm skips half the known primes.
 	- Removed `likely()' and `unlikely()' macros due to lack of information.
 	- Improved performance.
+- v0.4: Fixed Algorithm
+	- Fixed algorithm to actually calculate primes.
+	- Added extra C99 optimizations.
+- v0.5: Minor Changes
+	- Use `size_t' instead of `unsigned long long int'.
+	- Minor optimizations to the algorithm.
+	- Added commandline argument parsing.
+- v0.6: User Control
+	- Allow user to choose base in which the prime numbers are printed.
+	- Give option for primes to be saved to a file upon exit.
+	- Free memory and leave instead of emergency exit.

CMakeLists.txt

@@ -24,10 +24,10 @@ set(SRCS
 
 # Define the C flags.
 set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wextra -Werror -Wfatal-errors -Wmissing-declarations -pedantic-errors")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -O0")
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -O3")
-set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS} -Os")
+set(CMAKE_C_FLAGS_DEBUG "-g -O0")
+set(CMAKE_C_FLAGS_RELEASE "-O3")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3")
+set(CMAKE_C_FLAGS_MINSIZEREL "-Os")
 
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug AND NOT CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 	add_definitions(-DNDEBUG)

TODO.md

@@ -1,15 +0,0 @@
-To-Do
-=====
-A to-do list for the project. Feel free to remove items as you solve them in your pull requests.
-
-Next
-----
-To-do items to do for the next version:
-
-- Profile code to better use `likely()` and `unlikely()` macros.
-
-Features
---------
-Features for future versions (not _Next_) of Indivisible:
-
-- Implement multi-threaded version using OpenCL or OpenMP (whichever works).

src/list.c

@@ -4,11 +4,10 @@
 
 /**
  * This is the number of elements by which the list expands.
- * WARNING: Always use doubles for this number (2^X)
  */
 #define BLOCK_SIZE 1024
 
-void initList(List *l) {
+void initList(List *restrict l) {
 	l->list = malloc(sizeof(mpz_t) * BLOCK_SIZE);
 	if(!l->list) {
 		fprintf(stderr, "Failed to allocate memory to list!\n");
@@ -18,8 +17,8 @@ void initList(List *l) {
 	l->end = 0;
 }
 
-void deInitList(List *l) {
-	for(ulli i = 0; i < l->size; ++i) {
+void deInitList(List *restrict l) {
+	for(size_t i = 0; i < l->size; ++i) {
 		mpz_clear(l->list[i]);
 	}
 	free(l->list);

src/list.h

@@ -1,33 +1,37 @@
+/**
+ * @file list.h
+ * @author Deathsbreed <deathsbreed@themusicinnoise.net>
+ * @brief Code responsible for List management.
+ * @details Code responsible for the definition and management of the
+ * List object.
+ */
 #pragma once
 #include <gmp.h>
 #include <stdbool.h>
 
-#include "types.h"
-
 /**
  * @brief An infinitely expanding list type.
  */
 typedef struct {
 	mpz_t *list; //!< The list of elements
-	ulli size; //!< How many elements are in the list
-	ulli end; //!< The last element of the list (in use)
+	size_t size; //!< How many elements are in the list
+	size_t end; //!< The last element of the list (in use)
 } List;
 
 /**
  * @brief Initialize a List.
  * @details Initialize the list and its variables, allocating memory
- * to the pointer array inside. Returns true on success and false on
- * failure.
+ * to the pointer array inside.
  * @param[in] l A pointer to a List type to be initialized.
  */
-void initList(List *l);
+void initList(List *restrict l);
 
 /**
  * @brief Deinitialize a List.
  * @details Release all memory that has been allocated to the list.
  * @param[in] l A pointer to a List type to be deinitialized.
  */
-void deInitList(List *l);
+void deInitList(List *restrict l);
 
 /**
  * @brief Adds a new item to a List type.

src/main.c

@@ -2,21 +2,76 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <stdbool.h>
+#include <unistd.h>
 #include <gmp.h>
 
 #include "list.h"
-#include "types.h"
+
+#define VERSION "v0.6"
 
 static bool run;
+
+void printUsage(char *progName);
 void leave();
 
-int main(void) {
-	puts("Indivisible v0.2\n");
+int main(int argc, char *argv[]) {
+	bool f_help = false,
+		 f_version = false,
+		 f_quiet = false;
+	int base = 10;
+	char *file = NULL;
+
+	int c;
+	while((c = getopt(argc, argv, "hvqb:f:")) != -1) {
+		switch(c) {
+			case 'h':
+				f_help = true;
+				break;
+			case 'v':
+				f_version = true;
+				break;
+			case 'q':
+				f_quiet = true;
+				break;
+			case 'b':
+				base = atoi(optarg);
+				if(base < 2 || base > 62) {
+					fprintf(stderr,
+							"Invalid base `%d'. Base must be between 2 and 62\n",
+							base);
+					exit(1);
+				}
+				break;
+			case 'f':
+				file = optarg;
+				break;
+			default:
+				printUsage(argv[0]);
+				exit(1);
+		}
+	}
+
+	if(f_help) {
+		printUsage(argv[0]);
+		puts(" -h         print this help information");
+		puts(" -v         print version number of program");
+		puts(" -q         quiet mode");
+		puts(" -b <base>  base in which to print primes between 2 and 62");
+		puts(" -f <file>  file to save primes to");
+		return 0;
+	} else if(f_version) {
+		printf("Indivisible %s\n", VERSION);
+		return 0;
+	}
 
 	// Quit on ^C by setting `run = false'
 	run = true;
 	signal(SIGINT, leave);
 
+	if(f_quiet) {
+		puts("Use Ctrl+C (SIGINT) to exit.");
+	}
+
 	// Primes we've found
 	List primes;
 	initList(&primes);
@@ -28,11 +83,13 @@ int main(void) {
 	// Add 2, a known prime to this list
 	mpz_set_ui(num, 2);
 	addToList(&primes, num);
-	if(mpz_out_str(stdout, 10, num) == 0) {
-		fprintf(stderr, "Could not print to `stdout'!\n");
-		exit(1);
+	if(!f_quiet) {
+		if(mpz_out_str(stdout, base, num) == 0) {
+			fprintf(stderr, "Could not print to `stdout'!\n");
+			goto releaseMemory;
+		}
+		printf("\n");
 	}
-	printf("\n");
 	mpz_add_ui(num, num, 1);
 
 	// Variable for half `num'
@@ -42,9 +99,11 @@ int main(void) {
 	do {
 		// Calculate half of `num'
 		mpz_fdiv_q_ui(halfNum, num, 2);
-		// Loop through found primes
-		// Skip 2 because we're skipping even nymbers
-		for(ulli i = 1; mpz_cmp(primes.list[i], halfNum) >= 0; ++i) {
+		/**
+		 * Loop through primes we've found until we get to half of the number
+		 * we're analyzing
+		 */
+		for(size_t i = 0; mpz_cmp(primes.list[i], halfNum) < 0; ++i) {
 			// If `num' is divisible by a prime then go to the next number
 			if(mpz_divisible_p(num, primes.list[i]) != 0)
 				goto nextPrime;
@@ -52,26 +111,61 @@ int main(void) {
 
 		// `num' is a prime so we add it to the list and print it
 		addToList(&primes, num);
-		if(mpz_out_str(stdout, 10, num) == 0) {
-			fprintf(stderr, "Could not print to `stdout'!\n");
-			exit(1);
+		if(!f_quiet) {
+			if(mpz_out_str(stdout, base, num) == 0) {
+				fprintf(stderr, "Could not print to `stdout'!\n");
+				goto releaseMemory;
+			}
+			printf("\n");
 		}
-		printf("\n");
 
 nextPrime:
 		// Add 2 (skip even numbers since they're all divisible by 2)
 		mpz_add_ui(num, num, 2);
 	} while(run);
 
+	printf("Found %zu primes.\n", primes.end);
 	// Clear GMP variables
 	mpz_clear(halfNum);
 	mpz_clear(num);
+
+	if(file != NULL) {
+		FILE *outFile = fopen(file, "w+");
+		if(outFile == NULL) {
+			fprintf(stderr, "Failed create file `%s'.\n", file);
+			goto releaseMemory;
+		}
+		printf("Writing primes to `%s'...\n", file);
+		puts("0%");
+		for(size_t i = 0; i < primes.end; ++i) {
+			if(mpz_out_str(outFile, base, primes.list[i]) == 0) {
+				fprintf(stderr, "Error occurred while writing to file `%s'.\n", file);
+				goto releaseMemory;
+			}
+			fprintf(outFile, "\n");
+			if(i == primes.end / 4) puts("25%");
+			else if(i == primes.end / 2) puts("50%");
+			else if(i == primes.end * 3 / 4) puts("75%");
+		}
+		if(fclose(outFile) != 0) {
+			fprintf(stderr, "Failed to close file `%s'.\n", file);
+			goto releaseMemory;
+		}
+		puts("100%");
+		puts("Finished writing primes.");
+	}
+
+releaseMemory:
+	puts("Clearing memory...");
 	// Deinitialize the list
 	deInitList(&primes);
+
+	puts("Exit successful.");
 	return 0;
 }
 
-void leave() {
-	puts("Exiting...\n");
-	run = false;
+void printUsage(char *progName) {
+	printf("%s [options...]\n", progName);
 }
+
+void leave() { run = false; }

src/types.h

@@ -1,2 +0,0 @@
-#pragma once
-typedef unsigned long long int ulli;