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
74
|
--- ./graph.cc.orig 2015-09-04 15:04:09.927604245 -0600
+++ ./graph.cc 2015-09-04 15:09:46.999819514 -0600
@@ -597,16 +597,6 @@ public:
};
-
-
-typedef struct {
- unsigned int splitting_element;
- unsigned int certificate_index;
- unsigned int subcertificate_length;
- UintSeqHash eqref_hash;
-} PathInfo;
-
-
bool
AbstractGraph::search(const bool canonical, Stats& stats)
{
@@ -753,7 +743,6 @@ AbstractGraph::search(const bool canonic
initialize_certificate();
std::vector<TreeNode> search_stack;
- std::vector<PathInfo> first_path_info;
std::vector<PathInfo> best_path_info;
search_stack.clear();
@@ -5477,7 +5466,7 @@ Graph::nucr_find_first_component(const u
component.clear();
component_elements = 0;
sh_return = 0;
- unsigned int sh_first = 0;
+ unsigned int sh_first = 1 << 31;
unsigned int sh_size = 0;
unsigned int sh_nuconn = 0;
--- ./graph.hh.orig 2015-09-04 15:09:17.261182632 -0600
+++ ./graph.hh 2015-09-04 15:09:47.001819355 -0600
@@ -109,9 +109,12 @@ public:
unsigned long int get_max_level() const {return max_level;}
};
-
-
-
+typedef struct {
+ unsigned int splitting_element;
+ unsigned int certificate_index;
+ unsigned int subcertificate_length;
+ UintSeqHash eqref_hash;
+} PathInfo;
/**
@@ -524,7 +527,7 @@ protected:
*/
unsigned int cr_component_elements;
-
+ std::vector<PathInfo> first_path_info;
};
@@ -756,6 +759,10 @@ public:
void set_splitting_heuristic(const SplittingHeuristic shs) {sh = shs; }
+ /**
+ * Get an information vector about the first path.
+ */
+ std::vector<PathInfo> get_first_path_info() { return first_path_info; }
};
|
GitWeb
