Merge cgogn:~jund/CGoGN_Apps/SocialAgents2

Conflicts: include/utils.h src/env_map.cpp src/simulator.cpp

Merge cgogn:~jund/CGoGN_Apps/SocialAgents2
Conflicts: include/utils.h src/env_map.cpp src/simulator.cpp
8e975db6 · Pierre Kraemer · 48e7d2d8 · e4d97542 · 8e975db6 · 8e975db6
Commit 8e975db6 authored Jul 06, 2011 by Pierre Kraemer
--- a/graphData/Circle_LeurMethode.data
+++ b/graphData/Circle_LeurMethode.data
+TypeDeScene Eux
+Circle-250 7.9718
+Circle-500 29.4626
+Circle-1000 99.3581
\ No newline at end of file
--- a/graphData/Circle_NotreMethode.data
+++ b/graphData/Circle_NotreMethode.data
+TypeDeScene NousAdapt
+Circle-250 2.34102
+Circle-500  5.49156
+Circle-1000 23.706895
--- a/graphData/Circle_NotreMethodeStatic.data
+++ b/graphData/Circle_NotreMethodeStatic.data
+TypeDeScene NousStatic
+Circle-250 2.46556
+Circle-500 10.9064
+Circle-1000 34.5659
\ No newline at end of file
--- a/graphData/Circle_NotreMethodeSubdivMax.data
+++ b/graphData/Circle_NotreMethodeSubdivMax.data
+TypeDeScene NousMaxSubdiv
+Circle-250 1.95347
+Circle-500 7.39246
+Circle-1000 21.1772
\ No newline at end of file
--- a/graphData/Circle_histogram.plot
+++ b/graphData/Circle_histogram.plot
+#set terminal svg size 600,400 dynamic enhanced fname 'arial' fsize 11 butt
+#set output 'graphBenchCircles.svg'
+set auto x
+set grid
+set yrange [0.1:*]
+set style data histogram
+set style histogram cluster gap 2
+set style fill solid border -2
+set boxwidth 0.9
+#set logscale y
+#set xtic rotate by -50
+plot 'LeurMethode.data' using 2:xtic(1) ti col, \
+	 'NotreMethodeStatic.data' using 2 ti col, \
+     'NotreMethode.data' using 2 ti col, \
+     'NotreMethodeSansSimplif.data' using 2 ti col, \
+     'NotreMethodeSubdivMax.data' using 2 ti col
+pause -1
\ No newline at end of file
--- a/graphData/City_LeurMethode.data
+++ b/graphData/City_LeurMethode.data
+TypeDeScene Eux
+City70-24/835 72.8304
+City70-48-835 70.5733
+City70-96-835 72.6253
\ No newline at end of file
--- a/graphData/City_NotreMethode.data
+++ b/graphData/City_NotreMethode.data
+TypeDeScene Nous
+City70-24/835 16.2245
+City70-48-835 11.1495
+City70-96-835 11.6373
--- a/graphData/City_histogram.plot
+++ b/graphData/City_histogram.plot
+#set terminal svg size 600,400 dynamic enhanced fname 'arial' fsize 11 butt
+#set output 'graphBenchCity.svg'
+set auto x
+set grid
+set yrange [0.1:*]
+set style data histogram
+set style histogram cluster gap 2
+set style fill solid border -2
+set boxwidth 0.9
+#set logscale y
+#set xtic rotate by -50
+plot 'LeurMethodeCity.data' using 2 ti col, \
+	 'NotreMethodeCity.data' using 2:xtic(1) ti col
+pause -1
\ No newline at end of file
--- a/graphData/NotreMethodeCircle1000Memory.data
+++ b/graphData/NotreMethodeCircle1000Memory.data
+0 181374
+10 321294
+20 373230
+30 436330
+40 424466
+50 440802
+60 428906
+70 436718
+80 433622
+90 441494
+100 470642
+110 456598
+120 490750
+130 479926
+140 479610
+150 487482
+160 499362
+170 521558
+180 502662
+190 510534
+200 533382
+210 529394
+220 533450
+230 537698
+240 540958
+250 551966
+260 541094
+270 552926
+280 552370
+290 560146
+300 560530
+310 582534
+320 586006
+330 578806
+340 594262
+350 578538
+360 585516
+370 609306
+380 601178
+390 602166
+400 602550
+410 602838
+420 602162
+430 606266
+440 606458
+450 613258
+460 613330
+470 605890
+480 606262
+490 597990
+500 607482
+510 616140
+520 616346
+530 601250
+540 608882
+550 601634
+560 608338
+570 608434
+580 607588
+590 617022
+600 605654
+610 609518
+620 609662
+630 608376
+640 601378
+650 608498
+660 615522
+670 597338
+680 599330
+690 604422
+700 596982
+710 592322
+720 594206
+730 599298
+740 591858
+750 589626
+760 586428
+770 586428
+780 582708
+790 582708
+800 584592
+810 582708
+820 583650
+830 582708
+840 582708
+850 583650
+860 583650
+870 582708
+880 582708
+890 583650
+900 582708
+910 582708
+920 582708
+930 582708
+940 582708
+950 583650
+960 582708
+970 581870
+980 581032
+990 581974
+1000 582114
+1010 581974
+1020 581136
+1030 581136
+1040 581136
+1050 580298
+1060 579356
+1070 580438
+1080 582984
+1090 583228
+1100 584310
+1110 582146
+1120 585774
+1130 588880
+1140 590904
+1150 590102
+1160 588322
+1170 593694
+1180 594216
+1190 593694
+1200 594928
+1210 595590
+1220 599358
+1230 600300
+1240 602988
+1250 606896
+1260 611606
+1270 612840
+1280 615070
+1290 614196
+1300 618906
+1310 625300
+1320 626522
+1330 631302
+1340 636536
+1350 638700
+1360 643350
+1370 643316
+1380 653588
+1390 660846
+1400 665776
+1410 653752
+1420 655068
+1430 658128
+1440 657556
+1450 656904
+1460 657962
+1470 656018
+1480 646426
+1490 644280
+1500 633378
+1510 635406
+1520 633532
+1530 621590
+1540 613138
+1550 600510
+1560 604812
+1570 600018
+1580 592046
+1590 581788
+1600 575186
+1610 576658
+1620 569240
+1630 567582
+1640 557630
+1650 545328
+1660 536912
+1670 527982
+1680 516074
+1690 512370
+1700 509854
+1710 502966
+1720 499820
+1730 476008
+1740 469046
+1750 466060
+1760 453386
+1770 450170
+1780 431116
+1790 422902
+1800 422052
+1810 406076
+1820 400578
+1830 378340
+1840 375648
+1850 366988
+1860 356232
+1870 344722
+1880 340672
+1890 335738
+1900 333898
+1910 325918
+1920 316912
+1930 313862
+1940 314068
+1950 307084
+1960 300830
+1970 297482
+1980 305300
+1990 309872
+2000 316608
+2010 319052
+2020 316902
+2030 315924
+2040 323498
+2050 326604
+2060 333554
+2070 341548
+2080 347658
+2090 356212
+2100 364066
+2110 372200
+2120 378832
+2130 387348
+2140 393458
+2150 394540
+2160 400090
+2170 406442
+2180 410770
+2190 414016
+2200 415098
+2210 416180
+2220 416180
+2230 416180
+2240 416180
+2250 416180
+2260 416180
+2270 417262
+2280 417262
+2290 417262
+2300 417262
+2310 417262
+2320 417262
+2330 417262
+2340 417262
+2350 417262
--- a/graphData/NotreMethodeCircle1000MemoryImproved.data
+++ b/graphData/NotreMethodeCircle1000MemoryImproved.data
+0 181374
+10 321294
+20 373230
+30 425074
+40 412174
+50 420974
+60 401494
+70 409306
+80 398386
+90 398434
+100 408178
+110 381422
+120 415574
+130 404750
+140 388834
+150 396706
+160 392938
+170 403398
+180 372206
+190 380078
+200 395102
+210 379378
+220 383434
+230 379858
+240 363558
+250 370094
+260 351398
+270 355406
+280 354850
+290 354802
+300 347362
+310 353718
+320 352718
+330 345518
+340 353150
+350 337414
+360 328744
+370 352534
+380 336582
+390 335342
+400 327902
+410 324278
+420 323602
+430 319882
+440 320074
+450 311226
+460 310178
+470 302738
+480 303110
+490 287026
+500 296518
+510 301264
+520 293646
+530 277418
+540 285050
+550 269978
+560 276682
+570 276778
+580 275932
+590 277542
+600 259502
+610 259454
+620 259598
+630 256324
+640 251302
+650 250598
+660 257622
+670 233858
+680 235850
+690 240942
+700 233502
+710 224930
+720 226814
+730 231906
+740 224466
+750 221706
+760 211374
+770 210444
+780 207654
+790 207654
+800 208596
+810 209538
+820 209538
+830 208596
+840 208596
+850 208596
+860 207654
+870 208596
+880 207654
+890 207654
+900 207654
+910 208736
+920 207654
+930 207654
+940 208596
+950 208596
+960 208596
+970 208596
+980 208596
+990 208596
+1000 209678
+1010 209538
+1020 208596
+1030 210760
+1040 210760
+1050 209678
+1060 208596
+1070 209678
+1080 211702
+1090 209678
+1100 209538
+1110 209538
+1120 210620
+1130 209538
+1140 209538
+1150 209538
+1160 210620
+1170 210480
+1180 211562
+1190 212644
+1200 213726
+1210 214808
+1220 215088
+1230 216832
+1240 218716
+1250 221020
+1260 222102
+1270 226952
+1280 228696
+1290 230860
+1300 233024
+1310 235048
+1320 240076
+1330 242902
+1340 245868
+1350 241144
+1360 244784
+1370 248972
+1380 253160
+1390 259232
+1400 261396
+1410 264782
+1420 268014
+1430 273728
+1440 274110
+1450 276846
+1460 274922
+1470 278588
+1480 284342
+1490 287278
+1500 285138
+1510 294060
+1520 288036
+1530 292784
+1540 292262
+1550 297824
+1560 296080
+1570 293278
+1580 296104
+1590 298024
+1600 306040
+1610 312508
+1620 314330
+1630 309434
+1640 312400
+1650 314334
+1660 315532
+1670 319542
+1680 319146
+1690 317834
+1700 320162
+1710 316978
+1720 319652
+1730 316010
+1740 310230
+1750 306180
+1760 308320
+1770 303270
+1780 309902
+1790 310706
+1800 304530
+1810 303376
+1820 307740
+1830 298958
+1840 295538
+1850 295374
+1860 301702
+1870 287090
+1880 287484
+1890 287230
+1900 283576
+1910 273736
+1920 280228
+1930 287802
+1940 283232
+1950 287968
+1960 281616
+1970 276206
+1980 272540
+1990 273482
+2000 273762
+2010 274704
+2020 277428
+2030 274182
+2040 274360
+2050 278408
+2060 279490
+2070 277606
+2080 274512
+2090 280330
+2100 279910
+2110 284416
+2120 281030
+2130 287242
+2140 291328
+2150 296216
+2160 305152
+2170 302326
+2180 304630
+2190 306514
+2200 311504
+2210 312204
+2220 313706
+2230 322782
+2240 322120
+2250 322782
+2260 330216
+2270 332380
+2280 340094
+2290 337128
+2300 338490
+2310 347426
+2320 351092
+2330 356502
+2340 366520
+2350 372070
+2360 386416
+2370 389942
+2380 392246
+2390 396574
+2400 402926
+2410 405892
+2420 406974
+2430 408196
+2440 409278
+2450 409278
+2460 411162
+2470 411162
+2480 412244
+2490 414408
+2500 415350
+2510 415350
+2520 415350
+2530 416432
+2540 416432
+2550 416432
+2560 416432
+2570 416432
+2580 416432
+2590 416432
+2600 416432
+2610 416432
+2620 416432
+2630 416432
+2640 416432
+2650 416432
+2660 416432
+2670 416432
+2680 416432
+2690 416432
+2700 416432
+2710 416432
+2720 417514
+2730 417514
+2740 417514
+2750 417514
+2760 417514
+2770 417514
+2780 417514
+2790 417514
+2800 417514
+2810 417514
--- a/graphData/NotreMethodeSansSimplif.data
+++ b/graphData/NotreMethodeSansSimplif.data
+TypeDeScene NousSansSimplif
+Circle-250 2.10304
+Circle-500 6.5933
+Circle-1000 21.21568
+#Circle-1000 23.107
--- a/graphData/NotreMethodeSansSimplifCircle1000Memory.data
+++ b/graphData/NotreMethodeSansSimplifCircle1000Memory.data
+0 181374
+10 321294
+20 373230
+30 460606
+40 475678
+50 520894
+60 566110
+70 610766
+80 652214
+90 682358
+100 756598
+110 779206
+120 828190
+130 854566
+140 899222
+150 929366
+160 974582
+170 1037518
+180 1052590
+190 1082734
+200 1120414
+210 1165070
+220 1191446
+230 1225358
+240 1261918
+250 1292062
+260 1307134
+270 1348582
+280 1385702
+290 1408310
+300 1430918
+310 1482550
+320 1505158
+330 1520230
+340 1557910
+350 1572422
+360 1597856
+370 1636478
+380 1665502
+390 1680574
+400 1703182