OSDN Git Service
(root)
/
nmecab
/
NMeCabRepo2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db9f490
)
(no commit message)
author
komutan
<t_komuta@nifty.com>
Sat, 11 Jul 2015 03:11:17 +0000
(12:11 +0900)
committer
komutan
<t_komuta@nifty.com>
Sat, 11 Jul 2015 03:11:17 +0000
(12:11 +0900)
src/LibNMeCab/Core/PriorityQueue.cs
patch
|
blob
|
history
diff --git
a/src/LibNMeCab/Core/PriorityQueue.cs
b/src/LibNMeCab/Core/PriorityQueue.cs
index
7a13547
..
9f8a489
100644
(file)
--- a/
src/LibNMeCab/Core/PriorityQueue.cs
+++ b/
src/LibNMeCab/Core/PriorityQueue.cs
@@
-81,7
+81,7
@@
namespace NMeCab.Core
public void Push(T item)
{
this.Count++;
public void Push(T item)
{
this.Count++;
- this.rootNode = this.Merge
Nodes
(this.rootNode, new HeapNode(item));
+ this.rootNode = this.Merge(this.rootNode, new HeapNode(item));
}
public T Peek()
}
public T Peek()
@@
-102,7
+102,7
@@
namespace NMeCab.Core
this.rootNode = this.UnifyChilds(this.rootNode);
}
this.rootNode = this.UnifyChilds(this.rootNode);
}
- private HeapNode Merge
Nodes
(HeapNode l, HeapNode r)
+ private HeapNode Merge(HeapNode l, HeapNode r)
{
if (l == null) return r;
if (r == null) return l;
{
if (l == null) return r;
if (r == null) return l;
@@
-127,7
+127,7
@@
namespace NMeCab.Core
{
HeapNode x = node.PollFirstChild();
HeapNode y = node.PollFirstChild();
{
HeapNode x = node.PollFirstChild();
HeapNode y = node.PollFirstChild();
- tmp[i] = this.Merge
Nodes
(x, y);
+ tmp[i] = this.Merge(x, y);
}
HeapNode z;
}
HeapNode z;
@@
-138,7
+138,7
@@
namespace NMeCab.Core
for (int i = tmp.Length - 1; i >= 0; i--) //逆順ループで配列をStackのように振る舞わせる
{
for (int i = tmp.Length - 1; i >= 0; i--) //逆順ループで配列をStackのように振る舞わせる
{
- z = this.Merge
Nodes
(tmp[i], z);
+ z = this.Merge(tmp[i], z);
}
return z;
}
return z;