Commit graph

66 commits

Author SHA1 Message Date
Fabien
00c6731815 add profit 2013-07-18 01:14:36 +02:00
Fabien
2c1f7d4b41 Adding average profit 2013-07-18 00:33:43 +02:00
EEva
f685ff89a6 Adding zmap 2013-07-17 23:58:24 +02:00
EEva
796d085aca BMODEL + 1 2013-07-17 21:12:45 +02:00
EEva
2cffacd388 fixing strategy 2013-07-17 21:12:38 +02:00
EEva
a9a8fa2124 merge 2013-07-17 20:30:56 +02:00
mmoriame
095691f935 adding correction 2013-07-17 20:26:38 +02:00
EEva
184a2e008d merge 2013-07-17 20:23:15 +02:00
mmoriame
dde9b40764 adding age again 2013-07-17 20:19:43 +02:00
mmoriame
f1def5afc1 adding age of the hive 2013-07-17 20:11:33 +02:00
EEva
04a5c2ece2 new model 2013-07-17 19:10:41 +02:00
EEva
4763ad436f Fixing collective strategy 2013-07-17 19:09:00 +02:00
EEva
c6559c220c Fixing 2013-07-17 19:00:55 +02:00
Fabien
dea74c75ed strategy button filled 2013-07-17 18:41:57 +02:00
Fabien
7bb80721f2 Merge branch 'master' of https://github.com/mpo-csss/beedza
Conflicts:
	Source/main.nlogo
2013-07-17 18:40:39 +02:00
Fabien
749e7c17d7 Adding strategies 2013-07-17 18:38:04 +02:00
mmoriame
69552b753f adding color to bee-keeper 2013-07-17 18:37:37 +02:00
Fabien
f816edfe9d Merge branch 'master' of https://github.com/mpo-csss/beedza 2013-07-17 18:37:07 +02:00
Fabien
2c1d9710ba Adding strategy chooser 2013-07-17 18:36:47 +02:00
mmoriame
f9e3b0f276 adding bee-keepers in centroid 2013-07-17 18:06:53 +02:00
mmoriame
4413649e21 adding bee-keepers 2013-07-17 17:36:04 +02:00
EEva
2f2eaff0d9 useless comment 2013-07-17 17:32:08 +02:00
EEva
ea76a6fcdb Updated GIS 2013-07-17 17:31:38 +02:00
EEva
f65708f28e Adding yearly seasons 2013-07-17 17:17:09 +02:00
EEva
31265af4fb Adding seasons 2013-07-17 16:10:47 +02:00
Fabien
1c2d6106e4 Merged 2013-07-17 13:58:52 +02:00
EEva
2e8d9d0945 Adding sources of GIS in comments 2013-07-17 12:19:42 +02:00
EEva
f3789c4162 Changing display color (it's free) 2013-07-17 12:14:32 +02:00
EEva
de7593936d Putting up together again the main file 2013-07-17 11:56:02 +02:00
EEva
19328f57c5 Rerestructuring (and cleaning) 2013-07-17 11:37:55 +02:00
EEva
1d814b0ca1 Restructuring (2nd pass) 2013-07-17 11:33:47 +02:00
EEva
5da047679f Structuring 2013-07-17 11:12:09 +02:00
EEva
65b17e7bf0 Commenting 2013-07-17 11:07:51 +02:00
EEva
021e75a90f Adjusting a slider (for the cost of travelling) 2013-07-17 07:48:46 +02:00
EEva
6bb81a48ee Putting together model v 2013-07-17 01:08:21 +02:00
EEva
422f1d5bb5 Some slight changes 2013-07-17 01:07:58 +02:00
EEva
0486cb9934 mv to Source ^^ 2013-07-16 23:40:47 +02:00
EEva
242b51bef4 Moving to common source folder 2013-07-16 23:39:35 +02:00
Fabien
4533427360 adding new code 2013-07-16 22:56:15 +02:00
mmoriame
5e60a03b50 updating file 2013-07-16 22:47:44 +02:00
EEva
d8321d5923 Useless update of levy flight to trace 2013-07-16 21:54:27 +02:00
EEva
7b9e936c87 Adding and finishing GIS. 2013-07-16 21:54:11 +02:00
EEva
e64d1644a1 Finishing GIS integration 2013-07-16 21:53:39 +02:00
mmoriame
0bca626bb1 Merge branch 'master' of https://github.com/mpo-csss/beedza 2013-07-16 19:07:03 +02:00
mmoriame
c557dac660 adding dynamics 2013-07-16 19:06:53 +02:00
Fabien
8368095d2b adding utility function 2013-07-16 18:57:37 +02:00
mmoriame
1d7a46b223 adding Vincent constant 2013-07-16 17:01:27 +02:00
mmoriame
03236974cb Merge branch 'master' of https://github.com/mpo-csss/beedza 2013-07-16 16:58:00 +02:00
mmoriame
675c4338c4 adding dynamic 2013-07-16 16:57:29 +02:00
EEva
c5209f3aaf Merge branch 'master' of github.com:mpo-csss/beedza 2013-07-16 16:48:06 +02:00