(svn r13659) [NoAI] -Fix: give regression a bit more time to do his job, as the new scheduler makes it take too long ;)
--- a/bin/ai/regression/regression.nut Mon Jun 30 13:36:06 2008 +0000
+++ b/bin/ai/regression/regression.nut Mon Jun 30 13:49:41 2008 +0000
@@ -1096,12 +1096,12 @@
print(" GetCargoWaiting(0, 1000): " + AIStation.GetCargoWaiting(0, 1000));
print(" GetStationID(33411): " + AIStation.GetStationID(33411));
- print(" HasRoadType(3, TRAM): " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_TRAM));
- print(" HasRoadType(3, ROAD): " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_ROAD));
+ print(" HasRoadType(2, TRAM): " + AIStation.HasRoadType(2, AIRoad.ROADTYPE_TRAM));
+ print(" HasRoadType(2, ROAD): " + AIStation.HasRoadType(2, AIRoad.ROADTYPE_ROAD));
print(" HasRoadType(33411, TRAM): " + AIRoad.HasRoadType(33411, AIRoad.ROADTYPE_TRAM));
print(" HasRoadType(33411, ROAD): " + AIRoad.HasRoadType(33411, AIRoad.ROADTYPE_ROAD));
- print(" HasStationType(3, BUS): " + AIStation.HasStationType(3, AIStation.STATION_BUS_STOP));
- print(" HasStationType(3, TRAIN): " + AIStation.HasStationType(3, AIStation.STATION_TRAIN));
+ print(" HasStationType(2, BUS): " + AIStation.HasStationType(2, AIStation.STATION_BUS_STOP));
+ print(" HasStationType(2, TRAIN): " + AIStation.HasStationType(2, AIStation.STATION_TRAIN));
print(" GetCoverageRadius(BUS): " + AIStation.GetCoverageRadius(AIStation.STATION_BUS_STOP));
print(" GetCoverageRadius(TRUCK): " + AIStation.GetCoverageRadius(AIStation.STATION_TRUCK_STOP));
@@ -1589,9 +1589,6 @@
print(" First Subsidy Test");
PrintSubsidy(0);
- /* Sleep now, to give time for events to happen */
- Sleep(4000);
-
while (AIEventController.IsEventWaiting()) {
local e = AIEventController.GetNextEvent();
print(" GetNextEvent: " + (e == null ? "null" : "instance"));
--- a/bin/ai/regression/regression.txt Mon Jun 30 13:36:06 2008 +0000
+++ b/bin/ai/regression/regression.txt Mon Jun 30 13:49:41 2008 +0000
@@ -417,144 +417,144 @@
1098 => 46116
1099 => 46158
Randomize ListDump:
- 1 => -1137077476
- 2 => 314814293
- 1000 => 1806643910
- 1001 => -701534012
- 1002 => 76404638
- 1003 => -746660249
- 1004 => 1271172296
- 1005 => 1911873386
- 1006 => 1070291873
- 1007 => -2061218877
- 1008 => 481282951
- 1009 => -1948938354
- 1010 => 165230198
- 1011 => -2042646804
- 1012 => -1467569596
- 1013 => -311710398
- 1014 => 475683330
- 1015 => -338021888
- 1016 => 186502532
- 1017 => 723274013
- 1018 => 702714756
- 1019 => 40951180
- 1020 => -2126523587
- 1021 => -1643912096
- 1022 => -290937023
- 1023 => -1769229010
- 1024 => -431301526
- 1025 => -626258845
- 1026 => 1613310982
- 1027 => 123425309
- 1028 => -1514677893
- 1029 => -566414020
- 1030 => -1083501024
- 1031 => -1872881543
- 1032 => -1471582135
- 1033 => 1240074973
- 1034 => -140989914
- 1035 => 539992510
- 1036 => 1453919485
- 1037 => 1190499323
- 1038 => 126270290
- 1039 => -2003047485
- 1040 => -203335554
- 1041 => 1661469806
- 1042 => 58751410
- 1043 => -1478702906
- 1044 => -1155451438
- 1045 => 1770958842
- 1046 => 1962472787
- 1047 => -162012143
- 1048 => -1049520326
- 1049 => 2099949607
- 1051 => -828407401
- 1052 => 1689995601
- 1053 => 2129818695
- 1054 => 1250957327
- 1055 => -122992233
- 1056 => -1799261525
- 1057 => -1896080781
- 1058 => -1004677188
- 1059 => -414905905
- 1060 => 2017104944
- 1061 => 1685581960
- 1062 => 408056889
- 1063 => -701496030
- 1064 => 1739759275
- 1065 => 1596170176
- 1066 => -1807679118
- 1067 => 68437861
- 1068 => -411704134
- 1069 => 1308323007
- 1070 => 528006444
- 1071 => -812601094
- 1072 => -1537997771
- 1073 => 1707830639
- 1074 => 410584452
- 1075 => -57211566
- 1076 => -78014297
- 1077 => -959102596
- 1078 => -1659921168
- 1079 => 2114245942
- 1080 => 568894505
- 1081 => 339980362
- 1082 => -1445943418
- 1083 => 1460815232
- 1084 => -712950084
- 1085 => -716011455
- 1086 => 105149852
- 1087 => -1242149037
- 1088 => -1363448996
- 1089 => 434461667
- 1090 => 1658093490
- 1091 => -371756043
- 1092 => 2100538368
- 1093 => -875319
- 1094 => -1613863224
- 1095 => 1300879493
- 1096 => -1687333103
- 1097 => 1510295157
- 1098 => -1247306571
- 1099 => -667309831
+ 1 => 1685581960
+ 2 => 408056889
+ 1000 => -701496030
+ 1001 => 1739759275
+ 1002 => 1596170176
+ 1003 => -1807679118
+ 1004 => 68437861
+ 1005 => -411704134
+ 1006 => 1308323007
+ 1007 => 528006444
+ 1008 => -812601094
+ 1009 => -1537997771
+ 1010 => 1707830639
+ 1011 => 410584452
+ 1012 => -57211566
+ 1013 => -78014297
+ 1014 => -959102596
+ 1015 => -1659921168
+ 1016 => 2114245942
+ 1017 => 568894505
+ 1018 => 339980362
+ 1019 => -1445943418
+ 1020 => 1460815232
+ 1021 => -712950084
+ 1022 => -716011455
+ 1023 => 105149852
+ 1024 => -1242149037
+ 1025 => -1363448996
+ 1026 => 434461667
+ 1027 => 1658093490
+ 1028 => -371756043
+ 1029 => 2100538368
+ 1030 => -875319
+ 1031 => -1613863224
+ 1032 => 1300879493
+ 1033 => -1687333103
+ 1034 => 1510295157
+ 1035 => -1247306571
+ 1036 => -667309831
+ 1037 => -1964798484
+ 1038 => 1284903276
+ 1039 => 1367099235
+ 1040 => 911470581
+ 1041 => -1654341127
+ 1042 => 535682024
+ 1043 => 26325006
+ 1044 => -2024462735
+ 1045 => 597299179
+ 1046 => 1195337799
+ 1047 => -867445795
+ 1048 => 2053183149
+ 1049 => -484919666
+ 1051 => 934464479
+ 1052 => 1949243159
+ 1053 => -63407938
+ 1054 => 1448214415
+ 1055 => 114131611
+ 1056 => -2099340283
+ 1057 => -605824390
+ 1058 => 2055738669
+ 1059 => -1678079216
+ 1060 => 1888795169
+ 1061 => -864604712
+ 1062 => -468724205
+ 1063 => -301504782
+ 1064 => 155514323
+ 1065 => 1287914143
+ 1066 => 1472913096
+ 1067 => -1880974627
+ 1068 => -575399297
+ 1069 => 106663987
+ 1070 => 646934598
+ 1071 => -644576201
+ 1072 => 1742846721
+ 1073 => 437560120
+ 1074 => 2041714867
+ 1075 => -881581840
+ 1076 => -1634794876
+ 1077 => 1116033698
+ 1078 => -2123857545
+ 1079 => -658723400
+ 1080 => -1159625490
+ 1081 => -1395382483
+ 1082 => 1899912354
+ 1083 => -974252866
+ 1084 => -1656301759
+ 1085 => 1304219090
+ 1086 => -1117738382
+ 1087 => -1464300391
+ 1088 => -870030888
+ 1089 => -2049768177
+ 1090 => -1882552035
+ 1091 => 1810924274
+ 1092 => 1150812842
+ 1093 => -2013891617
+ 1094 => -582213900
+ 1095 => 1165070206
+ 1096 => -2006618736
+ 1097 => -390381818
+ 1098 => -459156651
+ 1099 => 1126201136
KeepTop(10):
- 1 => -1137077476
- 2 => 314814293
- 1000 => 1806643910
- 1001 => -701534012
- 1002 => 76404638
- 1003 => -746660249
- 1004 => 1271172296
- 1005 => 1911873386
- 1006 => 1070291873
- 1007 => -2061218877
+ 1 => 1685581960
+ 2 => 408056889
+ 1000 => -701496030
+ 1001 => 1739759275
+ 1002 => 1596170176
+ 1003 => -1807679118
+ 1004 => 68437861
+ 1005 => -411704134
+ 1006 => 1308323007
+ 1007 => 528006444
KeepBottom(8):
- 1000 => 1806643910
- 1001 => -701534012
- 1002 => 76404638
- 1003 => -746660249
- 1004 => 1271172296
- 1005 => 1911873386
- 1006 => 1070291873
- 1007 => -2061218877
+ 1000 => -701496030
+ 1001 => 1739759275
+ 1002 => 1596170176
+ 1003 => -1807679118
+ 1004 => 68437861
+ 1005 => -411704134
+ 1006 => 1308323007
+ 1007 => 528006444
RemoveBottom(2):
- 1000 => 1806643910
- 1001 => -701534012
- 1002 => 76404638
- 1003 => -746660249
- 1004 => 1271172296
- 1005 => 1911873386
+ 1000 => -701496030
+ 1001 => 1739759275
+ 1002 => 1596170176
+ 1003 => -1807679118
+ 1004 => 68437861
+ 1005 => -411704134
RemoveTop(2):
- 1002 => 76404638
- 1003 => -746660249
- 1004 => 1271172296
- 1005 => 1911873386
+ 1002 => 1596170176
+ 1003 => -1807679118
+ 1004 => 68437861
+ 1005 => -411704134
RemoveList({1003, 1004}):
- 1002 => 76404638
- 1005 => 1911873386
+ 1002 => 1596170176
+ 1005 => -411704134
KeepList({1003, 1004, 1005}):
- 1005 => 1911873386
+ 1005 => -411704134
AddList({1005, 4000, 4001, 4002}):
1005 => 1005
4000 => 8000
@@ -5931,12 +5931,12 @@
Tile 45469
Tile 45468
Tile 45467
- Tile 45466
- Tile 45210
- Tile 44954
- Tile 44698
- Tile 44442
- Tile 44186
+ Tile 45211
+ Tile 44955
+ Tile 44699
+ Tile 44443
+ Tile 44187
+ Tile 43931
Tile 43930
Tile 43929
Tile 43928
@@ -6209,18 +6209,18 @@
GetName(0): Look, a station
GetLocation(1): 29253
GetLocation(1000): -1
- GetStationID(33411): 3
+ GetStationID(33411): 2
GetStationID(34411): 65535
GetCargoWaiting(0, 0): 0
GetCargoWaiting(1000, 0): -1
GetCargoWaiting(0, 1000): -1
- GetStationID(33411): 3
- HasRoadType(3, TRAM): false
- HasRoadType(3, ROAD): true
+ GetStationID(33411): 2
+ HasRoadType(2, TRAM): false
+ HasRoadType(2, ROAD): true
HasRoadType(33411, TRAM): false
HasRoadType(33411, ROAD): true
- HasStationType(3, BUS): true
- HasStationType(3, TRAIN): false
+ HasStationType(2, BUS): true
+ HasStationType(2, TRAIN): false
GetCoverageRadius(BUS): 3
GetCoverageRadius(TRUCK): 3
GetCoverageRadius(TRAIN): 4
@@ -6231,14 +6231,14 @@
--StationList--
Count(): 2
Location ListDump:
- 4 => 33421
- 3 => 33411
+ 3 => 33421
+ 2 => 33411
CargoWaiting(0) ListDump:
- 4 => 0
3 => 0
+ 2 => 0
CargoWaiting(1) ListDump:
- 4 => 0
3 => 0
+ 2 => 0
--TileList--
Count(): 0
@@ -6491,13 +6491,13 @@
KeepAboveValue(10): done
Count(): 7
ListDump:
- 41897 => 41
- 41641 => 35
- 42153 => 33
- 41899 => 29
- 41387 => 29
- 41643 => 26
- 42410 => 13
+ 41897 => 43
+ 41641 => 37
+ 42153 => 32
+ 41899 => 28
+ 41387 => 28
+ 41643 => 25
+ 42410 => 12
RoadTile(): done
KeepValue(1): done
Count(): 0
@@ -6701,12 +6701,8 @@
44351 => 1
--TileList_StationType--
- Count(): 4
+ Count(): 0
Location ListDump:
- 33667 => 0
- 33415 => 0
- 33413 => 0
- 33411 => 0
--Town--
GetMaxTownID(): 31
@@ -6721,37 +6717,37 @@
Town 0
IsValidTown(): true
GetName(): Planfield
- GetPopulation(): 538
+ GetPopulation(): 749
GetLocation(): 15508
- GetHouseCount(): 29
+ GetHouseCount(): 30
GetRating(): 5
Town 1
IsValidTown(): true
GetName(): Trenningville
- GetPopulation(): 236
+ GetPopulation(): 303
GetLocation(): 46751
- GetHouseCount(): 16
+ GetHouseCount(): 17
GetRating(): 5
Town 2
IsValidTown(): true
GetName(): Tondston
- GetPopulation(): 253
+ GetPopulation(): 341
GetLocation(): 28365
GetHouseCount(): 18
GetRating(): 0
Town 3
IsValidTown(): true
GetName(): Tunford
- GetPopulation(): 206
+ GetPopulation(): 209
GetLocation(): 41895
- GetHouseCount(): 11
+ GetHouseCount(): 12
GetRating(): 5
Town 4
IsValidTown(): true
GetName(): Wrundtown
- GetPopulation(): 414
+ GetPopulation(): 396
GetLocation(): 41450
- GetHouseCount(): 18
+ GetHouseCount(): 17
GetRating(): 0
Town 5
IsValidTown(): true
@@ -6763,84 +6759,84 @@
Town 6
IsValidTown(): true
GetName(): Muningville
- GetPopulation(): 566
+ GetPopulation(): 614
GetLocation(): 38200
GetHouseCount(): 28
GetRating(): 0
Town 7
IsValidTown(): true
GetName(): Hutfingford
- GetPopulation(): 652
+ GetPopulation(): 812
GetLocation(): 59234
- GetHouseCount(): 32
+ GetHouseCount(): 33
GetRating(): 0
Town 8
IsValidTown(): true
GetName(): Sadtown
- GetPopulation(): 292
+ GetPopulation(): 320
GetLocation(): 51267
GetHouseCount(): 20
GetRating(): 0
Town 9
IsValidTown(): true
GetName(): Frindinghattan
- GetPopulation(): 447
+ GetPopulation(): 364
GetLocation(): 5825
GetHouseCount(): 18
GetRating(): 0
Town 10
IsValidTown(): true
GetName(): Nuntfingburg
- GetPopulation(): 702
+ GetPopulation(): 690
GetLocation(): 6446
GetHouseCount(): 26
GetRating(): 0
Town 11
IsValidTown(): true
GetName(): Fort Frindston
- GetPopulation(): 156
+ GetPopulation(): 197
GetLocation(): 14935
GetHouseCount(): 13
GetRating(): 5
Town 12
IsValidTown(): true
GetName(): Ginborough
- GetPopulation(): 766
+ GetPopulation(): 853
GetLocation(): 32740
GetHouseCount(): 27
GetRating(): 0
Town 13
IsValidTown(): true
GetName(): Great Hinninghall
- GetPopulation(): 276
+ GetPopulation(): 263
GetLocation(): 9595
- GetHouseCount(): 14
+ GetHouseCount(): 13
GetRating(): 5
Town 14
IsValidTown(): true
GetName(): Prundinghall
- GetPopulation(): 316
+ GetPopulation(): 306
GetLocation(): 51298
GetHouseCount(): 17
GetRating(): 0
Town 15
IsValidTown(): true
GetName(): Benville
- GetPopulation(): 699
+ GetPopulation(): 764
GetLocation(): 42338
GetHouseCount(): 32
GetRating(): 5
Town 16
IsValidTown(): true
GetName(): Kennville
- GetPopulation(): 659
+ GetPopulation(): 705
GetLocation(): 17345
- GetHouseCount(): 32
+ GetHouseCount(): 31
GetRating(): 5
Town 17
IsValidTown(): true
GetName(): Quartfingfield
- GetPopulation(): 185
+ GetPopulation(): 200
GetLocation(): 24252
GetHouseCount(): 13
GetRating(): 5
@@ -6850,11 +6846,11 @@
GetPopulation(): 267
GetLocation(): 10574
GetHouseCount(): 12
- GetRating(): 0
+ GetRating(): 5
Town 19
IsValidTown(): true
GetName(): Mendingston
- GetPopulation(): 221
+ GetPopulation(): 226
GetLocation(): 6511
GetHouseCount(): 14
GetRating(): 0
@@ -6868,49 +6864,49 @@
Town 21
IsValidTown(): true
GetName(): Franinghead
- GetPopulation(): 598
+ GetPopulation(): 793
GetLocation(): 9634
GetHouseCount(): 27
GetRating(): 5
Town 22
IsValidTown(): true
GetName(): Naborough
- GetPopulation(): 174
+ GetPopulation(): 204
GetLocation(): 51891
GetHouseCount(): 12
GetRating(): 5
Town 23
IsValidTown(): true
GetName(): Lardborough
- GetPopulation(): 657
+ GetPopulation(): 734
GetLocation(): 59622
- GetHouseCount(): 27
+ GetHouseCount(): 28
GetRating(): 0
Town 24
IsValidTown(): true
GetName(): Little Fruford
- GetPopulation(): 624
+ GetPopulation(): 709
GetLocation(): 19596
GetHouseCount(): 33
GetRating(): 5
Town 25
IsValidTown(): true
GetName(): Grinnway
- GetPopulation(): 548
+ GetPopulation(): 513
GetLocation(): 16433
GetHouseCount(): 15
GetRating(): 5
Town 26
IsValidTown(): true
GetName(): Bedburg
- GetPopulation(): 336
+ GetPopulation(): 349
GetLocation(): 39505
GetHouseCount(): 17
GetRating(): 0
Town 27
IsValidTown(): true
GetName(): Fudinghattan
- GetPopulation(): 382
+ GetPopulation(): 412
GetLocation(): 45525
GetHouseCount(): 19
GetRating(): 0
@@ -7066,17 +7062,17 @@
KeepAboveValue(500): done
Count(): 11
Population ListDump:
- 12 => 766
- 10 => 702
- 15 => 699
- 16 => 659
- 23 => 657
- 7 => 652
- 24 => 624
- 21 => 598
- 6 => 566
- 25 => 548
- 0 => 538
+ 12 => 853
+ 7 => 812
+ 21 => 793
+ 15 => 764
+ 0 => 749
+ 23 => 734
+ 24 => 709
+ 16 => 705
+ 10 => 690
+ 6 => 614
+ 25 => 513
HasStatue(): false
GetRoadReworkDuration(): 0
GetExclusiveRightsPlayer(): -1
@@ -7110,13 +7106,13 @@
BuildVehicle(): 0
IsValidVehicle(11): false
--Transaction--
- GetCosts(): 421
+ GetCosts(): 430
Execute(): true
IsValidVehicle(11): true
CloneVehicle(): 12
--Accounting--
- GetCosts(): 842
- Should be: 842
+ GetCosts(): 860
+ Should be: 860
ResetCosts(): (null : 0x00000000)
SellVehicle(12): true
IsInDepot(): true
@@ -7128,8 +7124,8 @@
IsInDepot(): false
IsStoppedInDepot(): false
--Accounting--
- GetCosts(): -421
- Should be: -421
+ GetCosts(): -430
+ Should be: -430
GetName(): Road Vehicle 1
SetName(): true
GetName(): MyVehicleName
@@ -7189,10 +7185,10 @@
13 => 1
11 => 1
Age ListDump:
+ 13 => 1
+ 12 => 1
+ 11 => 1
15 => 0
- 13 => 0
- 12 => 0
- 11 => 0
MaxAge ListDump:
15 => 10980
13 => 10980
@@ -7200,9 +7196,9 @@
11 => 5490
AgeLeft ListDump:
15 => 10980
- 13 => 10980
- 12 => 5490
- 11 => 5490
+ 13 => 10979
+ 12 => 5489
+ 11 => 5489
CurrentSpeed ListDump:
11 => 7
15 => 0
@@ -7217,7 +7213,7 @@
15 => 0
13 => 0
12 => 0
- 11 => 0
+ 11 => -1
ProfitLastYear ListDump:
15 => 0
13 => 0
@@ -7267,26 +7263,26 @@
--StationList_Vehicle--
Count(): 2
Location ListDump:
- 4 => 33421
- 3 => 33411
+ 3 => 33421
+ 2 => 33411
CargoWaiting(0) ListDump:
- 4 => 0
3 => 0
+ 2 => 0
CargoWaiting(1) ListDump:
- 4 => 0
3 => 0
+ 2 => 0
CargoRating(1) ListDump:
- 4 => 69
3 => 69
+ 2 => 69
DistanceManhattanToTile(30000) ListDump:
- 4 => 106
- 3 => 96
+ 3 => 106
+ 2 => 96
DistanceSquareToTile(30000) ListDump:
- 4 => 8818
- 3 => 7058
+ 3 => 8818
+ 2 => 7058
IsWithinTownInfluence(0) ListDump:
- 4 => 0
3 => 0
+ 2 => 0
--VehicleList_Station--
Count(): 1
@@ -7297,19 +7293,15 @@
First Subsidy Test
--Subsidy (0) --
- IsValidSubsidy(): false
+ IsValidSubsidy(): true
IsAwarded(): false
GetAwardedTo(): -1
- GetExpireDate(): -1
- SourceIsTown(): false
- GetSource(): 65535
- DestionationIsTown(): false
- GetDestionation(): 65535
- GetCargoType(): 255
- GetNextEvent: instance
- GetEventType: 13
- EventName: VehicleWaitingInDepot
- VehicleID: 11
+ GetExpireDate(): 712678
+ SourceIsTown(): true
+ GetSource(): 0
+ DestionationIsTown(): true
+ GetDestionation(): 24
+ GetCargoType(): 0
GetNextEvent: instance
GetEventType: 2
EventName: SubsidyOffer
@@ -7317,11 +7309,11 @@
IsValidSubsidy(): true
IsAwarded(): false
GetAwardedTo(): -1
- GetExpireDate(): 712619
+ GetExpireDate(): 712678
SourceIsTown(): true
- GetSource(): 16
+ GetSource(): 0
DestionationIsTown(): true
- GetDestionation(): 21
+ GetDestionation(): 24
GetCargoType(): 0
GetNextEvent: instance
GetEventType: 2
@@ -7330,11 +7322,11 @@
IsValidSubsidy(): true
IsAwarded(): false
GetAwardedTo(): -1
- GetExpireDate(): 712647
+ GetExpireDate(): 712708
SourceIsTown(): true
- GetSource(): 27
+ GetSource(): 21
DestionationIsTown(): true
- GetDestionation(): 4
+ GetDestionation(): 9
GetCargoType(): 0
GetNextEvent: instance
GetEventType: 2
@@ -7343,11 +7335,11 @@
IsValidSubsidy(): true
IsAwarded(): false
GetAwardedTo(): -1
- GetExpireDate(): 712769
+ GetExpireDate(): 712861
SourceIsTown(): true
- GetSource(): 26
+ GetSource(): 25
DestionationIsTown(): true
- GetDestionation(): 15
+ GetDestionation(): 20
GetCargoType(): 0
IsEventWaiting: false
ERROR: We've got a suicidal AI for player 1
--- a/bin/ai/regression/run.sh Mon Jun 30 13:36:06 2008 +0000
+++ b/bin/ai/regression/run.sh Mon Jun 30 13:49:41 2008 +0000
@@ -11,7 +11,7 @@
params=""
gdb=""
if [ "$1" != "-r" ]; then
- params="-snull -mnull -vnull:ticks=20000"
+ params="-snull -mnull -vnull:ticks=30000"
fi
if [ "$1" = "-g" ]; then
gdb="gdb --ex run --args "