games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Code Issues Releases Activity

Probably better fitness function.

Browse Source
This commit is contained in:
DjWarmonger
2016-07-10 16:37:54 +02:00
parent 8ceceb897e
commit 87ef3701aa
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/rmg/CZonePlacer.cpp
View File

@ -230,14 +230,23 @@ void CZonePlacer::placeZones(const CMapGenOptions * mapGenOptions, CRandomGenera
} }
logGlobal->traceStream() << boost::format("Total distance between zones in this iteration: %2.4f, Total overlap: %2.4f, Worst misplacement/movement ratio: %3.2f") % totalDistance % totalOverlap % maxRatio; logGlobal->traceStream() << boost::format("Total distance between zones in this iteration: %2.4f, Total overlap: %2.4f, Worst misplacement/movement ratio: %3.2f") % totalDistance % totalOverlap % maxRatio;
//check fitness function
bool improvement = false;
if (bestTotalDistance > 0 && bestTotalOverlap > 0)
{
if (totalDistance * totalOverlap < bestTotalDistance * bestTotalOverlap) //multiplication is better for auto-scaling, but stops working if one factor is 0
improvement = true;
}
else
if (totalDistance + totalOverlap < bestTotalDistance + bestTotalOverlap)
improvement = true;
//save best solution before drastic jump //save best solution before drastic jump
if (totalDistance + totalOverlap < bestTotalDistance + bestTotalOverlap) if (improvement)
{ {
bestTotalDistance = totalDistance; bestTotalDistance = totalDistance;
bestTotalOverlap = totalOverlap; bestTotalOverlap = totalOverlap;
//if (maxRatio < bestRatio)
//{
// bestRatio = maxRatio;
for (auto zone : zones) for (auto zone : zones)
bestSolution[zone.second] = zone.second->getCenter(); bestSolution[zone.second] = zone.second->getCenter();
} }