speed up map loading for linux debug build

reduces "insert-rooms-area-infos" from 75 sec to 300 ms

checkRemapping() is only called with members of getRoomSet(),
so it's not necessary to check. This reduces "check-consistency" from
40 seconds to 850 ms

Author: nschimme

src/global/ImmOrderedSet.h

@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <optional>
+#include <set>
 #include <stdexcept>
 
 #include <immer/algorithm.hpp>
@@ -29,28 +30,9 @@ struct NODISCARD ImmOrderedSet final
     DEFAULT_RULE_OF_5(ImmOrderedSet);
 
 public:
-    explicit ImmOrderedSet(const Type id)
-        : m_vector{id}
+    explicit ImmOrderedSet(const std::set<T> &from)
+        : m_vector{from.begin(), from.end()}
     {}
-    explicit ImmOrderedSet(const Vector &other)
-        : m_vector{other}
-    {}
-    explicit ImmOrderedSet(Vector &&other)
-        : m_vector{std::move(other)}
-    {}
-
-    ImmOrderedSet &operator=(const Vector &other)
-    {
-        if (m_vector == other)
-            return *this;
-        m_vector = other;
-        return *this;
-    }
-    ImmOrderedSet &operator=(Vector &&other)
-    {
-        m_vector = std::move(other);
-        return *this;
-    }
 
 public:
     NODISCARD size_t size() const { return m_vector.size(); }

src/map/RoomIdSet.cpp

@@ -20,15 +20,6 @@ void runRoomIdSetTests()
     TEST_ASSERT(!defaultConstructorSet.contains(RoomId(1)));
     TEST_ASSERT(defaultConstructorSet.begin() == defaultConstructorSet.end());
 
-    RoomId singleId(42);
-    Type setWithSingleId(singleId);
-    TEST_ASSERT(!setWithSingleId.empty());
-    TEST_ASSERT(setWithSingleId.size() == 1ULL);
-    TEST_ASSERT(setWithSingleId.contains(singleId));
-    TEST_ASSERT(!setWithSingleId.contains(RoomId(1)));
-    TEST_ASSERT(*setWithSingleId.begin() == singleId);
-    TEST_ASSERT(*setWithSingleId.begin() == singleId);
-
     Type setForInsert;
     setForInsert.insert(RoomId(10));
     TEST_ASSERT(!setForInsert.empty());

src/map/World.cpp

@@ -638,10 +638,6 @@ void World::checkConsistency(ProgressCounter &counter) const
     };
 
     auto checkRemapping = [this](const RoomId id) {
-        if (!getRoomSet().contains(id)) {
-            throw MapConsistencyError("room set does not contain the room id");
-        }
-
         const auto &area = getRoomArea(id);
         if (!getArea(area).contains(id)) {
             throw MapConsistencyError("room set does not contain the room id");
@@ -1210,7 +1206,7 @@ World World::init(ProgressCounter &counter,
             DECL_TIMER(t3, "insert-rooms-area-infos");
             counter.setNewTask(ProgressMsg{"preparing to insert rooms to areas"}, rooms.size());
             std::unordered_map<RoomArea, AreaInfo> map;
-            ImmRoomIdSet global;
+            std::set<RoomId> global;
             for (const auto &room : rooms) {
                 map[room.getArea()].roomSet.insert(room.id);
                 global.insert(room.id);

src/map/WorldAreaMap.cpp

@@ -27,10 +27,11 @@ AreaInfoMap::AreaInfoMap()
     assert(find(RoomArea{}) != nullptr);
 }
 
-void AreaInfoMap::init(const std::unordered_map<RoomArea, AreaInfo> &map, const ImmRoomIdSet &global)
+void AreaInfoMap::init(const std::unordered_map<RoomArea, AreaInfo> &map,
+                       const std::set<RoomId> &global)
 {
     m_map.init(map);
-    m_global = global;
+    m_global = ImmRoomIdSet{global};
 }
 
 const AreaInfo *AreaInfoMap::find(const RoomArea &area) const

src/map/WorldAreaMap.h

@@ -31,7 +31,7 @@ struct NODISCARD AreaInfoMap final
 
 public:
     NODISCARD explicit AreaInfoMap();
-    void init(const std::unordered_map<RoomArea, AreaInfo> &map, const ImmRoomIdSet &global);
+    void init(const std::unordered_map<RoomArea, AreaInfo> &map, const std::set<RoomId> &global);
 
 public:
     NODISCARD const ImmRoomIdSet &getGlobal() const { return m_global; }