commit 889c7ab14181c170a4f0cc7def34be72a2f12f5e Author: James Clark Date: Thu Nov 5 17:03:05 2015 +0000 Remove unnecessary rand call commit 6eee5218a1d0a727790df745b07ffc44c14abb11 Author: Anthony Bourached Date: Thu Nov 5 16:54:28 2015 +0000 Added the documentation pdf commit 99c8c6b388573a6d966826bb8a3e2ec1b5049484 Author: Ishita Mathur Date: Thu Nov 5 16:46:02 2015 +0000 Added more comments to test file commit 895cb6ab224c5e46ee8b7e16647551f5b16997bd Merge: 23c43d2 83ccdbc Author: Ishita Mathur Date: Thu Nov 5 16:44:25 2015 +0000 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit 23c43d2109c7d56fd500eac8b01d4f1111acc63d Author: Ishita Mathur Date: Thu Nov 5 16:43:56 2015 +0000 Added more comments to test file commit 83ccdbc2516de96d0a1f6f31e72c8c7070066ae2 Merge: 569f2cd 2ca4679 Author: Anthony Bourached Date: Thu Nov 5 16:41:18 2015 +0000 Merge branch 'master' of bitbucket.org:hpc2015/coursework-2 commit 569f2cd3ef30af499deb0a3c6a59b0371ec8ab70 Author: Anthony Bourached Date: Thu Nov 5 16:40:09 2015 +0000 Added a comment to test_main commit 2ca46794ca332518f916d5830d55d4bf703e7dd6 Merge: 29ccefd f624d2b Author: Zhuowei Si Date: Thu Nov 5 16:39:36 2015 +0000 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit 29ccefd22f5cb23592ce88fdefd1312686f98978 Author: Zhuowei Si Date: Thu Nov 5 16:39:23 2015 +0000 Commits change commit f624d2bd705672333196162a758cdf409e7ae20a Author: Ishita Mathur Date: Thu Nov 5 16:38:40 2015 +0000 Added more comments to test file commit ed0e858a7ab9bbfcfc1f222150168ce944fd9bdd Author: Ishita Mathur Date: Thu Nov 5 16:30:38 2015 +0000 Added more comments to test file commit 54dfbc5094e0c0c054db4782c25c187b37b7adab Author: Ishita Mathur Date: Thu Nov 5 16:20:17 2015 +0000 Added more comments to test file commit 33074c8c9957c9840d0092c181aa41d8109de2d9 Author: Ishita Mathur Date: Thu Nov 5 16:09:42 2015 +0000 Corrected spelling error in comments commit 07007f5fe0bf9f2a1dbc353fd9b77046cba30cca Author: Ishita Mathur Date: Thu Nov 5 16:08:38 2015 +0000 Added more comments to test file commit e951dbf906b7f1849011b75201d56c789147dea3 Merge: b9c6be5 1e2f9ae Author: Zhuowei Si Date: Thu Nov 5 16:04:11 2015 +0000 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit b9c6be51872f0de4e0d3f109fa2c47fb47664d25 Author: Zhuowei Si Date: Thu Nov 5 16:03:33 2015 +0000 Add how to create landscape in README commit 1e2f9aef8c53942b181e53d35d160648aac2e878 Author: Ishita Mathur Date: Thu Nov 5 15:56:15 2015 +0000 Removed unnecessary comment commit 1f14d225cb410415d904834b12c4cca0fa1880ec Author: Ishita Mathur Date: Thu Nov 5 15:53:12 2015 +0000 Added more comments to test file commit ecee83d24d4709662bcee68d63697270ef04bc02 Merge: df3fad6 1970648 Author: Ishita Mathur Date: Thu Nov 5 15:43:24 2015 +0000 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit 1970648170329918d26f8afc5f7dbfb7e57ff5aa Author: Zhuowei Si Date: Thu Nov 5 15:42:01 2015 +0000 Add Reference commit df3fad67de5b8aabca41fa5812e1b9bd8ce4d1d7 Merge: a25d6bd 55ffb20 Author: Ishita Mathur Date: Thu Nov 5 15:41:32 2015 +0000 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit a25d6bd027351dd4a71cb813b679516bb856e6c9 Author: Ishita Mathur Date: Thu Nov 5 15:40:49 2015 +0000 Added some comments to test file commit 55ffb20db2d5744c33a82113fb8bab902045512b Author: Zhuowei Si Date: Thu Nov 5 15:38:30 2015 +0000 Merge the reference into Readme commit 651e69521539ddfe1a671b7233a21815d07a8261 Author: Ishita Mathur Date: Thu Nov 5 15:28:44 2015 +0000 Removed CUnit folder from test folder commit 7151a9ab35c35d881c6a0eba0cbec9855987b9e8 Author: James Clark Date: Thu Nov 5 15:26:25 2015 +0000 Compare float/double to correct type in tests commit a4f3ab6cdc3059187873c8be673e5e4eaf9de141 Author: James Clark Date: Thu Nov 5 15:18:30 2015 +0000 Random number generator seeded with current time commit 5588684f86564a0942a9612d61263c44e2952955 Author: James Clark Date: Tue Nov 3 22:33:35 2015 +0000 Update readme commit b8af8751788ef899771113a3d5c00fd38788aa66 Author: James Clark Date: Tue Nov 3 22:24:24 2015 +0000 remove confusing assert commit 36802de9f452ccc88401922129b4a1324a3a9529 Author: James Clark Date: Tue Nov 3 22:22:06 2015 +0000 add update_simulation test commit 6e82de89f99085501f162f0e2acf1e7bbb1943a6 Author: James Clark Date: Tue Nov 3 22:05:12 2015 +0000 Add return value to update_simulation commit 9785f04f4232cc7f9bf107285db864fa6b4b820f Author: James Clark Date: Tue Nov 3 22:03:01 2015 +0000 Add silent flag commit b9cdd134a7fb5c5b9649690fa44ddffd5dcacdff Author: James Clark Date: Tue Nov 3 21:51:09 2015 +0000 add temp arrays to test file commit 765f9646e56bee6322a46bb0388d4e874eeeade4 Author: James Clark Date: Tue Nov 3 21:32:25 2015 +0000 Remove unused variables commit b223c140023e6b795c13369c680a1fe5e6f71142 Author: James Clark Date: Tue Nov 3 21:31:55 2015 +0000 Avoid uninitialised struct members commit 72fc2342a91319fa2b7d9f7577e445d78d8c2816 Author: James Clark Date: Tue Nov 3 21:31:16 2015 +0000 Make sure reading from files is tested commit a2fa0170e466674c632c6c6d00fc0dffe735dcfe Author: James Clark Date: Tue Nov 3 21:30:12 2015 +0000 Avoid uninitialised struct members commit d9b5e3e8ab0a7c99b7034b2fd6653869de07bff1 Author: James Clark Date: Tue Nov 3 21:17:58 2015 +0000 Updated test values commit e91590d6cb259f1e8ac4b48920fd542404d3ad6d Author: James Clark Date: Tue Nov 3 18:28:50 2015 +0000 Add no output file option commit 9108fb482f6ccd1a3eee06b9ec637fae90855817 Author: James Clark Date: Tue Nov 3 18:17:29 2015 +0000 Add manual timestep interval commit 63a72115e177f1f39a2eb8e2f971e47d8d69ef22 Author: Zhuowei Si Date: Tue Nov 3 17:55:48 2015 +0000 moved should multiply tstep in update_animal commit e281c59be7cd0a75a05178dcb2b91f9eaa638423 Author: James Clark Date: Tue Nov 3 17:46:31 2015 +0000 Make landscapes folder commit e93f2501e2e4aeb3faca15866f49b532d95716a3 Author: James Clark Date: Tue Nov 3 17:44:19 2015 +0000 update tests commit d1f4098a3fe8018fe8bf79eb2957782bfca24c72 Author: James Clark Date: Tue Nov 3 17:43:45 2015 +0000 Add old output on make clean commit 230e2e389d770dcb911456f3ad879628308f0514 Author: James Clark Date: Tue Nov 3 17:25:31 2015 +0000 Change the rgb_hill_function to give an integer commit ef31ac7318dc6fb258333582cc4daa0360600645 Author: James Clark Date: Tue Nov 3 17:19:11 2015 +0000 Use global variables for test to avoid unnecesary allocs/frees commit b10c29f8c081b729e0e99c4a737bd918cc75d1a0 Author: James Clark Date: Tue Nov 3 17:06:23 2015 +0000 Change value_input to use pointers commit bce6a7b8ced228a9d5b0ec7f06cf7ff74b3f2a20 Author: James Clark Date: Tue Nov 3 16:44:38 2015 +0000 Make outputs folder if it doesn't exist commit 1f0a42aeb550ecc46909361d74fdc2dc47e6514a Author: James Clark Date: Tue Nov 3 16:39:40 2015 +0000 avoid commiting binaries commit 359ca37890ecb2b44a169af572ee0ce81bba408a Merge: 435a1df 738fe88 Author: James Clark Date: Tue Nov 3 16:38:43 2015 +0000 Merge branch 'master' of bitbucket:hpc2015/coursework-2 commit 738fe8891a4a6df0fccfc1609d1a0498c2660968 Author: Zhuowei Si Date: Tue Nov 3 16:38:47 2015 +0000 .population.c.swp deleted online with Bitbucket commit 435a1df380484f45719010b982ac47051ba9b704 Author: James Clark Date: Tue Nov 3 16:38:16 2015 +0000 Move verbose assignment commit 884d401b30958ac625667731e0c1751bb8dccdda Author: Zhuowei Si Date: Tue Nov 3 16:38:11 2015 +0000 The density range should be 0-5 commit 663376e3abb4dc1d31a72698bfd0d770bad3bb52 Author: Zhuowei Si Date: Tue Nov 3 11:47:46 2015 +0000 Add part test for test_value_input() commit 8f28c75d3635bd04ee95966d62d7e80d235b8522 Author: Zhuowei Si Date: Tue Nov 3 11:13:46 2015 +0000 Other two functions need to be tested commit 631b9f61110c9772b21e333273bd2fec17ce8206 Author: Zhuowei Si Date: Tue Nov 3 11:08:51 2015 +0000 Put all outputs ppm pic into file outputs commit 40699be63f1b0dc38359a2afb35210f6aa752171 Author: Ishita Mathur Date: Tue Nov 3 04:49:19 2015 +0000 Added test for rgb_hill_function() commit 5ef0b0b4ee6b5565838e11ea10fe93d013780751 Author: Ishita Mathur Date: Tue Nov 3 04:17:29 2015 +0000 Removed accidental second occurrence of test_boundary_detect() commit c9ee88e6381ee7476c50955f7a709b08402efa49 Author: Ishita Mathur Date: Tue Nov 3 04:08:10 2015 +0000 Added test for inputs_detect() commit 9da1119f89517d1abf2c313d9923de48af36a9e1 Author: Ishita Mathur Date: Tue Nov 3 03:38:00 2015 +0000 Added test for density_initialse() commit 93cee6675b0394e6c70fe76bf54fa9050b5ba5bd Author: Ishita Mathur Date: Tue Nov 3 01:49:52 2015 +0000 Modified test for get_neighbour_count() commit 46250a0e2de35dc56317593fba65c7967f269356 Merge: 306d991 b7e108d Author: James Clark Date: Tue Nov 3 01:09:41 2015 +0000 Merge branch 'master' of bitbucket:hpc2015/coursework-2 commit 306d991a46270c9a4485b4ddb801ac79db5fe13e Author: James Clark Date: Tue Nov 3 01:05:20 2015 +0000 Close landscape file commit c116450c9fecd0681922c5eb77b1c9ad0ba8b1d7 Author: James Clark Date: Tue Nov 3 00:58:47 2015 +0000 Use function name rather than test name in test file commit 843bfee356dd250562cdb9898d3d4acdc3a2bd6c Author: James Clark Date: Tue Nov 3 00:58:10 2015 +0000 Add hill function to tests commit cb93dcf00aee5780cf8f8fb1de36c67787ffcc8d Author: James Clark Date: Tue Nov 3 00:56:33 2015 +0000 Added a hill function to make sure the rgb values printed are always consistent commit b7e108dcffe85f428c86bb7c684d637b8327d8fb Author: Ishita Mathur Date: Tue Nov 3 00:52:33 2015 +0000 Added test for get_neighbour_count() commit d2e568a4d52cd18fb2c4e6fd85937c6a958eb276 Author: Zhuowei Si Date: Mon Nov 2 18:31:34 2015 +0000 Some modification commit 337b8f559491d8b13b24aff5a9199788c8bc7e45 Merge: 55398a7 cfe22ed Author: Zhuowei Si Date: Mon Nov 2 18:24:44 2015 +0000 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit 55398a76276d37f2ae4aa5edfd9d0db3cacd1377 Author: Zhuowei Si Date: Mon Nov 2 18:24:19 2015 +0000 Make print landscape & parameters a function commit cfe22ed6c284ab983171c7edbd81564e66cb2da8 Author: James Clark Date: Mon Nov 2 17:37:19 2015 +0000 Add update_animal test commit 713ced808dbcea44b31448ff47a45e4f690e1701 Author: James Clark Date: Mon Nov 2 17:36:45 2015 +0000 Fail tests that are not implemented commit 1583d1b86193b4b329c1295ba3a4b236ccf80c28 Author: James Clark Date: Mon Nov 2 16:50:33 2015 +0000 reset_animal doesn't exist anymore commit be0f51302376eaf9733c0cc05f16660da00c9228 Author: James Clark Date: Mon Nov 2 16:47:44 2015 +0000 re: 0b31d3d. Actually make all the changed I meant to... commit 0b31d3da3ba2768a098da4b2aae1a2dcdaf33605 Author: James Clark Date: Mon Nov 2 16:46:15 2015 +0000 Update boundary checking commit dd48b5b816eef2bcb2437b9f8d30b4a72ed5f3ec Author: James Clark Date: Mon Nov 2 16:45:19 2015 +0000 Fix some indentation commit 06ac83e08b8ef2b474ef1dfdb8f33f4313f6cd06 Author: James Clark Date: Mon Nov 2 16:43:44 2015 +0000 Change expected values in test_boundary_detect commit f8f7492f1c7c96594bb07e40e96076a205f6d999 Author: James Clark Date: Mon Nov 2 16:40:47 2015 +0000 Fix small typo in test_ptr_swap commit 3a15e4e3d66c980692eeab594f4f34ed010b62a2 Author: James Clark Date: Mon Nov 2 16:39:44 2015 +0000 Actually run the tests that were written... commit 7078f23b9690e7fd52e34ec50487976fc8f847ab Author: James Clark Date: Mon Nov 2 16:38:08 2015 +0000 Add write_rgb test commit dea13988b72c7a660b3e3868f92b5be478a0cb59 Author: James Clark Date: Mon Nov 2 16:37:30 2015 +0000 Add global variables for tests commit 6b6f310304e92e547d0441bc1c628569ba8465bf Author: James Clark Date: Mon Nov 2 16:36:26 2015 +0000 Add ptr_swap test commit 37b01cee7ac036a11c21d520ede7233d8e05c5ed Author: James Clark Date: Mon Nov 2 16:35:06 2015 +0000 Add function names to test string commit 530b6760925a92d47fd3b73aa38b5760337389a9 Merge: c6fa00c 2da8062 Author: James Clark Date: Mon Nov 2 16:29:16 2015 +0000 Merge branch 'master' of bitbucket:hpc2015/coursework-2 commit c6fa00cbb020b9026e66cb52519070486a3d38e6 Author: James Clark Date: Mon Nov 2 16:28:08 2015 +0000 Move libraries in makefile commit 2da80629367d4a6e8ff4a1a45f4b3adbfed2c6d6 Merge: 63519f6 a3ab686 Author: Zhuowei Si Date: Mon Nov 2 16:10:12 2015 +0000 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 Make read config file into a new function commit 63519f61583e6baff2b318319339bf7ac7e80b11 Author: Zhuowei Si Date: Mon Nov 2 16:09:09 2015 +0000 Make reading config file a new function commit 52719174c843aa35e91a51245d70580e2a4e7fbf Author: Zhuowei Si Date: Mon Nov 2 16:07:54 2015 +0000 Make reading config file a new function commit a3ab6869f0d8f64b9d3213f1a72c8ec47363fb0e Author: Zhuowei Si Date: Mon Nov 2 15:42:16 2015 +0000 file.dat deleted online with Bitbucket commit 57c96f50c73a3db957e7db71c4e92ab43f308801 Author: Zhuowei Si Date: Mon Nov 2 15:41:33 2015 +0000 Realise the inputs check function commit 409e552989970f23b346fd4321c72cb905923ea8 Author: Zhuowei Si Date: Mon Nov 2 15:13:29 2015 +0000 User inputs values check function commit 78eddebe984124e125431b79c07021ff173dcbbd Author: James Clark Date: Mon Nov 2 03:34:05 2015 +0000 Update parameter initialisation commit 360e6311fbd60b4b889ec0e06aa95a1615a2867e Merge: a9006b0 02d50c2 Author: James Clark Date: Mon Nov 2 03:31:10 2015 +0000 Merge branch 'master' of bitbucket:hpc2015/coursework-2 commit a9006b09b21067a308289d4f0571fa3e1760d7af Author: James Clark Date: Mon Nov 2 03:30:37 2015 +0000 Initial documentation in README commit 02d50c287cee423dba625eca826b8954d279e843 Author: Ishita Mathur Date: Sun Nov 1 23:40:54 2015 +0000 Added 'outer' to variable declaration commit 396865d86e4237c30d826fdb115648bd1ef521cb Author: James Clark Date: Sun Nov 1 22:04:24 2015 +0000 Run tests after compilation commit 5760fafd8c72b3f753b31bb41169f532d9f8fda7 Author: James Clark Date: Sun Nov 1 21:52:16 2015 +0000 Update makefile commit e2fd2f6e06f194bdbfdeebcd7b58244641824580 Author: James Clark Date: Sun Nov 1 21:50:13 2015 +0000 Add default to makefile commit 4a150cb2a2e36cd73eb2820267d5cd8c6f6f7211 Author: James Clark Date: Sun Nov 1 21:23:14 2015 +0000 Add return value to write_rgb commit 2a1c80674f8b93907c0fb231905c1e41397d1e21 Author: James Clark Date: Sun Nov 1 20:32:46 2015 +0000 Add return value to write_rgb commit 4c0bfc445efc73da01e6db9a335a998ec3698958 Author: James Clark Date: Sun Nov 1 20:12:25 2015 +0000 Update test file commit 41383d36cddfcf665b0469d9293c68039f5176a9 Author: James Clark Date: Sun Nov 1 20:09:46 2015 +0000 Remove unused include commit f06f213904bd95c66aa2f20ff4cb5c8fd265b681 Author: James Clark Date: Sun Nov 1 20:08:37 2015 +0000 Moved functions for tests and updated Makefile commit bffa213055efc4b969694dc59334a37080148e81 Author: James Clark Date: Sun Nov 1 19:48:36 2015 +0000 Random number additions commit 257873e1af721a62f5699204120f03e9f92891ce Author: James Clark Date: Sun Nov 1 19:23:39 2015 +0000 Fixed random numbers commit 242781a88aaaf87d25c49aba670f80d9db1aca74 Author: Zhuowei Si Date: Sun Nov 1 17:46:03 2015 +0000 Add some commits commit 4f975b07e1fd3d9fbe2f4870ed56e75daedf6966 Author: Zhuowei Si Date: Sun Nov 1 16:21:46 2015 +0000 Move density initialzation into a new function commit 7732865b4d16d85fea1200af0f78e2602f5d5b2e Author: James Clark Date: Sun Nov 1 15:57:43 2015 +0000 Added config file reading and verbose printing commit 8bb1a46cab1c1a931fa62d7867a5815ce460a447 Author: James Clark Date: Sun Nov 1 15:56:30 2015 +0000 Makefile updated with animation commit fb8f7bcb1a049852d500f17ee228fdb4b4961503 Merge: 54150d9 31a21fa Author: James Clark Date: Sun Nov 1 15:53:24 2015 +0000 Merge branch 'master' of bitbucket:hpc2015/coursework-2 commit 31a21fa0fef9831499d5903c09dc34bc14569d16 Author: Zhuowei Si Date: Sun Nov 1 14:36:38 2015 +0000 README.md edited online with Bitbucket commit fe3a146ce0ea0fed8d70b9d10607453845c05b38 Author: im94 Date: Thu Oct 29 05:08:28 2015 +0000 Added CUnit Header files and unit test outline commit 54150d9c0a30ef9a76d3eca866cd8523219eb2ff Author: James Clark Date: Wed Oct 28 01:21:19 2015 +0000 Pointers not needed in these functions commit 83a819f1daa3dfd17587c0ba1fc73de26c770186 Author: James Clark Date: Wed Oct 28 01:02:12 2015 +0000 Remove print from makefile commit 5b43fb25362439f3d275ae81cf383f5c1ead72b0 Author: James Clark Date: Wed Oct 28 00:21:15 2015 +0000 Modified update functions commit 7906e8562c55688026351a7e360abd94a0ce1212 Author: Ishita Mathur Date: Wed Oct 28 00:02:59 2015 +0000 Rearrange code commit 957b45bf579d70d082d6dbc4223371dcb100ac0e Author: Ishita Mathur Date: Tue Oct 27 23:58:20 2015 +0000 Change parameter struct in perparation for refactor commit e3d5edfcb942457de3d667313572e7db4999f03d Author: Ishita Mathur Date: Tue Oct 27 23:00:01 2015 +0000 Move pointer swap commit 5140d93d397e19ed88f259a7f1bf5a0af81734c5 Author: Ishita Mathur Date: Tue Oct 27 22:51:27 2015 +0000 Moving source files for better organisation commit 4116b71845893277ddb89acb2bd87de33fb59d88 Author: James Clark Date: Tue Oct 27 22:32:00 2015 +0000 No need to update when landscape is 0 commit e8ebdf72b20e0333ade1c43bf1f8a4ca6d055b65 Author: James Clark Date: Tue Oct 27 19:06:29 2015 +0000 Use command line arguments in code commit 7e7a0e37bf9d609cb141e9f0e480f12ac4e27432 Author: James Clark Date: Tue Oct 27 19:02:16 2015 +0000 Parse command line arguments commit fd282fee9031ef71219c48fdb074e8e28f4b0108 Author: James Clark Date: Tue Oct 27 19:00:17 2015 +0000 Remove unused variables commit 3c87b0e765bb61f45807ea0789580160915c0ba0 Author: James Clark Date: Tue Oct 27 18:58:35 2015 +0000 Added argp library and initial code commit 00591c3bbb03133fe0b4f7f6560dbfc187c75fb3 Author: James Clark Date: Tue Oct 27 18:43:01 2015 +0000 Remove manual inputing of variables This is in preparation for loading from a config file commit cdd93c6d1a74e41f2a6f15f239d68ff89a3e5d3b Author: James Clark Date: Sun Oct 25 23:19:53 2015 +0000 Fix warnings of function declaration commit bb3b4af29ea0bb366947a5317fc07d97b62ffe6f Author: James Clark Date: Sun Oct 25 23:19:39 2015 +0000 Fix warnings of incompatible pointers on compilation commit cada36a19bdecd639ca1671e741c898161450c1d Author: James Clark Date: Sun Oct 25 22:41:09 2015 +0000 Add documentation to some functions commit e9933ce0eca80d6b6ff70ea34ddc772eec171baf Author: Zhuowei Si Date: Sun Oct 25 21:15:15 2015 +0000 Add landscape boundary checking function commit 6e0bb43fde46ea72180905c7eec9f833ed263c46 Author: James Clark Date: Sun Oct 25 20:44:09 2015 +0000 Add rgb and density function commit 61c252bee4ff1dcda66af3593d5c3e3831e66ee3 Author: James Clark Date: Sun Oct 25 20:15:04 2015 +0000 Add update_simulation function commit f07dfbf42efc732c5810a3643763accab6e481ca Author: James Clark Date: Sun Oct 25 19:48:49 2015 +0000 Add animal struct commit 51f76bbb8fbdb09b445f3ab934f8d072739c366b Author: James Clark Date: Sun Oct 25 19:38:45 2015 +0000 Add struct for parameters commit 3cd4092b9e974caacc578d02b3b1abc1ee7d6920 Author: James Clark Date: Sun Oct 25 19:28:03 2015 +0000 Add timing using OpenMP timing functions commit 2de6445c3a79539b1e3683ebeeffc9e3be4bb2aa Author: James Clark Date: Sun Oct 25 19:22:38 2015 +0000 Add some comments and fix swap function commit 0f030e1ead169bfca1af116042a0d6ad9abaa2cf Author: James Clark Date: Fri Oct 23 01:43:13 2015 +0100 Revert "Revert "Added pointer swap to swap between density and temp density arrays"" This reverts commit e8f605410e0c834c655e78ab34ac675c5b3fe495. commit e8f605410e0c834c655e78ab34ac675c5b3fe495 Author: James Clark Date: Fri Oct 23 01:41:59 2015 +0100 Revert "Added pointer swap to swap between density and temp density arrays" This reverts commit ae06f7e11027a361cc8cdb6c91938837d5420417. commit ae06f7e11027a361cc8cdb6c91938837d5420417 Author: James Clark Date: Fri Oct 23 01:38:12 2015 +0100 Added pointer swap to swap between density and temp density arrays This saves time because rather than iterating over all values in the array, only the addresses have to be changed. I think this happens every 2nd loop. Will double check this! commit 2b988bcd2c0a2c6e8eb490f7e8244cac9eca59f8 Author: James Clark Date: Fri Oct 23 01:33:21 2015 +0100 Change while loop to for loop and other misc cleanups - Changing to a for loop allows us to do things like if (outer % 10) printf(...); - Changed the file name generation to a single sprintf - Changed some doubles being set to 0 (an integer) commit 364e0361e4a5a2eaf264b6ea4c74ac7dcf3007b2 Author: James Clark Date: Fri Oct 23 00:12:51 2015 +0100 Moved all variable declarations to the beginning of main commit 1e3ec4077a64d4048cb69af0d944097926529cc7 Author: James Clark Date: Thu Oct 22 21:56:48 2015 +0100 Replace my allocation with code provided commit e9df2592abeac2b3115ea7c7f3a3c02db91b2e3e Author: James Clark Date: Thu Oct 22 21:34:02 2015 +0100 Turn neighbour count in to function for easy testing commit fa8acc530044f4ea6b176b88a51d687837115b18 Author: Zhuowei Si Date: Thu Oct 22 15:47:34 2015 +0100 Modeify the mistake in calculating new densities commit 901be689ed98654f06dda2aa27419faf6cb88c7c Author: Zhuowei Si Date: Thu Oct 22 11:43:15 2015 +0100 main.c can produce PPM file now commit 8fa9814d89a6f602d0a4942242a0482c1195e649 Author: James Clark Date: Wed Oct 21 14:50:16 2015 +0100 Added functionality to load in file from command line args commit 2f8e306f66c5725fdd5a755714a0c3b758d3ef44 Author: Zhuowei Si Date: Wed Oct 21 12:26:09 2015 +0000 main.c with basic implementation of the equations, needs to be tested commit fe4f5fd9976c351e334904282c33da822e4d9ae5 Author: James Clark Date: Wed Oct 21 12:52:21 2015 +0100 Add comments to the allocation commit ca61533ef18cd154a934ef7a11a6bcc8ed00c433 Author: James Clark Date: Wed Oct 21 12:44:21 2015 +0100 Add landscape to malloc check and return on error commit c1d55eb8bfca9dd9f3918c215b8c1cc7bb43a4d2 Author: James Clark Date: Wed Oct 21 12:40:33 2015 +0100 Use calloc instead of malloc and fix landscape free This means memset does not need to be called as the memory is set to zero during allocation. Also remember to free landscape commit f32104039c5e95319ff0d6e4b68f595dde617131 Author: James Clark Date: Wed Oct 21 12:35:01 2015 +0100 Fix typo of J and P commit 59483273130e282eb65795dc9be0cfea55480026 Author: James Clark Date: Wed Oct 21 12:34:16 2015 +0100 Dynamic allocation for landscape commit 7b76d04180ce92a3efef633f65c05d0d85613081 Author: James Clark Date: Wed Oct 21 12:31:51 2015 +0100 Removed extra commas in fprintf commit 07aee18b353d95852175e7e01b87104705a98110 Author: James Clark Date: Wed Oct 21 12:29:46 2015 +0100 Added dynamically allocated arrays for H,P and randomArray commit 18b11282feb44c7ba7a5194977ce6067fa2b3845 Author: James Clark Date: Wed Oct 21 11:35:30 2015 +0100 re: fd3cbbb Add new executable to gitignore commit fd3cbbb550fed4cbb8e13b12bd8374a5e3ddf91c Author: James Clark Date: Wed Oct 21 11:34:22 2015 +0100 Add new executable to gitignore commit 5b297fb997fc7479713a037d98ea076e475dc5a6 Author: James Clark Date: Wed Oct 21 11:32:16 2015 +0100 Rewrote header file include statements Now using system header files, fixes compilation problems (at least) on Linux/GCC5. Including ranlux.h instead of ranlux.c, fixes linking issues commit 0a7c36edcf3d8f915d58eb456283caff007aa1e8 Author: James Clark Date: Wed Oct 21 11:27:22 2015 +0100 Adding string.h to pnmreader.c to avoid compilation warnings commit 11b9d4fafd9865b77750327e9b0d8681cd99d6bc Author: James Clark Date: Wed Oct 21 11:25:39 2015 +0100 Updated Makefile commit e152c1780d72bd6f49fe0405dd29091b9e922c65 Author: Zhuowei Si Date: Tue Oct 20 23:36:49 2015 +0100 New main.c with basic Inputs and Implements commit 8da31b1c22d871ebf09e29c54bf1ebe61713a420 Author: Zhuowei Si Date: Tue Oct 20 21:00:43 2015 +0100 wrong upload :( commit adc663876b6a8e1870ce35191c74decb388c9e30 Author: Zhuowei Si Date: Tue Oct 20 20:55:03 2015 +0100 generate the basic landscape commit ec30172555f51a8cb340460a9fdd6aaa3f79f2d6 Author: Zhuowei Si Date: Tue Oct 20 20:52:01 2015 +0100 New main.c with basic inputs commit 89a6cd891d74408af510b5f57b103c5a5103f7b2 Author: Zhuowei Si Date: Tue Oct 20 20:34:45 2015 +0100 Basic function of inputs commit 36115694d6fd32458864bbcc7dce289ba3f61769 Merge: e1ad93e d4c36ba Author: Zhuowei Si Date: Tue Oct 20 20:22:18 2015 +0100 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit d4c36babb6d31f8ac7eef0c452296bec9fce4565 Author: Anthony Bourached Date: Mon Oct 19 15:57:30 2015 +0100 Added code to print out random numbers in main commit 0d2bf2da0359b2ed06ab552a1fdcaa4f0a836558 Author: James Clark Date: Mon Oct 19 15:35:19 2015 +0100 added initial gitignore file commit 3d6e200f5124f79ed53c7e0e0329e36cd6feeeb8 Author: Anthony Bourached Date: Mon Oct 19 15:32:40 2015 +0100 Added folder documentation with documentation on our random number generator commit 0c07eb215c3d0c8a1f7963c4740ce8b43c5d5fe1 Author: Anthony Bourached Date: Mon Oct 19 15:22:26 2015 +0100 Added include ranlux to main.c commit 1e7bc4fde1d226225a1170c7253278424728f722 Merge: 540787a 6c5a9d9 Author: Anthony Bourached Date: Mon Oct 19 15:17:51 2015 +0100 Merge branch 'master' of bitbucket.org:hpc2015/coursework-2 commit 540787a9b82f153dc9b8c00a3307841b109b0821 Author: Anthony Bourached Date: Mon Oct 19 15:16:19 2015 +0100 Added ranlux.c and ranlux.h for random number generation commit 6c5a9d9db4bc8b41cb427f1f4fa7a77a5d0c2fc8 Author: James Clark Date: Mon Oct 19 15:02:42 2015 +0100 added initial main.h commit a61542e5b7c3d645f11e149151666bdc3e8b0938 Author: James Clark Date: Mon Oct 19 14:53:20 2015 +0100 Initial C code in main commit ac2dd7f18352974a86afed993817fcf2c63fc5f5 Author: James Clark Date: Mon Oct 19 14:52:35 2015 +0100 Initial Makefile for build tools commit e1ad93ed8bd6b9bd8bc8c4e38ddc0e283b67f263 Merge: a3063d7 c09e7d0 Author: Zhuowei Si Date: Mon Oct 19 14:52:32 2015 +0100 Merge branch 'master' of https://bitbucket.org/hpc2015/coursework-2 commit a3063d73bdf8a16b14fa4ce1a0288e9c95cfc56c Author: Zhuowei Si Date: Mon Oct 19 14:49:45 2015 +0100 Test again commit c09e7d0794844c0a3c39d892c3d3c270cbf65285 Author: Anthony Bourached Date: Mon Oct 19 14:47:40 2015 +0100 Here's our main program (it's empty so far) commit 20df5038734d0cb679039829e836fa07bcdc4ff7 Author: Ishita Mathur Date: Mon Oct 19 13:38:39 2015 +0000 contributors.txt edited online with Bitbucket commit a27749a628b508da82725e4ecda3881e17c5db86 Author: Ishita Mathur Date: Mon Oct 19 13:36:08 2015 +0000 contributors.txt edited online with Bitbucket commit 870d979f8bc987482ff8d79509aaee50d77d557e Author: James Clark Date: Mon Oct 19 14:33:12 2015 +0100 Added name to contributors to check git config commit 71a409956c8c1a2f170b10dc0f32441319bffbe6 Author: Zhuowei Si Date: Mon Oct 19 14:09:28 2015 +0100 Initial commit with contributors