From d206217fef5bf16575b37416a479d3dbe8f26d13 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 8 Dec 2010 12:16:12 +0100 Subject: [PATCH] fixed bug that would force node sharing when two or more expectation operators had the same expression but different information sets --- DataTree.cc | 2 +- DataTree.hh | 5 +++-- ExprNode.cc | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DataTree.cc b/DataTree.cc index 7452b63b..a967a3ed 100644 --- a/DataTree.cc +++ b/DataTree.cc @@ -536,7 +536,7 @@ DataTree::isUnaryOpUsed(UnaryOpcode opcode) const { for (unary_op_node_map_t::const_iterator it = unary_op_node_map.begin(); it != unary_op_node_map.end(); it++) - if (it->first.second == opcode) + if (it->first.first.second == opcode) return true; return false; diff --git a/DataTree.hh b/DataTree.hh index 5d75de0c..f49460ae 100644 --- a/DataTree.hh +++ b/DataTree.hh @@ -59,7 +59,8 @@ protected: //! Pair (symbol_id, lag) used as key typedef map, VariableNode *> variable_node_map_t; variable_node_map_t variable_node_map; - typedef map, UnaryOpNode *> unary_op_node_map_t; + //! Pair( Pair (arg1, UnaryOpCode), Pair(Expectation Info Set, Expectation Info Set Name) ) + typedef map, pair >, UnaryOpNode *> unary_op_node_map_t; unary_op_node_map_t unary_op_node_map; typedef map, BinaryOpcode>, BinaryOpNode *> binary_op_node_map_t; binary_op_node_map_t binary_op_node_map; @@ -263,7 +264,7 @@ inline expr_t DataTree::AddUnaryOp(UnaryOpcode op_code, expr_t arg, int arg_exp_info_set, const string &arg_exp_info_set_name) { // If the node already exists in tree, share it - unary_op_node_map_t::iterator it = unary_op_node_map.find(make_pair(arg, op_code)); + unary_op_node_map_t::iterator it = unary_op_node_map.find(make_pair(make_pair(arg, op_code), make_pair(arg_exp_info_set, arg_exp_info_set_name))); if (it != unary_op_node_map.end()) return it->second; diff --git a/ExprNode.cc b/ExprNode.cc index 0569dbd5..39356b10 100644 --- a/ExprNode.cc +++ b/ExprNode.cc @@ -1192,7 +1192,8 @@ UnaryOpNode::UnaryOpNode(DataTree &datatree_arg, UnaryOpcode op_code_arg, const op_code(op_code_arg) { // Add myself to the unary op map - datatree.unary_op_node_map[make_pair(arg, op_code)] = this; + datatree.unary_op_node_map[make_pair(make_pair(arg, op_code), + make_pair(expectation_information_set, expectation_information_set_name))] = this; } void