From c68180e306cd2cf3c866f585f69c1a0a079c3604 Mon Sep 17 00:00:00 2001
From: Amaury Johnan <amjohnen@gmail.com>
Date: Wed, 11 Sep 2013 13:44:36 +0000
Subject: [PATCH] refactor
---
Mesh/meshGFaceRecombine.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Mesh/meshGFaceRecombine.cpp b/Mesh/meshGFaceRecombine.cpp
index d282598767..57d049a1c0 100644
--- a/Mesh/meshGFaceRecombine.cpp
+++ b/Mesh/meshGFaceRecombine.cpp
@@ -4934,14 +4934,14 @@ void setParam(int horizon, int code)
}
namespace data {
- bool rdo_tree_search = false;
+ bool root_tree_srch = false;
bool root_one_srch = false;
+ bool root_take_best = false;
int root_std_srch = 0;
- bool _rdo_best = false;
bool plus_tree_srch = false;
bool plus_one_srch = false;
- int plus_std_srch = 0;
bool plus_take_best = false;
+ int plus_std_srch = 0;
int horizon = 0;
Node *current = NULL;
Node *initial = NULL;
@@ -5207,7 +5207,7 @@ void Node::branch_root()
while (candidateTriangle.empty()) {
switch (searchType) {
case 0:
- if (rdo_tree_search) {
+ if (root_tree_srch) {
for (unsigned int i = 0; i < _children.size(); ++i)
_children[i]->goAhead(1);
}
@@ -5243,7 +5243,7 @@ void Node::branch_root()
// 2) take actions of the best or a random
Rec2DElement *rt;
- if (_rdo_best)
+ if (root_take_best)
rt = best(candidateTriangle);
else
rt = random(candidateTriangle);
--
GitLab