Fixed error's in pairing heap figure

liuxinyu95 · Nov 15, 2016 · 9d3be8f · 9d3be8f
1 parent b9b0b06
commit 9d3be8f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/datastruct/heap/other-heaps/create-img.sh b/datastruct/heap/other-heaps/create-img.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 
 CONV="src/fr2dot"
 
@@ -22,7 +22,7 @@ CONV="src/fr2dot"
 #$CONV img/pairing-hp.dot "(2, (5, (15)), (4, (13)), (3, (8)), (12), (7), (10), (11), (6), (9, (17), (14, (16))))"
 #$CONV img/pairs.dot "(5, (15)), (4, (13)), (3, (8)), (12), (7), (10), (11), (6), (9, (17), (14, (16)))"
 #$CONV img/pairs-merge.dot "(4, (5, (15)), (13)), (3, (12), (8)), (7, (10)), (6, (11)), (9, (7), (14, (16)))"
-#$CONV img/right-merge-1.dot "(6, (9, (7), (14, (16))), (11))"
-#$CONV img/right-merge-2.dot "(6, (7, (10)), (9, (14, (16))), (11))"
-#$CONV img/right-merge-3.dot "(3, (6, (7, (10)), (9, (14, (16))), (11)), (12), (8))"
-#$CONV img/right-merge-4.dot "(3, (4, (5, (15)), (13)), (6, (7, (10)), (9, (14, (16))), (11)), (12), (8))"
+$CONV img/right-merge-1.dot "(6, (9, (17), (14, (16))), (11))"
+$CONV img/right-merge-2.dot "(6, (7, (10)), (9, (17), (14, (16))), (11))"
+$CONV img/right-merge-3.dot "(3, (6, (7, (10)), (9, (17), (14, (16))), (11)), (12), (8))"
+$CONV img/right-merge-4.dot "(3, (4, (5, (15)), (13)), (6, (7, (10)), (9, (17), (14, (16))), (11)), (12), (8))"
diff --git a/datastruct/heap/other-heaps/img/right-merge-1.dot b/datastruct/heap/other-heaps/img/right-merge-1.dot
@@ -1,14 +1,13 @@
 digraph G{
-	margin="0"
 	node[shape=circle]
 	t6[label="6"];
 	t69[label="9"];
-	t697[label="7"];
+	t6917[label="17"];
 	t6914[label="14"];
 	t691416[label="16"];
 	t6914->t691416;
-	{rank=same t697->t6914[style=invis]}
-	t69->t697;
+	{rank=same t6917->t6914[style=invis]}
+	t69->t6917;
 	t69->t6914;
 	t611[label="11"];
 	{rank=same t69->t611[style=invis]}

diff --git a/datastruct/heap/other-heaps/img/right-merge-2.dot b/datastruct/heap/other-heaps/img/right-merge-2.dot
@@ -1,14 +1,16 @@
 digraph G{
-	margin="0"
 	node[shape=circle]
 	t6[label="6"];
 	t67[label="7"];
 	t6710[label="10"];
 	t67->t6710;
 	t69[label="9"];
+	t6917[label="17"];
 	t6914[label="14"];
 	t691416[label="16"];
 	t6914->t691416;
+	{rank=same t6917->t6914[style=invis]}
+	t69->t6917;
 	t69->t6914;
 	t611[label="11"];
 	{rank=same t67->t69->t611[style=invis]}

diff --git a/datastruct/heap/other-heaps/img/right-merge-3.dot b/datastruct/heap/other-heaps/img/right-merge-3.dot
@@ -1,15 +1,17 @@
 digraph G{
-	margin="0"
 	node[shape=circle]
 	t3[label="3"];
 	t36[label="6"];
 	t367[label="7"];
 	t36710[label="10"];
 	t367->t36710;
 	t369[label="9"];
+	t36917[label="17"];
 	t36914[label="14"];
 	t3691416[label="16"];
 	t36914->t3691416;
+	{rank=same t36917->t36914[style=invis]}
+	t369->t36917;
 	t369->t36914;
 	t3611[label="11"];
 	{rank=same t367->t369->t3611[style=invis]}

diff --git a/datastruct/heap/other-heaps/img/right-merge-4.dot b/datastruct/heap/other-heaps/img/right-merge-4.dot
@@ -1,5 +1,4 @@
 digraph G{
-	margin="0"
 	node[shape=circle]
 	t3[label="3"];
 	t34[label="4"];
@@ -15,9 +14,12 @@ digraph G{
 	t36710[label="10"];
 	t367->t36710;
 	t369[label="9"];
+	t36917[label="17"];
 	t36914[label="14"];
 	t3691416[label="16"];
 	t36914->t3691416;
+	{rank=same t36917->t36914[style=invis]}
+	t369->t36917;
 	t369->t36914;
 	t3611[label="11"];
 	{rank=same t367->t369->t3611[style=invis]}

diff --git a/others/appendix/list/list-zh-cn.tex b/others/appendix/list/list-zh-cn.tex
@@ -172,7 +172,7 @@ \subsection{判空和长度计算}
 
 定义好如何判断列表为空后，就可以计算列表的长度了。在命令式环境中，\textproc{Length}通常实现如下：
 
-\begin{algorithmic}
+\begin{algorithmic}[1]
 \Function{Length}{L}
   \State $n \gets 0$
   \While{$L \neq NIL$}