dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Script: Simplify implementation of ScriptList

Browse Source 
Use btrees instead of set/map
Replace bucket mechanism for reverse mapping
Avoid redundant operations
This commit is contained in:
Jonathan G Rennison
2023-08-03 22:05:26 +01:00
parent b68491f2fe
commit bdbc631e6c
3 changed files with 234 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/script/api/script_list.hpp
View File

@@ -12,8 +12,8 @@
#define SCRIPT_LIST_HPP
#include "script_object.hpp"
#include <map>
#include <set>
#include "../../3rdparty/cpp-btree/safe_btree_set.h"
#include "../../3rdparty/cpp-btree/safe_btree_map.h"
class ScriptListSorter;
@@ -34,6 +34,13 @@ public:
/** Sort descending */
static const bool SORT_DESCENDING = false;
/**
* The safe btree variants ars used because these automatically manage refreshing iterators
* which have been invalidated by adding/removing items.
*/
typedef btree::safe_btree_map<SQInteger, SQInteger> ScriptListMap; ///< Key to value map
typedef btree::safe_btree_set<std::pair<SQInteger, SQInteger>> ScriptListValueSet; ///< [Value, Key] set
private:
ScriptListSorter *sorter; ///< Sorting algorithm
SorterType sorter_type; ///< Sorting type
@@ -41,13 +48,13 @@ private:
bool initialized; ///< Whether an iteration has been started
int modifications; ///< Number of modification that has been done. To prevent changing data while valuating.
public:
typedef std::set<SQInteger> ScriptItemList; ///< The list of items inside the bucket
typedef std::map<SQInteger, ScriptItemList> ScriptListBucket; ///< The bucket list per value
typedef std::map<SQInteger, SQInteger> ScriptListMap; ///< List per item
void SetIterValue(ScriptListMap::iterator item_iter, SQInteger value);
ScriptListMap::iterator RemoveIter(ScriptListMap::iterator item_iter);
ScriptListValueSet::iterator RemoveValueIter(ScriptListValueSet::iterator value_iter);
ScriptListMap items; ///< The items in the list
ScriptListBucket buckets; ///< The items in the list, sorted by value
public:
ScriptListMap items; ///< The items in the list
ScriptListValueSet values; ///< The items in the list, sorted by value
ScriptList();
~ScriptList();
@@ -63,6 +70,16 @@ public:
void AddItem(SQInteger item, SQInteger value = 0);
#endif /* DOXYGEN_API */
/**
* @api -all
*/
void AddOrSetItem(SQInteger item, SQInteger value);
/**
* @api -all
*/
void AddToItemValue(SQInteger item, SQInteger value_to_add);
/**
* Remove a single item from the list.
* @param item the item to remove. If not existing, it is ignored.