Skip to content

Hmm has branching changed? #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiaranMcCann wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Hmm has branching changed? #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ac08c0
Hmm has branching changed?
CiaranMcCann Oct 22, 2012
ed19522
Benchmarking stuff
Nov 16, 2012
7a3b49a
Removed executables and objects
Nov 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
float const WindowHeight = 800.0f; /*!< The height of the window to create. */
float const WindowWidth = 800.0f; /*!< The width of the window to create. */

#define GRID_ROWS 500 /*!< The number of rows in the grid. */
#define GRID_COLUMNS 500 /*!< The number of columns in the grid. */
#define GRID_ROWS 2000 /*!< The number of rows in the grid. */
#define GRID_COLUMNS 2000 /*!< The number of columns in the grid. */
#define CYCLES_PER_FRAME 1 /*!< The number of cycles which must complete before an update occurs. */

#define N_SHARKS 100 /*!< The initial number of sharks. */
Expand All @@ -19,6 +19,6 @@ float const WindowWidth = 800.0f; /*!< The width of the window to create. */
#define SHARK_STARVERATE 6 /*!< The number of updates which must occur before a shark will die of starvation. */

#define DRAW_GRID 0 /*!< Whether the grid should be drawn or not. */
#define SIMULATION_LENGTH 20 /*!< The number of seconds to run for, when benchmarking. */
#define SIMULATION_LENGTH 10 /*!< The number of seconds to run for, when benchmarking. */

#endif
34 changes: 12 additions & 22 deletions Performance_data.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
Rows: 500
Columns: 500
Rows: 2000
Columns: 2000
Threads: SERIAL
19
34
33
32
30
30
29
28
28
28
27
27
26
27
26
27
26
27
26
27
21
10
7
5
5
4
4
4
4
4
Binary file removed Wator
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions World.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*! \file World.h
* \brief A file containing all functions for the world
*/

#ifndef WORLD_H
#define WORLD_H

Expand Down
Binary file removed main.o
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@

make clean
make
./Wator &
./Wator
cat Performance_data.log