Various fixes/updates

* Show runtime at termination
* Show # of BR programs executed per second at termination
* Fix various off-by-one errors in evolution.c causing run failures
* Some small improvements to mutation routine
* Improve error logging
* Add -a option to penalize BF program length for entire evolution

Makefile

@@ -22,7 +22,7 @@ DEBUG_FLAGS := -O0 -g3 -fsanitize=address,undefined
 PROFILE_FLAGS := -O0 -g3 $(PROFILE_ENABLE_FLAGS)
 
 CFLAGS := $(INCLUDES) -Wall -pedantic
-.PHONY: clean
+.PHONY: clean all debug profile output_dir x64_dir x86_dir windows_x64 windows_x86
 
 all: CFLAGS += -O3
 all: $(BUILD_OUTPUT)
@@ -61,5 +61,5 @@ windows_x86: $(BUILD_OUTPUT) x86_dir
 	cp $(BUILD_OUTPUT).exe $(X86_DIR)/$(PROGNAME).exe
 
 clean:
-	[ -d $(OUTPUT_DIR) ] && rm -rf $(OUTPUT_DIR)
-	[ -d $(WIN_BUILD) ] && rm -rf $(WIN_BUILD)
+	rm -rf $(OUTPUT_DIR)
+	rm -rf $(WIN_BUILD)

source/bf_utils.c

@@ -53,20 +53,20 @@ char bf_rand_sym(void)
  */
 int bf_rand_syms(char *output, int min_size, int max_size)
 {
- 	int size;
-
- 	if (max_size < 0)
- 	{
-  		size = min_size;
-  	}
- 	else
-  	{
-    	size = randrange(min_size, max_size);
-  	}
-
-   	for (int i = 0; i < size; i++)
-  	{
-    	output[i] = bf_rand_sym();
+    int size;
+
+    if (max_size < 0)
+    {
+        size = min_size;
+    }
+    else
+    {
+        size = randrange(min_size, max_size);
+    }
+
+    for (int i = 0; i < size; i++)
+    {
+        output[i] = bf_rand_sym();
     }
 
     output[size] = 0;

source/common.c

@@ -50,7 +50,7 @@ uint32_t pcg32_rand(void)
  */
 uint32_t randrange(uint32_t low, uint32_t high)
 {
-    return (pcg32_rand() % (high + 1u - low)) + low;
+    return (pcg32_rand() % (high + 1 - low)) + low;
 }
 
 /**
@@ -71,7 +71,7 @@ uint32_t randrange_except(uint32_t low, uint32_t high, uint32_t except)
  */
 float randfloat(void)
 {
-    return ((float)randrange(0u, 10000u)) / 10000.0f; 
+    return ((float)randrange(0u, 10000u)) / 10000.0f;
 }
 
 /**
@@ -115,7 +115,7 @@ void hrsize (size_t size, char *buf, unsigned int bufsize)
 /**
  * @see common.h
  */
-void hrcount (unsigned int size, char *buf, unsigned int bufsize)
+void hrcount (uint64_t size, char *buf, unsigned int bufsize)
 {
     static const char names[NUMNAMES] =
     {
@@ -180,11 +180,36 @@ static void timestamp(char *buf, int bufsize)
     }
 }
 
+uint64_t ms_since_epoch(void)
+{
+#if WINDOWS
+    FILETIME ft;
+    LARGE_INTEGER li;
+
+    GetSystemTimeAsFileTime(&ft);
+    li.LowPart = ft.dwLowDateTime;
+    li.HighPart = ft.dwHighDateTime;
+
+    uint64_t ret = li.QuadPart;
+    ret -= 116444736000000000LL;
+    ret /= 10000;
+
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    uint64_t ret = tv.tv_usec;
+    ret /= 1000;
+    ret += (tv.tv_sec * 1000);
+#endif
+
+    return ret;
+}
+
 /**
  * @see common.h
  */
 void bfi_log(const char* format, ...)
-{ 
+{
     va_list args;
     char tm[32];
 

source/common.h

@@ -72,7 +72,12 @@ void hrsize (size_t size, char *buf, unsigned int bufsize);
  * @param   buf      pointer to location where output should be written
  * @param   bufsize  maximum number of output characters
  */
-void hrcount (unsigned int size, char *buf, unsigned int bufsize);
+void hrcount (uint64_t size, char *buf, unsigned int bufsize);
+
+/**
+ * Gets the number of milliseconds since the UNIX epoch
+ */
+uint64_t ms_since_epoch(void);
 
 /**
  * Logs a formatted string