Merge lp:~widelands-dev/widelands/relax-ai-asserts into lp:widelands

[GunChleoc]

Some improvements around AI asserts

- Relax AI requirement for hunters
- Be more informative when building is missing the
  "collects_ware_from_map" AI hint

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5404. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/581765188.
Appveyor build 5174. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_relax_ai_asserts-5174.

[TiborB (tiborb95)]

code looks OK

review: Approve

[GunChleoc (gunchleoc)]

Thanks for the review :)

@bunnybot merge

=== modified file 'src/ai/ai_help_structs.cc'
--- src/ai/ai_help_structs.cc	2019-09-05 19:57:55 +0000
+++ src/ai/ai_help_structs.cc	2019-09-06 16:24:16 +0000
@@ -370,6 +370,24 @@
 	assert(!is(attribute));
 }
 
+bool BuildingObserver::has_collected_map_resource() const {
+	return collected_map_resource != INVALID_INDEX;
+}
+void BuildingObserver::set_collected_map_resource(const Widelands::TribeDescr& tribe, const std::string& ware_name) {
+	if (!ware_name.empty()) {
+		collected_map_resource = tribe.safe_ware_index(ware_name);
+	} else {
+		collected_map_resource = Widelands::INVALID_INDEX;
+	}
+}
+DescriptionIndex BuildingObserver::get_collected_map_resource() const {
+	if (has_collected_map_resource()) {
+		return collected_map_resource;
+	} else {
+		throw wexception("Building '%s' needs to define the AI hint \"collects_ware_from_map\"", desc->name().c_str());
+	}
+}
+
 Widelands::AiModeBuildings BuildingObserver::aimode_limit_status() {
 	if (total_count() > cnt_limit_by_aimode) {
 		return Widelands::AiModeBuildings::kLimitExceeded;
 
=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2019-08-21 17:57:37 +0000
+++ src/ai/ai_help_structs.h	2019-09-06 16:24:16 +0000
@@ -449,6 +449,11 @@
 	void set_is(BuildingAttribute);
 	void unset_is(BuildingAttribute);
 
+	// Building collects a ware from the map
+	bool has_collected_map_resource() const;
+	void set_collected_map_resource(const TribeDescr& tribe, const std::string& ware_name);
+	DescriptionIndex get_collected_map_resource() const;
+
 	char const* name;
 	Widelands::DescriptionIndex id;
 	Widelands::BuildingDescr const* desc;
@@ -486,14 +491,13 @@
 	int32_t substitutes_count;
 
 	std::set<DescriptionIndex> production_hints;
-	DescriptionIndex collected_map_resource;
+
 	bool requires_supporters;
 
 	// information needed for decision on new building construction
 	int16_t initial_preciousness;
 	int16_t max_preciousness;
 	int16_t max_needed_preciousness;
-
 	int32_t cnt_built;
 	int32_t cnt_under_construction;
 	int32_t cnt_target;           // number of buildings as target
@@ -513,6 +517,7 @@
 	bool build_material_shortage;
 
 private:
+	DescriptionIndex collected_map_resource;
 	std::set<BuildingAttribute> is_what;
 };
 
 
=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2019-09-05 19:57:55 +0000
+++ src/ai/defaultai.cc	2019-09-06 16:24:16 +0000
@@ -647,11 +647,7 @@
 		bo.fighting_type = bh.is_fighting_type();
 		bo.mountain_conqueror = bh.is_mountain_conqueror();
 		bo.requires_supporters = bh.requires_supporters();
-		if (!bh.collects_ware_from_map().empty()) {
-			bo.collected_map_resource = tribe_->safe_ware_index(bh.collects_ware_from_map());
-		} else {
-			bo.collected_map_resource = INVALID_INDEX;
-		}
+		bo.set_collected_map_resource(*tribe_, bh.collects_ware_from_map());
 		if (bo.requires_supporters) {
 			log(" %d: %s strictly requires supporters\n", player_number(), bo.name);
 		}
@@ -898,7 +894,8 @@
 	assert(count_buildings_with_attribute(BuildingAttribute::kRanger) == 1);
 	assert(count_buildings_with_attribute(BuildingAttribute::kWell) == 1);
 	assert(count_buildings_with_attribute(BuildingAttribute::kLumberjack) == 1);
-	assert(count_buildings_with_attribute(BuildingAttribute::kHunter) == 1);
+	assert((count_buildings_with_attribute(BuildingAttribute::kHunter) == 1) ||
+		   (count_buildings_with_attribute(BuildingAttribute::kHunter) == 0));
 	assert(count_buildings_with_attribute(BuildingAttribute::kIronMine) >= 1);
 	assert(count_buildings_with_attribute(BuildingAttribute::kFisher) == 1);
 	// If there will be a tribe with more than 3 mines of the same type, just increase the number
@@ -2707,8 +2704,7 @@
 					prio += bo.primary_priority;
 
 					// keep wells more distant
-					assert(bo.collected_map_resource != INVALID_INDEX);
-					if (bf->collecting_producers_nearby.at(bo.collected_map_resource) > 2) {
+					if (bf->collecting_producers_nearby.at(bo.get_collected_map_resource()) > 2) {
 						continue;
 					}
 
@@ -2737,10 +2733,9 @@
 					        (bf->trees_nearby - trees_nearby_treshold_) / 10;
 
 					// consider cutters and rangers nearby
-					assert(bo.collected_map_resource != INVALID_INDEX);
-					prio += 2 * bf->supporters_nearby.at(bo.collected_map_resource) *
+					prio += 2 * bf->supporters_nearby.at(bo.get_collected_map_resource()) *
 					        std::abs(management_data.get_military_number_at(25));
-					prio -= bf->collecting_producers_nearby.at(bo.collected_map_resource) *
+					prio -= bf->collecting_producers_nearby.at(bo.get_collected_map_resource()) *
 					        std::abs(management_data.get_military_number_at(36)) * 3;
 
 				} else if (bo.is(BuildingAttribute::kNeedsRocks)) {
@@ -2772,8 +2767,7 @@
 					}
 
 					// to prevent to many quaries on one spot
-					assert(bo.collected_map_resource != INVALID_INDEX);
-					prio = prio - 50 * bf->collecting_producers_nearby.at(bo.collected_map_resource);
+					prio = prio - 50 * bf->collecting_producers_nearby.at(bo.get_collected_map_resource());
 
 				} else if (bo.is(BuildingAttribute::kHunter)) {
 
@@ -2788,11 +2782,10 @@
 					// Overdue priority here
 					prio += bo.primary_priority;
 
-					prio += bf->supporters_nearby.at(bo.collected_map_resource) * 5;
+					prio += bf->supporters_nearby.at(bo.get_collected_map_resource()) * 5;
 
-					assert(bo.collected_map_resource != INVALID_INDEX);
 					prio += (bf->critters_nearby * 3) - 8 -
-					        5 * bf->collecting_producers_nearby.at(bo.collected_map_resource);
+					        5 * bf->collecting_producers_nearby.at(bo.get_collected_map_resource());
 
 				} else if (bo.is(BuildingAttribute::kFisher)) {  // fisher
 
@@ -2807,9 +2800,8 @@
 					// Overdue priority here
 					prio += bo.primary_priority;
 
-					assert(bo.collected_map_resource != INVALID_INDEX);
-					prio -= bf->collecting_producers_nearby.at(bo.collected_map_resource) * 20;
-					prio += bf->supporters_nearby.at(bo.collected_map_resource) * 20;
+					prio -= bf->collecting_producers_nearby.at(bo.get_collected_map_resource()) * 20;
+					prio += bf->supporters_nearby.at(bo.get_collected_map_resource()) * 20;
 
 					prio += -5 + bf->fish_nearby *
 					                (1 + std::abs(management_data.get_military_number_at(63) / 15));
@@ -3036,7 +3028,7 @@
 							               std::abs(management_data.get_military_number_at(102)) / 5;
 						} else {
 							// leave some free space between them
-							prio -= bf->collecting_producers_nearby.at(bo.collected_map_resource) *
+							prio -= bf->collecting_producers_nearby.at(bo.get_collected_map_resource()) *
 							        std::abs(management_data.get_military_number_at(108)) / 5;
 						}
 
@@ -6067,8 +6059,8 @@
 	for (size_t i = 0; i < bo.ware_outputs.size(); ++i) {
 		++field.producers_nearby.at(bo.ware_outputs.at(i));
 	}
-	if (bo.collected_map_resource != INVALID_INDEX) {
-		++field.collecting_producers_nearby.at(bo.collected_map_resource);
+	if (bo.has_collected_map_resource()) {
+		++field.collecting_producers_nearby.at(bo.get_collected_map_resource());
 	}
 
 	if (!bo.production_hints.empty()) {