diff --git a/float_node.h b/float_node.h index 90e6193ca..ff53b186d 100644 --- a/float_node.h +++ b/float_node.h @@ -6,9 +6,7 @@ class FloatNode : public ExpressionNode { public: - FloatNode() : ExpressionNode() { - printf("Created float\n"); - } + FloatNode() : ExpressionNode() {} size_t size() const override { return sizeof(FloatNode); } diff --git a/test.cpp b/test.cpp index 2e1d9b637..1e9a4fda6 100644 --- a/test.cpp +++ b/test.cpp @@ -3,37 +3,19 @@ #include Addition buildAddition() { - printf("\n\n-----------------------------\n"); - printf("CODE: Float smallFloat(0.2f);\n\n"); Float smallFloat(0.2f); - - printf("\n\n-----------------------------\n"); - printf("CODE: Float bigFloat(3.4f);\n\n"); Float bigFloat(3.4f); - - printf("\n\n-----------------------------\n"); - printf("CODE: Addition a(smallFloat, bigFloat);\n\n"); Addition a(smallFloat, bigFloat); - TreePool::sharedPool()->log(); - printf("\n\n-----------------------------\n"); - printf("CODE: return a;\n\n"); return a; } int main() { - printf("\n\n-----------------------------\n"); - printf("CODE: Expression a = buildAddition();\n\n"); Addition a = buildAddition(); float result = a.approximate(); - printf("a = %f \n", result); Float smallFloat(1.3f); a.replaceChildAtIndex(0, smallFloat); float result2 = a.approximate(); - printf("a = %f \n", result2); - - printf("HAS RETURNED\n"); TreePool::sharedPool()->log(); - return 0; } diff --git a/tree_node.cpp b/tree_node.cpp index f227ca2ef..13c116acb 100644 --- a/tree_node.cpp +++ b/tree_node.cpp @@ -5,7 +5,6 @@ // Node operations void TreeNode::release() { - printf("Release %d(%p)\n", m_identifier, this); m_referenceCounter--; if (m_referenceCounter == 0) { if (numberOfChildren() != 0) { @@ -21,7 +20,6 @@ void TreeNode::release() { } } } - printf("Delete %d(%p)\n", m_identifier, this); TreePool::sharedPool()->discardTreeNode(this); } } @@ -38,7 +36,6 @@ TreeNode * TreeNode::parentTree() const { int childrenVisitedCountHistory[TreePool::MaxNumberOfNodes]; for (TreeNode * node : TreePool::sharedPool()->allNodes()) { if (node->identifier() == m_identifier) { - printf("Parent of %d is %d\n", m_identifier, cursor >= 0 ? parentsHistory[cursor]->identifier() : -1); return cursor >= 0 ? parentsHistory[cursor] : nullptr; } if (cursor >= 0) { diff --git a/tree_pool.cpp b/tree_pool.cpp index 13a3796d6..7363f0a15 100644 --- a/tree_pool.cpp +++ b/tree_pool.cpp @@ -19,7 +19,6 @@ void TreePool::dealloc(void * ptr) { assert(ptr >= m_buffer && ptr < m_cursor); TreeNode * node = reinterpret_cast(ptr); size_t size = node->size(); - printf("Dealloc %d(%p) of size %zu\n", node->m_identifier, node, size); // Step 1 - Compact the pool memmove( @@ -133,7 +132,7 @@ void TreePool::log() { } printf("|\n"); - logNodeForIdentifierArray(); + //logNodeForIdentifierArray(); } #endif diff --git a/tree_pool.h b/tree_pool.h index 5a744fc73..8de940434 100644 --- a/tree_pool.h +++ b/tree_pool.h @@ -25,7 +25,6 @@ public: void freeIdentifier(int identifier) { assert(identifier >= 0 && identifier < MaxNumberOfNodes); - printf("Freeing identifier %d\n", identifier); m_nodeForIdentifier[identifier] = nullptr; } @@ -64,7 +63,6 @@ public: void move(TreeNode * source, TreeNode * destination); void registerNode(TreeNode * node) { - printf("Registering identifier %d with node %p\n", node->identifier(), node); m_nodeForIdentifier[node->identifier()] = node; } diff --git a/tree_reference.h b/tree_reference.h index 74a80b119..19c2ba9a6 100644 --- a/tree_reference.h +++ b/tree_reference.h @@ -10,13 +10,11 @@ class TreeReference { public: TreeReference(const TreeReference & tr) { int trNodeIdentifier = tr.identifier(); - printf("TreeReference copy of %d\n", trNodeIdentifier); TreeNode * nodeCopy = TreePool::sharedPool()->deepCopy(TreePool::sharedPool()->node(trNodeIdentifier)); m_identifier = nodeCopy->identifier(); } ~TreeReference() { - printf("TreeRef destroy of %d\n", m_identifier); assert(node()); assert(node()->identifier() == m_identifier); node()->release(); @@ -76,14 +74,12 @@ protected: TreeReference() { TreeNode * node = TreePool::sharedPool()->createTreeNode(); m_identifier = node->identifier(); - printf("Creating TreeRef of new node %d\n", m_identifier); } private: TreeReference(TreeNode * node) : m_identifier(node->identifier()) { - printf("Creating TreeRef of existing node %d\n", m_identifier); node->retain(); }