gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Merge bugfix #197
0 1 0
merge 1.0
0 files changed with 4 insertions and 7 deletions:
↑ Collapse diff ↑
Ignore white space 512 line context
... ...
@@ -924,593 +924,590 @@
924 924
    };
925 925

	
926 926
  };
927 927

	
928 928
  /// \ingroup auxdat
929 929
  ///
930 930
  /// \brief A \e Union-Find data structure implementation which
931 931
  /// is able to store a priority for each item and retrieve the minimum of
932 932
  /// each class.
933 933
  ///
934 934
  /// A \e Union-Find data structure implementation which is able to
935 935
  /// store a priority for each item and retrieve the minimum of each
936 936
  /// class. In addition, it supports the joining and splitting the
937 937
  /// components. If you don't need this feature then you makes
938 938
  /// better to use the \ref UnionFind class which is more efficient.
939 939
  ///
940 940
  /// The union-find data strcuture based on a (2, 16)-tree with a
941 941
  /// tournament minimum selection on the internal nodes. The insert
942 942
  /// operation takes O(1), the find, set, decrease and increase takes
943 943
  /// O(log(n)), where n is the number of nodes in the current
944 944
  /// component.  The complexity of join and split is O(log(n)*k),
945 945
  /// where n is the sum of the number of the nodes and k is the
946 946
  /// number of joined components or the number of the components
947 947
  /// after the split.
948 948
  ///
949 949
  /// \pre You need to add all the elements by the \ref insert()
950 950
  /// method.
951 951
  ///
952 952
  template <typename _Value, typename _ItemIntMap,
953 953
            typename _Comp = std::less<_Value> >
954 954
  class HeapUnionFind {
955 955
  public:
956 956

	
957 957
    typedef _Value Value;
958 958
    typedef typename _ItemIntMap::Key Item;
959 959

	
960 960
    typedef _ItemIntMap ItemIntMap;
961 961

	
962 962
    typedef _Comp Comp;
963 963

	
964 964
  private:
965 965

	
966 966
    static const int cmax = 16;
967 967

	
968 968
    ItemIntMap& index;
969 969

	
970 970
    struct ClassNode {
971 971
      int parent;
972 972
      int depth;
973 973

	
974 974
      int left, right;
975 975
      int next, prev;
976 976
    };
977 977

	
978 978
    int first_class;
979 979
    int first_free_class;
980 980
    std::vector<ClassNode> classes;
981 981

	
982 982
    int newClass() {
983 983
      if (first_free_class < 0) {
984 984
        int id = classes.size();
985 985
        classes.push_back(ClassNode());
986 986
        return id;
987 987
      } else {
988 988
        int id = first_free_class;
989 989
        first_free_class = classes[id].next;
990 990
        return id;
991 991
      }
992 992
    }
993 993

	
994 994
    void deleteClass(int id) {
995 995
      classes[id].next = first_free_class;
996 996
      first_free_class = id;
997 997
    }
998 998

	
999 999
    struct ItemNode {
1000 1000
      int parent;
1001 1001
      Item item;
1002 1002
      Value prio;
1003 1003
      int next, prev;
1004 1004
      int left, right;
1005 1005
      int size;
1006 1006
    };
1007 1007

	
1008 1008
    int first_free_node;
1009 1009
    std::vector<ItemNode> nodes;
1010 1010

	
1011 1011
    int newNode() {
1012 1012
      if (first_free_node < 0) {
1013 1013
        int id = nodes.size();
1014 1014
        nodes.push_back(ItemNode());
1015 1015
        return id;
1016 1016
      } else {
1017 1017
        int id = first_free_node;
1018 1018
        first_free_node = nodes[id].next;
1019 1019
        return id;
1020 1020
      }
1021 1021
    }
1022 1022

	
1023 1023
    void deleteNode(int id) {
1024 1024
      nodes[id].next = first_free_node;
1025 1025
      first_free_node = id;
1026 1026
    }
1027 1027

	
1028 1028
    Comp comp;
1029 1029

	
1030 1030
    int findClass(int id) const {
1031 1031
      int kd = id;
1032 1032
      while (kd >= 0) {
1033 1033
        kd = nodes[kd].parent;
1034 1034
      }
1035 1035
      return ~kd;
1036 1036
    }
1037 1037

	
1038 1038
    int leftNode(int id) const {
1039 1039
      int kd = ~(classes[id].parent);
1040 1040
      for (int i = 0; i < classes[id].depth; ++i) {
1041 1041
        kd = nodes[kd].left;
1042 1042
      }
1043 1043
      return kd;
1044 1044
    }
1045 1045

	
1046 1046
    int nextNode(int id) const {
1047 1047
      int depth = 0;
1048 1048
      while (id >= 0 && nodes[id].next == -1) {
1049 1049
        id = nodes[id].parent;
1050 1050
        ++depth;
1051 1051
      }
1052 1052
      if (id < 0) {
1053 1053
        return -1;
1054 1054
      }
1055 1055
      id = nodes[id].next;
1056 1056
      while (depth--) {
1057 1057
        id = nodes[id].left;
1058 1058
      }
1059 1059
      return id;
1060 1060
    }
1061 1061

	
1062 1062

	
1063 1063
    void setPrio(int id) {
1064 1064
      int jd = nodes[id].left;
1065 1065
      nodes[id].prio = nodes[jd].prio;
1066 1066
      nodes[id].item = nodes[jd].item;
1067 1067
      jd = nodes[jd].next;
1068 1068
      while (jd != -1) {
1069 1069
        if (comp(nodes[jd].prio, nodes[id].prio)) {
1070 1070
          nodes[id].prio = nodes[jd].prio;
1071 1071
          nodes[id].item = nodes[jd].item;
1072 1072
        }
1073 1073
        jd = nodes[jd].next;
1074 1074
      }
1075 1075
    }
1076 1076

	
1077 1077
    void push(int id, int jd) {
1078 1078
      nodes[id].size = 1;
1079 1079
      nodes[id].left = nodes[id].right = jd;
1080 1080
      nodes[jd].next = nodes[jd].prev = -1;
1081 1081
      nodes[jd].parent = id;
1082 1082
    }
1083 1083

	
1084 1084
    void pushAfter(int id, int jd) {
1085 1085
      int kd = nodes[id].parent;
1086 1086
      if (nodes[id].next != -1) {
1087 1087
        nodes[nodes[id].next].prev = jd;
1088 1088
        if (kd >= 0) {
1089 1089
          nodes[kd].size += 1;
1090 1090
        }
1091 1091
      } else {
1092 1092
        if (kd >= 0) {
1093 1093
          nodes[kd].right = jd;
1094 1094
          nodes[kd].size += 1;
1095 1095
        }
1096 1096
      }
1097 1097
      nodes[jd].next = nodes[id].next;
1098 1098
      nodes[jd].prev = id;
1099 1099
      nodes[id].next = jd;
1100 1100
      nodes[jd].parent = kd;
1101 1101
    }
1102 1102

	
1103 1103
    void pushRight(int id, int jd) {
1104 1104
      nodes[id].size += 1;
1105 1105
      nodes[jd].prev = nodes[id].right;
1106 1106
      nodes[jd].next = -1;
1107 1107
      nodes[nodes[id].right].next = jd;
1108 1108
      nodes[id].right = jd;
1109 1109
      nodes[jd].parent = id;
1110 1110
    }
1111 1111

	
1112 1112
    void popRight(int id) {
1113 1113
      nodes[id].size -= 1;
1114 1114
      int jd = nodes[id].right;
1115 1115
      nodes[nodes[jd].prev].next = -1;
1116 1116
      nodes[id].right = nodes[jd].prev;
1117 1117
    }
1118 1118

	
1119 1119
    void splice(int id, int jd) {
1120 1120
      nodes[id].size += nodes[jd].size;
1121 1121
      nodes[nodes[id].right].next = nodes[jd].left;
1122 1122
      nodes[nodes[jd].left].prev = nodes[id].right;
1123 1123
      int kd = nodes[jd].left;
1124 1124
      while (kd != -1) {
1125 1125
        nodes[kd].parent = id;
1126 1126
        kd = nodes[kd].next;
1127 1127
      }
1128 1128
      nodes[id].right = nodes[jd].right;
1129 1129
    }
1130 1130

	
1131 1131
    void split(int id, int jd) {
1132 1132
      int kd = nodes[id].parent;
1133 1133
      nodes[kd].right = nodes[id].prev;
1134 1134
      nodes[nodes[id].prev].next = -1;
1135 1135

	
1136 1136
      nodes[jd].left = id;
1137 1137
      nodes[id].prev = -1;
1138 1138
      int num = 0;
1139 1139
      while (id != -1) {
1140 1140
        nodes[id].parent = jd;
1141 1141
        nodes[jd].right = id;
1142 1142
        id = nodes[id].next;
1143 1143
        ++num;
1144 1144
      }
1145 1145
      nodes[kd].size -= num;
1146 1146
      nodes[jd].size = num;
1147 1147
    }
1148 1148

	
1149 1149
    void pushLeft(int id, int jd) {
1150 1150
      nodes[id].size += 1;
1151 1151
      nodes[jd].next = nodes[id].left;
1152 1152
      nodes[jd].prev = -1;
1153 1153
      nodes[nodes[id].left].prev = jd;
1154 1154
      nodes[id].left = jd;
1155 1155
      nodes[jd].parent = id;
1156 1156
    }
1157 1157

	
1158 1158
    void popLeft(int id) {
1159 1159
      nodes[id].size -= 1;
1160 1160
      int jd = nodes[id].left;
1161 1161
      nodes[nodes[jd].next].prev = -1;
1162 1162
      nodes[id].left = nodes[jd].next;
1163 1163
    }
1164 1164

	
1165 1165
    void repairLeft(int id) {
1166 1166
      int jd = ~(classes[id].parent);
1167 1167
      while (nodes[jd].left != -1) {
1168 1168
        int kd = nodes[jd].left;
1169 1169
        if (nodes[jd].size == 1) {
1170 1170
          if (nodes[jd].parent < 0) {
1171 1171
            classes[id].parent = ~kd;
1172 1172
            classes[id].depth -= 1;
1173 1173
            nodes[kd].parent = ~id;
1174 1174
            deleteNode(jd);
1175 1175
            jd = kd;
1176 1176
          } else {
1177 1177
            int pd = nodes[jd].parent;
1178 1178
            if (nodes[nodes[jd].next].size < cmax) {
1179 1179
              pushLeft(nodes[jd].next, nodes[jd].left);
1180
              if (nodes[jd].item == nodes[pd].item) {
1180
              if (less(jd, nodes[jd].next) ||
1181
                  nodes[jd].item == nodes[pd].item) {
1181 1182
                nodes[nodes[jd].next].prio = nodes[jd].prio;
1182 1183
                nodes[nodes[jd].next].item = nodes[jd].item;
1183 1184
              }
1184 1185
              popLeft(pd);
1185 1186
              deleteNode(jd);
1186 1187
              jd = pd;
1187 1188
            } else {
1188 1189
              int ld = nodes[nodes[jd].next].left;
1189 1190
              popLeft(nodes[jd].next);
1190 1191
              pushRight(jd, ld);
1191 1192
              if (less(ld, nodes[jd].left) || 
1192 1193
                  nodes[ld].item == nodes[pd].item) {
1193 1194
                nodes[jd].item = nodes[ld].item;
1194 1195
                nodes[jd].prio = nodes[ld].prio;
1195 1196
              }
1196 1197
              if (nodes[nodes[jd].next].item == nodes[ld].item) {
1197 1198
                setPrio(nodes[jd].next);
1198 1199
              }
1199 1200
              jd = nodes[jd].left;
1200 1201
            }
1201 1202
          }
1202 1203
        } else {
1203 1204
          jd = nodes[jd].left;
1204 1205
        }
1205 1206
      }
1206 1207
    }
1207 1208

	
1208 1209
    void repairRight(int id) {
1209 1210
      int jd = ~(classes[id].parent);
1210 1211
      while (nodes[jd].right != -1) {
1211 1212
        int kd = nodes[jd].right;
1212 1213
        if (nodes[jd].size == 1) {
1213 1214
          if (nodes[jd].parent < 0) {
1214 1215
            classes[id].parent = ~kd;
1215 1216
            classes[id].depth -= 1;
1216 1217
            nodes[kd].parent = ~id;
1217 1218
            deleteNode(jd);
1218 1219
            jd = kd;
1219 1220
          } else {
1220 1221
            int pd = nodes[jd].parent;
1221 1222
            if (nodes[nodes[jd].prev].size < cmax) {
1222 1223
              pushRight(nodes[jd].prev, nodes[jd].right);
1223
              if (nodes[jd].item == nodes[pd].item) {
1224
              if (less(jd, nodes[jd].prev) ||
1225
                  nodes[jd].item == nodes[pd].item) {
1224 1226
                nodes[nodes[jd].prev].prio = nodes[jd].prio;
1225 1227
                nodes[nodes[jd].prev].item = nodes[jd].item;
1226 1228
              }
1227 1229
              popRight(pd);
1228 1230
              deleteNode(jd);
1229 1231
              jd = pd;
1230 1232
            } else {
1231 1233
              int ld = nodes[nodes[jd].prev].right;
1232 1234
              popRight(nodes[jd].prev);
1233 1235
              pushLeft(jd, ld);
1234 1236
              if (less(ld, nodes[jd].right) ||
1235 1237
                  nodes[ld].item == nodes[pd].item) {
1236 1238
                nodes[jd].item = nodes[ld].item;
1237 1239
                nodes[jd].prio = nodes[ld].prio;
1238 1240
              }
1239 1241
              if (nodes[nodes[jd].prev].item == nodes[ld].item) {
1240 1242
                setPrio(nodes[jd].prev);
1241 1243
              }
1242 1244
              jd = nodes[jd].right;
1243 1245
            }
1244 1246
          }
1245 1247
        } else {
1246 1248
          jd = nodes[jd].right;
1247 1249
        }
1248 1250
      }
1249 1251
    }
1250 1252

	
1251 1253

	
1252 1254
    bool less(int id, int jd) const {
1253 1255
      return comp(nodes[id].prio, nodes[jd].prio);
1254 1256
    }
1255 1257

	
1256
    bool equal(int id, int jd) const {
1257
      return !less(id, jd) && !less(jd, id);
1258
    }
1259

	
1260

	
1261 1258
  public:
1262 1259

	
1263 1260
    /// \brief Returns true when the given class is alive.
1264 1261
    ///
1265 1262
    /// Returns true when the given class is alive, ie. the class is
1266 1263
    /// not nested into other class.
1267 1264
    bool alive(int cls) const {
1268 1265
      return classes[cls].parent < 0;
1269 1266
    }
1270 1267

	
1271 1268
    /// \brief Returns true when the given class is trivial.
1272 1269
    ///
1273 1270
    /// Returns true when the given class is trivial, ie. the class
1274 1271
    /// contains just one item directly.
1275 1272
    bool trivial(int cls) const {
1276 1273
      return classes[cls].left == -1;
1277 1274
    }
1278 1275

	
1279 1276
    /// \brief Constructs the union-find.
1280 1277
    ///
1281 1278
    /// Constructs the union-find.
1282 1279
    /// \brief _index The index map of the union-find. The data
1283 1280
    /// structure uses internally for store references.
1284 1281
    HeapUnionFind(ItemIntMap& _index)
1285 1282
      : index(_index), first_class(-1),
1286 1283
        first_free_class(-1), first_free_node(-1) {}
1287 1284

	
1288 1285
    /// \brief Insert a new node into a new component.
1289 1286
    ///
1290 1287
    /// Insert a new node into a new component.
1291 1288
    /// \param item The item of the new node.
1292 1289
    /// \param prio The priority of the new node.
1293 1290
    /// \return The class id of the one-item-heap.
1294 1291
    int insert(const Item& item, const Value& prio) {
1295 1292
      int id = newNode();
1296 1293
      nodes[id].item = item;
1297 1294
      nodes[id].prio = prio;
1298 1295
      nodes[id].size = 0;
1299 1296

	
1300 1297
      nodes[id].prev = -1;
1301 1298
      nodes[id].next = -1;
1302 1299

	
1303 1300
      nodes[id].left = -1;
1304 1301
      nodes[id].right = -1;
1305 1302

	
1306 1303
      nodes[id].item = item;
1307 1304
      index[item] = id;
1308 1305

	
1309 1306
      int class_id = newClass();
1310 1307
      classes[class_id].parent = ~id;
1311 1308
      classes[class_id].depth = 0;
1312 1309

	
1313 1310
      classes[class_id].left = -1;
1314 1311
      classes[class_id].right = -1;
1315 1312

	
1316 1313
      if (first_class != -1) {
1317 1314
        classes[first_class].prev = class_id;
1318 1315
      }
1319 1316
      classes[class_id].next = first_class;
1320 1317
      classes[class_id].prev = -1;
1321 1318
      first_class = class_id;
1322 1319

	
1323 1320
      nodes[id].parent = ~class_id;
1324 1321

	
1325 1322
      return class_id;
1326 1323
    }
1327 1324

	
1328 1325
    /// \brief The class of the item.
1329 1326
    ///
1330 1327
    /// \return The alive class id of the item, which is not nested into
1331 1328
    /// other classes.
1332 1329
    ///
1333 1330
    /// The time complexity is O(log(n)).
1334 1331
    int find(const Item& item) const {
1335 1332
      return findClass(index[item]);
1336 1333
    }
1337 1334

	
1338 1335
    /// \brief Joins the classes.
1339 1336
    ///
1340 1337
    /// The current function joins the given classes. The parameter is
1341 1338
    /// an STL range which should be contains valid class ids. The
1342 1339
    /// time complexity is O(log(n)*k) where n is the overall number
1343 1340
    /// of the joined nodes and k is the number of classes.
1344 1341
    /// \return The class of the joined classes.
1345 1342
    /// \pre The range should contain at least two class ids.
1346 1343
    template <typename Iterator>
1347 1344
    int join(Iterator begin, Iterator end) {
1348 1345
      std::vector<int> cs;
1349 1346
      for (Iterator it = begin; it != end; ++it) {
1350 1347
        cs.push_back(*it);
1351 1348
      }
1352 1349

	
1353 1350
      int class_id = newClass();
1354 1351
      { // creation union-find
1355 1352

	
1356 1353
        if (first_class != -1) {
1357 1354
          classes[first_class].prev = class_id;
1358 1355
        }
1359 1356
        classes[class_id].next = first_class;
1360 1357
        classes[class_id].prev = -1;
1361 1358
        first_class = class_id;
1362 1359

	
1363 1360
        classes[class_id].depth = classes[cs[0]].depth;
1364 1361
        classes[class_id].parent = classes[cs[0]].parent;
1365 1362
        nodes[~(classes[class_id].parent)].parent = ~class_id;
1366 1363

	
1367 1364
        int l = cs[0];
1368 1365

	
1369 1366
        classes[class_id].left = l;
1370 1367
        classes[class_id].right = l;
1371 1368

	
1372 1369
        if (classes[l].next != -1) {
1373 1370
          classes[classes[l].next].prev = classes[l].prev;
1374 1371
        }
1375 1372
        classes[classes[l].prev].next = classes[l].next;
1376 1373

	
1377 1374
        classes[l].prev = -1;
1378 1375
        classes[l].next = -1;
1379 1376

	
1380 1377
        classes[l].depth = leftNode(l);
1381 1378
        classes[l].parent = class_id;
1382 1379

	
1383 1380
      }
1384 1381

	
1385 1382
      { // merging of heap
1386 1383
        int l = class_id;
1387 1384
        for (int ci = 1; ci < int(cs.size()); ++ci) {
1388 1385
          int r = cs[ci];
1389 1386
          int rln = leftNode(r);
1390 1387
          if (classes[l].depth > classes[r].depth) {
1391 1388
            int id = ~(classes[l].parent);
1392 1389
            for (int i = classes[r].depth + 1; i < classes[l].depth; ++i) {
1393 1390
              id = nodes[id].right;
1394 1391
            }
1395 1392
            while (id >= 0 && nodes[id].size == cmax) {
1396 1393
              int new_id = newNode();
1397 1394
              int right_id = nodes[id].right;
1398 1395

	
1399 1396
              popRight(id);
1400 1397
              if (nodes[id].item == nodes[right_id].item) {
1401 1398
                setPrio(id);
1402 1399
              }
1403 1400
              push(new_id, right_id);
1404 1401
              pushRight(new_id, ~(classes[r].parent));
1405 1402

	
1406 1403
              if (less(~classes[r].parent, right_id)) {
1407 1404
                nodes[new_id].item = nodes[~classes[r].parent].item;
1408 1405
                nodes[new_id].prio = nodes[~classes[r].parent].prio;
1409 1406
              } else {
1410 1407
                nodes[new_id].item = nodes[right_id].item;
1411 1408
                nodes[new_id].prio = nodes[right_id].prio;
1412 1409
              }
1413 1410

	
1414 1411
              id = nodes[id].parent;
1415 1412
              classes[r].parent = ~new_id;
1416 1413
            }
1417 1414
            if (id < 0) {
1418 1415
              int new_parent = newNode();
1419 1416
              nodes[new_parent].next = -1;
1420 1417
              nodes[new_parent].prev = -1;
1421 1418
              nodes[new_parent].parent = ~l;
1422 1419

	
1423 1420
              push(new_parent, ~(classes[l].parent));
1424 1421
              pushRight(new_parent, ~(classes[r].parent));
1425 1422
              setPrio(new_parent);
1426 1423

	
1427 1424
              classes[l].parent = ~new_parent;
1428 1425
              classes[l].depth += 1;
1429 1426
            } else {
1430 1427
              pushRight(id, ~(classes[r].parent));
1431 1428
              while (id >= 0 && less(~(classes[r].parent), id)) {
1432 1429
                nodes[id].prio = nodes[~(classes[r].parent)].prio;
1433 1430
                nodes[id].item = nodes[~(classes[r].parent)].item;
1434 1431
                id = nodes[id].parent;
1435 1432
              }
1436 1433
            }
1437 1434
          } else if (classes[r].depth > classes[l].depth) {
1438 1435
            int id = ~(classes[r].parent);
1439 1436
            for (int i = classes[l].depth + 1; i < classes[r].depth; ++i) {
1440 1437
              id = nodes[id].left;
1441 1438
            }
1442 1439
            while (id >= 0 && nodes[id].size == cmax) {
1443 1440
              int new_id = newNode();
1444 1441
              int left_id = nodes[id].left;
1445 1442

	
1446 1443
              popLeft(id);
1447 1444
              if (nodes[id].prio == nodes[left_id].prio) {
1448 1445
                setPrio(id);
1449 1446
              }
1450 1447
              push(new_id, left_id);
1451 1448
              pushLeft(new_id, ~(classes[l].parent));
1452 1449

	
1453 1450
              if (less(~classes[l].parent, left_id)) {
1454 1451
                nodes[new_id].item = nodes[~classes[l].parent].item;
1455 1452
                nodes[new_id].prio = nodes[~classes[l].parent].prio;
1456 1453
              } else {
1457 1454
                nodes[new_id].item = nodes[left_id].item;
1458 1455
                nodes[new_id].prio = nodes[left_id].prio;
1459 1456
              }
1460 1457

	
1461 1458
              id = nodes[id].parent;
1462 1459
              classes[l].parent = ~new_id;
1463 1460

	
1464 1461
            }
1465 1462
            if (id < 0) {
1466 1463
              int new_parent = newNode();
1467 1464
              nodes[new_parent].next = -1;
1468 1465
              nodes[new_parent].prev = -1;
1469 1466
              nodes[new_parent].parent = ~l;
1470 1467

	
1471 1468
              push(new_parent, ~(classes[r].parent));
1472 1469
              pushLeft(new_parent, ~(classes[l].parent));
1473 1470
              setPrio(new_parent);
1474 1471

	
1475 1472
              classes[r].parent = ~new_parent;
1476 1473
              classes[r].depth += 1;
1477 1474
            } else {
1478 1475
              pushLeft(id, ~(classes[l].parent));
1479 1476
              while (id >= 0 && less(~(classes[l].parent), id)) {
1480 1477
                nodes[id].prio = nodes[~(classes[l].parent)].prio;
1481 1478
                nodes[id].item = nodes[~(classes[l].parent)].item;
1482 1479
                id = nodes[id].parent;
1483 1480
              }
1484 1481
            }
1485 1482
            nodes[~(classes[r].parent)].parent = ~l;
1486 1483
            classes[l].parent = classes[r].parent;
1487 1484
            classes[l].depth = classes[r].depth;
1488 1485
          } else {
1489 1486
            if (classes[l].depth != 0 &&
1490 1487
                nodes[~(classes[l].parent)].size +
1491 1488
                nodes[~(classes[r].parent)].size <= cmax) {
1492 1489
              splice(~(classes[l].parent), ~(classes[r].parent));
1493 1490
              deleteNode(~(classes[r].parent));
1494 1491
              if (less(~(classes[r].parent), ~(classes[l].parent))) {
1495 1492
                nodes[~(classes[l].parent)].prio =
1496 1493
                  nodes[~(classes[r].parent)].prio;
1497 1494
                nodes[~(classes[l].parent)].item =
1498 1495
                  nodes[~(classes[r].parent)].item;
1499 1496
              }
1500 1497
            } else {
1501 1498
              int new_parent = newNode();
1502 1499
              nodes[new_parent].next = nodes[new_parent].prev = -1;
1503 1500
              push(new_parent, ~(classes[l].parent));
1504 1501
              pushRight(new_parent, ~(classes[r].parent));
1505 1502
              setPrio(new_parent);
1506 1503

	
1507 1504
              classes[l].parent = ~new_parent;
1508 1505
              classes[l].depth += 1;
1509 1506
              nodes[new_parent].parent = ~l;
1510 1507
            }
1511 1508
          }
1512 1509
          if (classes[r].next != -1) {
1513 1510
            classes[classes[r].next].prev = classes[r].prev;
1514 1511
          }
1515 1512
          classes[classes[r].prev].next = classes[r].next;
1516 1513

	
0 comments (0 inline)