Skip to content

Make function robust to existing command structure #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make function robust to existing command structure #280

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd2ad38
Make function robust to existing command structure
yanntm Jul 14, 2018
6264222
break from nested loop on finding a correct spot
yanntm Jul 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/sc2lib/sc2_search.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,23 @@ std::vector<Point3D> CalculateExpansionLocations(const ObservationInterface* obs
}

std::vector<bool> results = query->Placement(queries);
// Edit the results : allow to build in command structure existing location
Units commandStructures = observation->GetUnits(
[](const Unit& unit) {
return unit.unit_type == UNIT_TYPEID::TERRAN_COMMANDCENTER || unit.unit_type == UNIT_TYPEID::TERRAN_ORBITALCOMMAND || unit.unit_type == UNIT_TYPEID::TERRAN_PLANETARYFORTRESS ||
unit.unit_type == UNIT_TYPEID::PROTOSS_NEXUS ||
unit.unit_type == UNIT_TYPEID::ZERG_HATCHERY || unit.unit_type == UNIT_TYPEID::ZERG_LAIR || unit.unit_type == UNIT_TYPEID::ZERG_HIVE;
});
for (auto cc : commandStructures) {
for (int i = 0; i < queries.size(); ++i) {
if (DistanceSquared2D(cc->pos, queries[i].target_pos) < 1.0f) {
results[i] = true;
// we can safely break here, each query is at least one away
break;
}
}
}

size_t start_index = 0;
for (int i = 0; i < clusters.size(); ++i) {
std::pair<Point3D, std::vector<Unit> >& cluster = clusters[i];
Expand Down