mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-03 22:22:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reduce a few memory allocations (#9312)

Browse Source
This commit is contained in:
SomeTroglodyte 2023-05-02 22:26:39 +02:00 committed by GitHub
parent fd67a3520e
commit 159ae86960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/logic/GameInfo.kt
View File

@ -34,7 +34,9 @@ import com.unciv.ui.audio.MusicMood
import com.unciv.ui.audio.MusicTrackChooserFlags
import com.unciv.utils.DebugUtils
import com.unciv.utils.debug
import java.util.*
import java.util.UUID
import kotlin.collections.ArrayList
import kotlin.collections.HashMap
/**
@ -163,9 +165,11 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
fun clone(): GameInfo {
val toReturn = GameInfo()
toReturn.tileMap = tileMap.clone()
toReturn.civilizations.addAll(civilizations.map { it.clone() })
toReturn.civilizations = civilizations.asSequence()
.map { it.clone() }
.toCollection(ArrayList(civilizations.size))
toReturn.barbarians = barbarians.clone()
toReturn.religions.putAll(religions.map { Pair(it.key, it.value.clone()) })
toReturn.religions.putAll(religions.asSequence().map { it.key to it.value.clone() })
toReturn.currentPlayer = currentPlayer
toReturn.currentTurnStartTime = currentTurnStartTime
toReturn.turns = turns
@ -175,7 +179,7 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
toReturn.diplomaticVictoryVotesCast.putAll(diplomaticVictoryVotesCast)
toReturn.oneMoreTurnMode = oneMoreTurnMode
toReturn.customSaveLocation = customSaveLocation
toReturn.victoryData = victoryData
toReturn.victoryData = victoryData?.copy()
toReturn.historyStartTurn = historyStartTurn
return toReturn

22
core/src/com/unciv/logic/map/TileMap.kt
View File

@ -20,8 +20,10 @@ import kotlin.math.abs
* or [MapGenerator][com.unciv.logic.map.mapgenerator.MapGenerator]; or as part of a running [game][GameInfo].
*
* Note: Will be Serialized -> Take special care with lateinit and lazy!
*
* @param initialCapacity Passed to constructor of [tileList]
*/
class TileMap : IsPartOfGameInfoSerialization {
class TileMap(initialCapacity: Int = 10) : IsPartOfGameInfoSerialization {
companion object {
/** Legacy way to store starting locations - now this is used only in [translateStartingLocationsFromMap] */
const val startingLocationPrefix = "StartingLocation "
@ -38,7 +40,7 @@ class TileMap : IsPartOfGameInfoSerialization {
var mapParameters = MapParameters()
var tileList = ArrayList<Tile>()
var tileList = ArrayList<Tile>(initialCapacity)
/** Structure geared for simple serialization by Gdx.Json (which is a little blind to kotlin collections, especially HashSet)
* @param position [Vector2] of the location
@ -93,11 +95,9 @@ class TileMap : IsPartOfGameInfoSerialization {
//endregion
//region Constructors
/** for json parsing, we need to have a default constructor */
constructor()
/** creates a hexagonal map of given radius (filled with grassland) */
constructor(radius: Int, ruleset: Ruleset, worldWrap: Boolean = false) {
constructor(radius: Int, ruleset: Ruleset, worldWrap: Boolean = false)
: this (HexMath.getNumberOfTilesInHexagon(radius)) {
startingLocations.clear()
val firstAvailableLandTerrain = MapLandmassGenerator.getInitializationTerrain(ruleset, TerrainType.Land)
for (vector in HexMath.getVectorsInDistance(Vector2.Zero, radius, worldWrap))
@ -106,7 +106,8 @@ class TileMap : IsPartOfGameInfoSerialization {
}
/** creates a rectangular map of given width and height (filled with grassland) */
constructor(width: Int, height: Int, ruleset: Ruleset, worldWrap: Boolean = false) {
constructor(width: Int, height: Int, ruleset: Ruleset, worldWrap: Boolean = false)
: this(width * height) {
startingLocations.clear()
val firstAvailableLandTerrain = MapLandmassGenerator.getInitializationTerrain(ruleset, TerrainType.Land)
@ -130,13 +131,16 @@ class TileMap : IsPartOfGameInfoSerialization {
/** @return a deep-copy clone of the serializable fields, no transients initialized */
fun clone(): TileMap {
val toReturn = TileMap()
toReturn.tileList.addAll(tileList.map { it.clone() })
val toReturn = TileMap(tileList.size)
toReturn.tileList.addAll(tileList.asSequence().map { it.clone() })
toReturn.mapParameters = mapParameters
toReturn.ruleset = ruleset
// Note during normal play this is empty. Supported for MapEditorScreen.getMapCloneForSave.
toReturn.startingLocations.clear()
toReturn.startingLocations.ensureCapacity(startingLocations.size)
toReturn.startingLocations.addAll(startingLocations)
return toReturn
}

2
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -109,7 +109,7 @@ class Ruleset {
}
private fun <T : INamed> createHashmap(items: Array<T>): LinkedHashMap<String, T> {
val hashMap = LinkedHashMap<String, T>()
val hashMap = LinkedHashMap<String, T>(items.size)
for (item in items)
hashMap[item.name] = item
return hashMap