blob: 9d64fabb6a9b078fd4f01b460e6cd79823743f2c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
--- TreeLib/nodeiterator.h.old 2002-02-24 15:37:17.000000000 -0500
+++ TreeLib/nodeiterator.h 2005-02-27 14:23:30.971981368 -0500
@@ -128,34 +128,34 @@
template <class N> N *PreorderIterator<N>::begin ()
{
- cur = root;
- return cur;
+ this->cur = this->root;
+ return this->cur;
}
template <class N> N *PreorderIterator<N>::next ()
{
- if (cur->GetChild())
+ if (this->cur->GetChild())
{
- stk.push (cur);
- N *p = (N *)(cur->GetChild());
- cur = p;
+ this->stk.push (this->cur);
+ N *p = (N *)(this->cur->GetChild());
+ this->cur = p;
}
else
{
- while (!stk.empty() && (cur->GetSibling() == NULL))
+ while (!this->stk.empty() && (this->cur->GetSibling() == NULL))
{
- cur = stk.top();
- stk.pop();
+ this->cur = this->stk.top();
+ this->stk.pop();
}
- if (stk.empty())
- cur = NULL;
+ if (this->stk.empty())
+ this->cur = NULL;
else
{
- N *p = (N *)(cur->GetSibling());
- cur = p;
+ N *p = (N *)(this->cur->GetSibling());
+ this->cur = p;
}
}
- return cur;
+ return this->cur;
}
--- TreeLib/profile.h.old 2002-12-10 06:37:57.000000000 -0500
+++ TreeLib/profile.h 2005-02-27 14:27:51.205419872 -0500
@@ -77,7 +77,7 @@
#include <ctime>
#endif
-
+using namespace std;
/**
*@typedef std::map <std::string, int, std::less<std::string> > LabelMap;
--- TreeLib/treedrawer.cpp.old 2003-08-22 06:47:28.000000000 -0400
+++ TreeLib/treedrawer.cpp 2005-02-27 14:26:19.279394752 -0500
@@ -406,7 +406,7 @@
if (q->IsLeaf())
{
double d = q->GetPathLength() - mMaxPathLength;
- mUltrametric = (std::fabs(d) <= 0.0001);
+ mUltrametric = (fabs(d) <= 0.0001);
// cout << mMaxPathLength << ":" << q->GetPathLength() << " " << d << endl;
}
q = u.next();
|
GitWeb
