luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A very minor change to the code of the last commit preserves the 

behavior of keeping the same first record when merging two nodes.
This does not seem to have any effect on extraction output.  But
since the order of nodes can make a difference and there is no
performance impact in the code change, I will keep it as-is.
This commit is contained in:
Tim Edwards 2021-06-13 21:47:33 -04:00
parent b335dfafff
commit 37c5355b8f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extract/ExtHier.c
View File

@ -211,8 +211,8 @@ extHierSubstrate(ha, use, x, y)
for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next) for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next)
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_next = node2->node_names; nn->nn_next = node2->node_names->nn_next;
node2->node_names = node1->node_names; node2->node_names->nn_next = node1->node_names;
node2->node_len += node1->node_len; node2->node_len += node1->node_len;
freeMagic((char *)node1); freeMagic((char *)node1);
} }
@ -412,8 +412,8 @@ extHierConnectFunc1(oneTile, ha)
for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next) for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next)
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_next = node2->node_names; nn->nn_next = node2->node_names->nn_next;
node2->node_names = node1->node_names; node2->node_names->nn_next = node1->node_names;
node2->node_len += node1->node_len; node2->node_len += node1->node_len;
freeMagic((char *) node1); freeMagic((char *) node1);
} }
@ -516,8 +516,8 @@ extHierConnectFunc2(cum, ha)
for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next) for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next)
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_next = node2->node_names; nn->nn_next = node2->node_names->nn_next;
node2->node_names = node1->node_names; node2->node_names->nn_next = node1->node_names;
node2->node_len += node1->node_len; node2->node_len += node1->node_len;
freeMagic((char *) node1); freeMagic((char *) node1);
} }
@ -618,8 +618,8 @@ extHierConnectFunc3(cum, ha)
for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next) for (nn = node1->node_names; nn->nn_next; nn = nn->nn_next)
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_node = node2; nn->nn_node = node2;
nn->nn_next = node2->node_names; nn->nn_next = node2->node_names->nn_next;
node2->node_names = node1->node_names; node2->node_names->nn_next = node1->node_names;
node2->node_len += node1->node_len; node2->node_len += node1->node_len;
freeMagic((char *) node1); freeMagic((char *) node1);
} }