diff options
Diffstat (limited to 'tests/csgtermtest.cc')
| -rw-r--r-- | tests/csgtermtest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index 7c37b0a..f23ec70 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -111,7 +111,7 @@ int main(int argc, char **argv) AbstractModule *root_module; ModuleInstantiation root_inst; - AbstractNode *root_node; + const AbstractNode *root_node; QFileInfo fileInfo(filename); handle_dep(filename); @@ -144,11 +144,17 @@ int main(int argc, char **argv) // cout << tree.getString(*root_node) << "\n"; +<<<<<<< HEAD + CSGTermEvaluator evaluator(tree); + vector<CSGTerm*> empty = vector<CSGTerm*>(); + CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, empty, empty); +======= vector<CSGTerm*> highlights; vector<CSGTerm*> background; PolySetEvaluator psevaluator(tree); CSGTermEvaluator evaluator(tree, &psevaluator); CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, highlights, background); +>>>>>>> upstream/visitor // cout << "Stored terms: " << evaluator.stored_term.size() << "\n"; // for (map<int, class CSGTerm*>::iterator iter = evaluator.stored_term.begin(); |