From a3cf6887872166cba8a5a93504a6d282e53e0cdd Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Tue, 1 Dec 2020 15:19:59 -0600
Subject: [PATCH] cleaning up files

---
 build.sh                           |  3 --
 doc/plan                           |  2 +-
 dummy.settings => explain.settings |  0
 project.4coder                     | 45 ------------------------------
 speed_test.settings                | 36 ++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 49 deletions(-)
 delete mode 100755 build.sh
 rename dummy.settings => explain.settings (100%)
 delete mode 100644 project.4coder
 create mode 100644 speed_test.settings

diff --git a/build.sh b/build.sh
deleted file mode 100755
index 05b9f6a..0000000
--- a/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-make clean all
\ No newline at end of file
diff --git a/doc/plan b/doc/plan
index ca1d60e..f48bccb 100644
--- a/doc/plan
+++ b/doc/plan
@@ -1,4 +1,4 @@
 Things needed to create the initial sequential version:
 	- Rendering a circle
 	- Rendering many circles (instanced rendering)
-	- 
\ No newline at end of file
+	- 
diff --git a/dummy.settings b/explain.settings
similarity index 100%
rename from dummy.settings
rename to explain.settings
diff --git a/project.4coder b/project.4coder
deleted file mode 100644
index 30def96..0000000
--- a/project.4coder
+++ /dev/null
@@ -1,45 +0,0 @@
-version(1);
-
-project_name = "CSC718_Project";
-
-patterns = {
-"*.c",
-"*.cpp",
-"*.h",
-"*.sh",
-"*.glsl",
-"*.4coder",
-"Makefile",
-};
-
-blacklist_patterns = {
-"*.git",
-};
-
-load_paths_custom = {
- {"."},
-};
-
-load_paths = {
-	{ load_paths_custom, .os = "linux" },
-};
-
-command_list = {
-    { .name = "build",
-      .out  = "*compilation*",
-	  .footer_panel = true,
-	  .save_dirty_files = true,
-	  .cursor_at_end = false,
-	  .cmd = { { "./build.sh", .os = "linux" } },
-	},
-	{ .name = "run",
-      .out = "*run*",
-      .footer_panel = true,
-      .save_dirty_files = false,
-      .cursor_at_end = true,
-      .cmd = { { "./sim", .os = "linux" } },
-    }
-};
-
-fkey_command[5] = "build";
-fkey_command[6] = "run";
\ No newline at end of file
diff --git a/speed_test.settings b/speed_test.settings
new file mode 100644
index 0000000..6ce957b
--- /dev/null
+++ b/speed_test.settings
@@ -0,0 +1,36 @@
+# Adjust the thread count here.
+# Note, that for the pthread version of the program (./sim), this must be
+# at least 2, since the pthread version splits different work between at
+# least 2 different threads.
+# The sequential version (./sim_seq) is not affected by this setting.
+thread_count 4
+
+body_count 4000
+body_type_count 4
+body_color 0 1.000000 0.000000 0.000000
+body_color 1 0.000000 1.000000 0.000000
+body_color 2 0.000000 0.000000 1.000000
+body_color 3 1.000000 1.000000 1.000000
+body_mass_range 0 4.000000 6.000000
+body_mass_range 1 4.000000 6.000000
+body_mass_range 2 4.000000 6.000000
+body_mass_range 3 4.000000 6.000000
+friction 6.000000
+near_repulsive_force 100.000000
+universe_scale 20.000000
+interaction 0 0 6.571008 93.585510
+interaction 0 1 5.113249 8.085373
+interaction 0 2 6.926418 94.550446
+interaction 0 3 6.511862 -55.279800
+interaction 1 0 4.021953 119.258820
+interaction 1 1 6.973307 198.194061
+interaction 1 2 5.498415 12.963989
+interaction 1 3 4.898501 118.944519
+interaction 2 0 6.477647 -21.892441
+interaction 2 1 5.874678 115.875519
+interaction 2 2 5.877005 -176.505890
+interaction 2 3 5.706183 -4.952164
+interaction 3 0 4.521145 -71.464767
+interaction 3 1 5.963416 -90.654907
+interaction 3 2 5.246637 62.910187
+interaction 3 3 4.313733 -90.980698
-- 
2.25.1