r952:b6f76c95992e
Thu, 04 Mar 2010 10:03:14
[Not Reviewed]
0 comments (0 inline)
0
1
0
| ... | ... |
@@ -170,12 +170,16 @@ |
| 170 | 170 |
// Note: vector<char> is used instead of vector<bool> for efficiency reasons |
| 171 | 171 |
|
| 172 | 172 |
// State constants for arcs |
| 173 |
enum |
|
| 173 |
enum ArcState {
|
|
| 174 | 174 |
STATE_UPPER = -1, |
| 175 | 175 |
STATE_TREE = 0, |
| 176 | 176 |
STATE_LOWER = 1 |
| 177 | 177 |
}; |
| 178 | 178 |
|
| 179 |
typedef std::vector<signed char> StateVector; |
|
| 180 |
// Note: vector<signed char> is used instead of vector<ArcState> for |
|
| 181 |
// efficiency reasons |
|
| 182 |
|
|
| 179 | 183 |
private: |
| 180 | 184 |
|
| 181 | 185 |
// Data related to the underlying digraph |
| ... | ... |
@@ -215,7 +219,7 @@ |
| 215 | 219 |
IntVector _last_succ; |
| 216 | 220 |
IntVector _dirty_revs; |
| 217 | 221 |
BoolVector _forward; |
| 218 |
|
|
| 222 |
StateVector _state; |
|
| 219 | 223 |
int _root; |
| 220 | 224 |
|
| 221 | 225 |
// Temporary data used in the current pivot iteration |
| ... | ... |
@@ -246,7 +250,7 @@ |
| 246 | 250 |
const IntVector &_source; |
| 247 | 251 |
const IntVector &_target; |
| 248 | 252 |
const CostVector &_cost; |
| 249 |
const |
|
| 253 |
const StateVector &_state; |
|
| 250 | 254 |
const CostVector &_pi; |
| 251 | 255 |
int &_in_arc; |
| 252 | 256 |
int _search_arc_num; |
| ... | ... |
@@ -298,7 +302,7 @@ |
| 298 | 302 |
const IntVector &_source; |
| 299 | 303 |
const IntVector &_target; |
| 300 | 304 |
const CostVector &_cost; |
| 301 |
const |
|
| 305 |
const StateVector &_state; |
|
| 302 | 306 |
const CostVector &_pi; |
| 303 | 307 |
int &_in_arc; |
| 304 | 308 |
int _search_arc_num; |
| ... | ... |
@@ -337,7 +341,7 @@ |
| 337 | 341 |
const IntVector &_source; |
| 338 | 342 |
const IntVector &_target; |
| 339 | 343 |
const CostVector &_cost; |
| 340 |
const |
|
| 344 |
const StateVector &_state; |
|
| 341 | 345 |
const CostVector &_pi; |
| 342 | 346 |
int &_in_arc; |
| 343 | 347 |
int _search_arc_num; |
| ... | ... |
@@ -410,7 +414,7 @@ |
| 410 | 414 |
const IntVector &_source; |
| 411 | 415 |
const IntVector &_target; |
| 412 | 416 |
const CostVector &_cost; |
| 413 |
const |
|
| 417 |
const StateVector &_state; |
|
| 414 | 418 |
const CostVector &_pi; |
| 415 | 419 |
int &_in_arc; |
| 416 | 420 |
int _search_arc_num; |
| ... | ... |
@@ -513,7 +517,7 @@ |
| 513 | 517 |
const IntVector &_source; |
| 514 | 518 |
const IntVector &_target; |
| 515 | 519 |
const CostVector &_cost; |
| 516 |
const |
|
| 520 |
const StateVector &_state; |
|
| 517 | 521 |
const CostVector &_pi; |
| 518 | 522 |
int &_in_arc; |
| 519 | 523 |
int _search_arc_num; |
0 comments (0 inline)